openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1546803 [13/14] - in /openoffice/branches/l10n40: ./ main/ main/accessibility/inc/accessibility/extended/ main/accessibility/inc/accessibility/standard/ main/accessibility/source/extended/ main/accessibility/source/helper/ main/accessibili...
Date Sun, 01 Dec 2013 11:40:35 GMT
Modified: openoffice/branches/l10n40/main/sw/source/ui/index/cnttab.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/index/cnttab.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/index/cnttab.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/index/cnttab.cxx Sun Dec  1 11:40:24 2013
@@ -1860,7 +1860,6 @@ void	SwTOXEdit::KeyInput( const KeyEvent
 			bNextControl = sal_False;
 			bCall = sal_True;
 		}
-//IAccessibility2 Impplementaton 2009-----
 		else if ( (aCode.GetCode() == KEY_F3) && aCode.IsShift() && !aCode.IsMod1() && !aCode.IsMod2() )
 		{
 			if ( m_pParent )
@@ -1868,7 +1867,6 @@ void	SwTOXEdit::KeyInput( const KeyEvent
 				m_pParent->SetFocus2theAllBtn();
 			}
 		}
-//-----IAccessibility2 Impplementaton 2009
 		if(bCall && aPrevNextControlLink.IsSet())
 			aPrevNextControlLink.Call(this);
 
@@ -2004,7 +2002,6 @@ void	SwTOXButton::KeyInput( const KeyEve
 		//this is invalid here
 		return;
 	}
-//IAccessibility2 Impplementaton 2009-----
 	else if ( (aCode.GetCode() == KEY_F3) && aCode.IsShift() && !aCode.IsMod1() && !aCode.IsMod2() )
 	{
 		if ( m_pParent )
@@ -2012,7 +2009,6 @@ void	SwTOXButton::KeyInput( const KeyEve
 			m_pParent->SetFocus2theAllBtn();
 		}
 	}
-//-----IAccessibility2 Impplementaton 2009
 	if(bCall && aPrevNextControlLink.IsSet())
 			aPrevNextControlLink.Call(this);
 	else
@@ -2661,7 +2657,6 @@ void SwTOXEntryTabPage::PreTokenButtonRe
 	sal_uInt16 nPos = aAuthFieldsLB.InsertEntry(sTemp);
 	aAuthFieldsLB.SetEntryData(nPos, (void*)(nData));
 }
-//IAccessibility2 Impplementaton 2009-----
 void SwTOXEntryTabPage::SetFocus2theAllBtn()
 {
 	aAllLevelsPB.GrabFocus();
@@ -2684,7 +2679,6 @@ long SwTOXEntryTabPage::Notify( NotifyEv
 
 	return SfxTabPage::Notify( rNEvt );
 }
-//-----IAccessibility2 Impplementaton 2009
 /*-- 16.06.99 10:47:35---------------------------------------------------
 
 This function inizializes the default value in the Token
@@ -3178,12 +3172,10 @@ SwTokenWindow::SwTokenWindow(SwTOXEntryT
 			nHelpId = STR_TOKEN_HELP_ENTRY;
 		aButtonHelpTexts[i] = String(ResId(nHelpId, *rResId.GetResMgr()));
 	}
-//IAccessibility2 Impplementaton 2009-----
 	accessibleName = String(SW_RES(STR_STRUCTURE));
 	sAdditionalAccnameString1 = String(SW_RES(STR_ADDITIONAL_ACCNAME_STRING1));
 	sAdditionalAccnameString2 = String(SW_RES(STR_ADDITIONAL_ACCNAME_STRING2));
 	sAdditionalAccnameString3 = String(SW_RES(STR_ADDITIONAL_ACCNAME_STRING3));
-//-----IAccessibility2 Impplementaton 2009
 	FreeResource();
 
 	Link aLink(LINK(this, SwTokenWindow, ScrollHdl));
@@ -3341,7 +3333,6 @@ Control*	SwTokenWindow::InsertItem(const
 		pEdit->SetPosPixel(aControlPos);
 		aControlList.Insert(pEdit, aControlList.Count());
 		pEdit->SetText(rText);
-//IAccessibility2 Impplementaton 2009-----
 		sal_uInt32 nIndex = GetControlIndex( TOKEN_TEXT, pEdit );
 		String s1 = String::CreateFromAscii(" (");
 		String s2 = String::CreateFromAscii(")");
@@ -3366,7 +3357,6 @@ Control*	SwTokenWindow::InsertItem(const
 		{
 			pEdit->SetAccessibleName(strName);
 		}
-//-----IAccessibility2 Impplementaton 2009
 	 	Size aEditSize(aControlSize);
 		aEditSize.Width() = pEdit->GetTextWidth(rText) + EDIT_MINWIDTH;
 		pEdit->SetSizePixel(aEditSize);
@@ -3397,7 +3387,6 @@ Control*	SwTokenWindow::InsertItem(const
 						(ToxAuthorityField)rToken.nAuthorityField));
 			pButton->SetText(sTmp.Copy(0, 2));
 		}
-//IAccessibility2 Impplementaton 2009-----
 		String sSpace = String::CreateFromAscii(" ");
 		sal_uInt32 nIndex = GetControlIndex( rToken.eTokenType, pButton );
 		String sAccName = aButtonHelpTexts[rToken.eTokenType];
@@ -3407,7 +3396,6 @@ Control*	SwTokenWindow::InsertItem(const
 			sAccName += String::CreateFromInt32(nIndex);
 		}
 		pButton->SetAccessibleName( sAccName );
-//-----IAccessibility2 Impplementaton 2009
 		pButton->Show();
 		pRet = pButton;
 	}
@@ -3549,7 +3537,6 @@ void	SwTokenWindow::InsertAtSelection(
 		SwTOXEdit* pEdit = new SwTOXEdit(&aCtrlParentWin, this, aTmpToken);
 		aControlList.Insert(pEdit, nActivePos + 1);
 		pEdit->SetText(sRight);
-//IAccessibility2 Impplementaton 2009-----
 		sal_uInt32 nIndex = GetControlIndex( TOKEN_TEXT, pEdit );
 		String s1 = String::CreateFromAscii(" (");
 		String s2 = String::CreateFromAscii(")");
@@ -3574,7 +3561,6 @@ void	SwTokenWindow::InsertAtSelection(
 		{
 			pEdit->SetAccessibleName(strName);
 		}
-//-----IAccessibility2 Impplementaton 2009
 		pEdit->SetSizePixel(aControlSize);
 		pEdit->AdjustSize();
 		pEdit->SetModifyHdl(LINK(this, SwTokenWindow, EditResize ));
@@ -3604,7 +3590,6 @@ void	SwTokenWindow::InsertAtSelection(
 		pButton->SetText(sTmp.Copy(0, 2));
 	}
 
-//IAccessibility2 Impplementaton 2009-----
 	String sSpace = String::CreateFromAscii(" ");
 	sal_uInt32 nIndex = GetControlIndex( rToken.eTokenType, pButton );
 	String sAccName = aButtonHelpTexts[rToken.eTokenType];
@@ -3614,7 +3599,6 @@ void	SwTokenWindow::InsertAtSelection(
 		sAccName += String::CreateFromInt32(nIndex);
 	}
 	pButton->SetAccessibleName( sAccName );
-//-----IAccessibility2 Impplementaton 2009
  Size aEditSize(GetOutputSizePixel());
 	aEditSize.Width() = pButton->GetTextWidth(rText) + 5;
 	pButton->SetSizePixel(aEditSize);
@@ -4045,7 +4029,6 @@ void SwTokenWindow::GetFocus()
        }
     }
 }
-//IAccessibility2 Impplementaton 2009-----
 void SwTokenWindow::SetFocus2theAllBtn()
 {
 	if (m_pParent)
@@ -4053,7 +4036,7 @@ void SwTokenWindow::SetFocus2theAllBtn()
 		m_pParent->SetFocus2theAllBtn();
 	}
 }
-sal_uInt32 SwTokenWindow::GetControlIndex(FormTokenType eType, const Control* pCurControl) const
+sal_uInt32 SwTokenWindow::GetControlIndex(FormTokenType eType, const Control* /* pCurControl */) const
 {
 	//there are only one entry-text button and only one page-number button,
 	//so we need not add index for these two buttons.
@@ -4079,7 +4062,6 @@ sal_uInt32 SwTokenWindow::GetControlInde
 	
 	return nIndex;
 }
-//-----IAccessibility2 Impplementaton 2009
 /* -----------------25.03.99 15:17-------------------
  *
  * --------------------------------------------------*/

Modified: openoffice/branches/l10n40/main/sw/source/ui/index/cnttab.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/index/cnttab.hrc?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/index/cnttab.hrc (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/index/cnttab.hrc Sun Dec  1 11:40:24 2013
@@ -169,12 +169,10 @@
 #define STR_TOKEN_HELP_AUTHORITY     (STR_BUTTON_HELP_TEXT_START + 9)
 
 #define STR_CHARSTYLE				(STR_TOKEN_HELP_AUTHORITY + 1)
-//IAccessibility2 Impplementaton 2009-----
 #define STR_STRUCTURE	(STR_TOKEN_HELP_AUTHORITY + 2)
 #define STR_ADDITIONAL_ACCNAME_STRING1 (STR_TOKEN_HELP_AUTHORITY + 3)
 #define STR_ADDITIONAL_ACCNAME_STRING2 (STR_TOKEN_HELP_AUTHORITY + 4)
 #define STR_ADDITIONAL_ACCNAME_STRING3 (STR_TOKEN_HELP_AUTHORITY + 5)
-//-----IAccessibility2 Impplementaton 2009
 #define TLB_STYLES				100
 #define FL_STYLES                   101
 #define PB_OK		            102

Modified: openoffice/branches/l10n40/main/sw/source/ui/index/cnttab.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/index/cnttab.src?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/index/cnttab.src (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/index/cnttab.src Sun Dec  1 11:40:24 2013
@@ -674,7 +674,6 @@ TabPage TP_TOX_ENTRY
 		{
 			Text [ en-US ] = "Character Style: ";
 		};
-//IAccessibility2 Impplementaton 2009-----
 		String STR_STRUCTURE
 		{
 			Text [ en-US ] = "Structure text";
@@ -691,7 +690,6 @@ TabPage TP_TOX_ENTRY
 		{
 			Text [ en-US ] = "Press Ctrl+Alt+B to move focus back to the current structure control";
 		};
-//-----IAccessibility2 Impplementaton 2009
 	};
 	PushButton PB_ALL_LEVELS
 	{
@@ -1232,9 +1230,7 @@ ModalDialog DLG_ADD_IDX_STYLES
 			};
             MaskColor = IMAGE_MASK_COLOR ;
         };
-        //IAccessibility2 Implementation 2009-----
         QuickHelpText [ en-US ] = "Left" ;
-        //-----IAccessibility2 Implementation 2009
 	};
     ImageButton PB_RIGHT
 	{
@@ -1250,9 +1246,7 @@ ModalDialog DLG_ADD_IDX_STYLES
 			};
             MaskColor = IMAGE_MASK_COLOR ;
 		};
-		//IAccessibility2 Implementation 2009-----
 		QuickHelpText [ en-US ] = "Right" ;
-		//-----IAccessibility2 Implementation 2009
 	};
     FixedLine FL_STYLES
 	{

Modified: openoffice/branches/l10n40/main/sw/source/ui/misc/glossary.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/misc/glossary.hrc?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/misc/glossary.hrc (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/misc/glossary.hrc Sun Dec  1 11:40:24 2013
@@ -84,6 +84,4 @@
 #define   FL_NN              9
 #define   BT_CANCEL			10
 #define   BT_OKNEW			11
-//IAccessibility2 Implementation 2009-----
 #define STR_SW_CATEGORY 12
-//-----IAccessibility2 Implementation 2009

Modified: openoffice/branches/l10n40/main/sw/source/ui/misc/glossary.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/misc/glossary.src?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/misc/glossary.src (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/misc/glossary.src Sun Dec  1 11:40:24 2013
@@ -286,12 +286,10 @@ String STR_GLOSSARY
 {
     Text [ en-US ] = "AutoText :" ;
 };
-/*IAccessibility2 Implementation 2009-----*/
 String STR_ACCESS_SW_CATEGORY
 {
     Text [ en-US ] = "Category" ;
 };
-/*-----IAccessibility2 Implementation 2009*/
 ModalDialog DLG_RENAME_GLOS
 {
 	OutputSize = TRUE ;

Modified: openoffice/branches/l10n40/main/sw/source/ui/misc/insfnote.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/misc/insfnote.hrc?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/misc/insfnote.hrc (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/misc/insfnote.hrc Sun Dec  1 11:40:24 2013
@@ -36,6 +36,4 @@
 #define BT_PREV				103
 #define BT_NEXT				104
 
-//IAccessibility2 Implementation 2009-----
 #define STR_CHAR			105
-//-----IAccessibility2 Implementation 2009

Modified: openoffice/branches/l10n40/main/sw/source/ui/misc/insfnote.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/misc/insfnote.src?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/misc/insfnote.src (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/misc/insfnote.src Sun Dec  1 11:40:24 2013
@@ -45,12 +45,10 @@ ModalDialog DLG_INS_FOOTNOTE
 		Group = TRUE ;
 		Left = TRUE ;
 	};
-	//IAccessibility2 Implementation 2009-----
 	String STR_CHAR
 	{
 		Text [ en-US ] = "Character" ;
 	};
-	//-----IAccessibility2 Implementation 2009
 	OKButton BT_OK
 	{
         Pos = MAP_APPFONT ( 104 , 6 ) ;

Modified: openoffice/branches/l10n40/main/sw/source/ui/ribbar/inputwin.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/ribbar/inputwin.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/ribbar/inputwin.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/ribbar/inputwin.cxx Sun Dec  1 11:40:24 2013
@@ -91,7 +91,6 @@ SwInputWindow::SwInputWindow( Window* pP
 	pWrtShell = pView ? pView->GetWrtShellPtr() : 0;
 
 	InsertWindow( ED_POS, &aPos, 0, 0);
-	//IAccessibility2 Implementation 2009-----
 	SetItemText(ED_POS, String(SW_RES(STR_ACCESS_FORMULA_TYPE)));
 	aPos.SetAccessibleName(String(SW_RES(STR_ACCESS_FORMULA_TYPE)));
 	SetAccessibleName(String(SW_RES(STR_ACCESS_FORMULA_TOOLBAR)));
@@ -100,7 +99,6 @@ SwInputWindow::SwInputWindow( Window* pP
 	InsertWindow( ED_FORMULA, &aEdit);
 	SetItemText(ED_FORMULA, String(SW_RES(STR_ACCESS_FORMULA_TEXT)));
 	aEdit.SetAccessibleName(String(SW_RES(STR_ACCESS_FORMULA_TEXT)));
-	//-----IAccessibility2 Implementation 2009
 	SetHelpId(ED_FORMULA, HID_EDIT_FORMULA);
 
     sal_Bool bHC = GetSettings().GetStyleSettings().GetHighContrastMode();

Modified: openoffice/branches/l10n40/main/sw/source/ui/ribbar/inputwin.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/ribbar/inputwin.hrc?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/ribbar/inputwin.hrc (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/ribbar/inputwin.hrc Sun Dec  1 11:40:24 2013
@@ -60,11 +60,9 @@
 #define ED_POS				2
 #define ED_FORMULA 			3
 
-//IAccessibility2 Impplementaton 2009-----
 #define STR_ED_POS			1
 #define STR_ED_FORMULA		2
 #define STR_TOOLBAR_FORMULA	35
-//-----IAccessibility2 Impplementaton 2009
 #endif
 
 

Modified: openoffice/branches/l10n40/main/sw/source/ui/ribbar/inputwin.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/ribbar/inputwin.src?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/ribbar/inputwin.src (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/ribbar/inputwin.src Sun Dec  1 11:40:24 2013
@@ -281,7 +281,6 @@ String STR_TBL_FORMULA
 {
 	Text [ en-US ] = "Text formula" ;
 };
-//IAccessibility2 Impplementaton 2009-----
 String STR_ACCESS_FORMULA_TOOLBAR
 {
 	Text [ en-US ] = "Formula Tool Bar" ;
@@ -294,7 +293,6 @@ String STR_ACCESS_FORMULA_TEXT
 {
 	Text [ en-US ] = "Formula Text" ;
 };
-//-----IAccessibility2 Impplementaton 2009
 #define TB_INPUT  \
     ToolBoxItem\
     {\

Modified: openoffice/branches/l10n40/main/sw/source/ui/ribbar/workctrl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/ribbar/workctrl.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/ribbar/workctrl.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/ribbar/workctrl.cxx Sun Dec  1 11:40:24 2013
@@ -503,7 +503,6 @@ SwScrollNaviPopup::SwScrollNaviPopup( sa
             sText = String(SW_RES(nResStr));
             nTbxBits = TIB_CHECKABLE;
         }
-		//IAccessibility2 Impplementaton 2009-----
 		else
 		{
 			if (nNaviId == NID_PREV)
@@ -511,7 +510,6 @@ SwScrollNaviPopup::SwScrollNaviPopup( sa
 			else if (nNaviId == NID_NEXT)
 				sText = String(SW_RES(STR_IMGBTN_PGE_DOWN));
 		}
-		//-----IAccessibility2 Impplementaton 2009
         aToolBox.InsertItem(nNaviId, sText, nTbxBits);
         aToolBox.SetHelpId( nNaviId, aNavigationHelpIds[i] );
     }

Modified: openoffice/branches/l10n40/main/sw/source/ui/shells/textsh1.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/shells/textsh1.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/shells/textsh1.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/shells/textsh1.cxx Sun Dec  1 11:40:24 2013
@@ -1119,7 +1119,6 @@ void SwTextShell::Execute(SfxRequest &rR
 
 		case SID_DEC_INDENT:
 		case SID_INC_INDENT:
-//IAccessibility2 Implementation 2009-----
 			//According to the requirement, modified the behavior when user
 			//using the indent button on the toolbar. Now if we increase/decrease indent for a
 			//paragraph which has bullet style it will increase/decrease the bullet level.
@@ -1147,7 +1146,6 @@ void SwTextShell::Execute(SfxRequest &rR
 			}
 			//rWrtSh.MoveLeftMargin( SID_INC_INDENT == nSlot,
 			//						rReq.GetModifier() != KEY_MOD1 );
-//-----IAccessibility2 Implementation 2009
 			rReq.Done();
 			break;
 		case FN_DEC_INDENT_OFFSET:
@@ -1558,7 +1556,6 @@ void SwTextShell::GetState( SfxItemSet &
 		case SID_DEC_INDENT:
 		case SID_INC_INDENT:
 			{
-//IAccessibility2 Implementation 2009-----
 				//if the paragrah has bullet we'll do the following things:
 				//1: if the bullet level is the first level, disable the decrease-indent button
 				//2: if the bullet level is the last level, disable the increase-indent button
@@ -1587,7 +1584,6 @@ void SwTextShell::GetState( SfxItemSet &
 				//	SID_INC_INDENT == nWhich, TRUE ))
 				//	rSet.DisableItem( nWhich );
 				//old code ends
-//-----IAccessibility2 Implementation 2009
 			}
 			break;
 

Modified: openoffice/branches/l10n40/main/sw/source/ui/table/convert.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/table/convert.hrc?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/table/convert.hrc (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/table/convert.hrc Sun Dec  1 11:40:24 2013
@@ -47,6 +47,4 @@
 #define BT_AUTOFORMAT	102
 #define BT_HELP 		103
 #define WIN_REPEAT_HEADER   104
-//IAccessibility2 Implementation 2009-----
 #define	STR_SYMBOL		105
-//-----IAccessibility2 Implementation 2009

Modified: openoffice/branches/l10n40/main/sw/source/ui/table/convert.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/table/convert.src?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/table/convert.src (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/table/convert.src Sun Dec  1 11:40:24 2013
@@ -187,12 +187,10 @@ ModalDialog DLG_CONV_TEXT_TABLE
 		Hide = TRUE ;
 		Text [ en-US ] = "Auto~Format..." ;
 	};
-	/*IAccessibility2 Implementation 2009-----*/
 	String STR_SYMBOL
 	{
 		Text [ en-US ] = "Symbol" ;
 	};
-	/*-----IAccessibility2 Implementation 2009*/
 };
 
 

Modified: openoffice/branches/l10n40/main/sw/source/ui/table/tabledlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/table/tabledlg.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/table/tabledlg.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/table/tabledlg.cxx Sun Dec  1 11:40:24 2013
@@ -990,11 +990,9 @@ IMPL_LINK( SwTableColumnPage, AutoClickH
 		String sIndex = String::CreateFromInt32( aValueTbl[i] + 1 );
 		sEntry += sIndex;
 		pTextArr[i]->SetText( sEntry );
-//IAccessibility2 Impplementaton 2009-----
 		String sColumnWidth = SW_RESSTR( STR_ACCESS_COLUMN_WIDTH);
 		sColumnWidth.SearchAndReplace( DEFINE_CONST_UNICODE("%1"), sIndex );
 		pFieldArr[i]->SetAccessibleName( sColumnWidth );
-//-----IAccessibility2 Impplementaton 2009
 	}
 
 	aDownBtn.Enable(aValueTbl[0] > 0);

Modified: openoffice/branches/l10n40/main/sw/source/ui/table/tabledlg.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/table/tabledlg.hrc?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/table/tabledlg.hrc (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/table/tabledlg.hrc Sun Dec  1 11:40:24 2013
@@ -102,9 +102,7 @@
 #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
 

Modified: openoffice/branches/l10n40/main/sw/source/ui/uiview/pview.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/uiview/pview.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/uiview/pview.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/uiview/pview.cxx Sun Dec  1 11:40:24 2013
@@ -240,11 +240,9 @@ SwPagePreViewWin::SwPagePreViewWin( Wind
 
 SwPagePreViewWin::~SwPagePreViewWin()
 {
-	//IAccessibility2 Implementation 2009-----
 	// Remove to the deconstruction of SwPagePreView.
 	//if( mpViewShell)
 	//	delete mpViewShell;
-	//-----IAccessibility2 Implementation 2009
 }
 
 /*--------------------------------------------------------------------
@@ -1297,8 +1295,8 @@ void SwPagePreView::Init(const SwViewOpt
 
 SwPagePreView::SwPagePreView(SfxViewFrame *pViewFrame, SfxViewShell* pOldSh):
 	SfxViewShell( pViewFrame, SWVIEWFLAGS ),
-	pViewWin( new SwPagePreViewWin(&(GetViewFrame())->GetWindow(), *this ) ),//IAccessibility2 Implementation 2009
-    nNewPage(USHRT_MAX),
+	pViewWin( new SwPagePreViewWin(&(GetViewFrame())->GetWindow(), *this ) ),
+	nNewPage(USHRT_MAX),
 	pHScrollbar(0),
 	pVScrollbar(0),
 	pPageUpBtn(0),
@@ -1381,7 +1379,6 @@ SwPagePreView::SwPagePreView(SfxViewFram
  SwPagePreView::~SwPagePreView()
 {
 	SetWindow( 0 );
-	//IAccessibility2 Implementation 2009-----
 	ViewShell* pVShell =  pViewWin->GetViewShell();
 	pVShell->SetWin(0);
 	//pViewWin->Hide();
@@ -1389,7 +1386,6 @@ SwPagePreView::SwPagePreView(SfxViewFram
 		delete pVShell;
 	delete pViewWin;
 	//pViewWin->Hide();
-	//-----IAccessibility2 Implementation 2009
 
 	delete pScrollFill;
 	delete pHScrollbar;
@@ -2106,7 +2102,6 @@ sal_Bool SwPagePreView::HandleWheelComma
 	//IAccessibility2 Implementation 2009-----, only the Preference shouldn't control the Zoom, it is better to detect AT tools running. So the bridge can be used here
         //if(!Application::GetSettings().GetMiscSettings().GetEnableATToolSupport())
 	if ( !Application::IsAccessibilityEnabled() )
-	//-----IAccessibility2 Implementation 2009
         {
             sal_uInt16 nFactor = GetViewShell()->GetViewOptions()->GetZoom();
             const sal_uInt16 nOffset = 10;
@@ -2139,7 +2134,6 @@ uno::Reference< ::com::sun::star::access
 														// happend already!!!
 
     DBG_ASSERT( GetViewShell() != NULL, "We need a view shell" );
-	//IAccessibility2 Implementation 2009-----
 	::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc = GetAccessible( sal_False );
 	if (xAcc.is())
 	{
@@ -2151,9 +2145,7 @@ uno::Reference< ::com::sun::star::access
 		SetAccessible(xAccPreview);
 	}
 	return GetAccessible( sal_False );
-	//-----IAccessibility2 Implementation 2009
 }
-//IAccessibility2 Implementation 2009-----
 // MT: Removed Windows::SwitchView() introduced with IA2 CWS.
 // There are other notifications for this when the active view has chnaged, so please update the code to use that event mechanism
 void SwPagePreViewWin::SwitchView()
@@ -2169,7 +2161,6 @@ void SwPagePreViewWin::SwitchView()
 	}
 #endif
 }
-//-----IAccessibility2 Implementation 2009
 
 /* -----------------------------06.05.2002 13:18------------------------------
 

Modified: openoffice/branches/l10n40/main/sw/source/ui/uiview/view.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/uiview/view.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/uiview/view.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/uiview/view.cxx Sun Dec  1 11:40:24 2013
@@ -727,6 +727,7 @@ SwView::SwView( SfxViewFrame *_pFrame, S
 	: SfxViewShell( _pFrame, SWVIEWFLAGS ),
 	aPageStr( SW_RES( STR_PAGE )),
     nNewPage(USHRT_MAX),
+	nOldPageNum(0),
     pNumRuleNodeFromDoc(0), // #i23726#
 	pEditWin( new SwEditWin( &_pFrame->GetWindow(), *this ) ),
 	pWrtShell(0),
@@ -763,9 +764,6 @@ SwView::SwView( SfxViewFrame *_pFrame, S
 	nFormSfxId( USHRT_MAX ),
     nLastPasteDestination( 0xFFFF ),
     nLeftBorderDistance( 0 ),
-    //IAccessibility2 Implementation 2009-----
-	nOldPageNum(0),
-    //-----IAccessibility2 Implementation 2009
     nRightBorderDistance( 0 ),
     bInMailMerge(sal_False),
     bInDtor(sal_False),

Modified: openoffice/branches/l10n40/main/sw/source/ui/uiview/view2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/uiview/view2.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/uiview/view2.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/uiview/view2.cxx Sun Dec  1 11:40:24 2013
@@ -1179,7 +1179,6 @@ void SwView::StateStatusLine(SfxItemSet 
 	SfxWhichIter aIter( rSet );
 	sal_uInt16 nWhich = aIter.FirstWhich();
 	ASSERT( nWhich, "leeres Set");
-	//IAccessibility2 Implementation 2009-----
 	if (Application::IsAccessibilityEnabled())
 	{
 		//get section chang event
@@ -1204,7 +1203,6 @@ void SwView::StateStatusLine(SfxItemSet 
 			rShell.FireColumnChangeEvent(2, 1);
 		}
 	}
-	//-----IAccessibility2 Implementation 2009
 
 	while( nWhich )
 	{
@@ -1229,7 +1227,6 @@ void SwView::StateStatusLine(SfxItemSet 
 				rShell.GetPageNumber( -1, rShell.IsCrsrVisible(), nPage, nLogPage, sDisplay );
 				rSet.Put( SfxStringItem( FN_STAT_PAGE,
 							GetPageStr( nPage, nLogPage, sDisplay) ));
-				//IAccessibility2 Implementation 2009-----
 				//if existing page number is not equal to old page number, send out this event.
 				if (nOldPageNum != nLogPage )
 				{
@@ -1237,7 +1234,6 @@ void SwView::StateStatusLine(SfxItemSet 
 						rShell.FirePageChangeEvent(nOldPageNum, nLogPage);
 					nOldPageNum = nLogPage;
 				}
-				//-----IAccessibility2 Implementation 2009
 				sal_uInt16 nCnt = GetWrtShell().GetPageCnt();
 				if (nPageCnt != nCnt)	// Basic benachrichtigen
 				{

Modified: openoffice/branches/l10n40/main/sw/source/ui/uiview/viewsrch.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/uiview/viewsrch.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/uiview/viewsrch.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/uiview/viewsrch.cxx Sun Dec  1 11:40:24 2013
@@ -213,7 +213,6 @@ void SwView::ExecSearch(SfxRequest& rReq
 				if( bRet )
 					Scroll(pWrtShell->GetCharRect().SVRect());
 				rReq.SetReturnValue(SfxBoolItem(nSlot, bRet));
-				//IAccessibility2 Implementation 2009-----
 				if ( Application::IsAccessibilityEnabled() )
 				{
 					const sal_uInt16 nId = SvxSearchDialogWrapper::GetChildWindowId();
@@ -225,7 +224,6 @@ void SwView::ExecSearch(SfxRequest& rReq
 						pSrchDlg->SetSrchFlag();
 					}
 				}
-				//-----IAccessibility2 Implementation 2009
 			}
 			break;
 			case SVX_SEARCHCMD_FIND_ALL:
@@ -241,7 +239,6 @@ void SwView::ExecSearch(SfxRequest& rReq
 					bFound = sal_False;
 				}
 				rReq.SetReturnValue(SfxBoolItem(nSlot, bRet));
-				//IAccessibility2 Implementation 2009-----
 				if ( Application::IsAccessibilityEnabled() )
 				{
 					const sal_uInt16 nId = SvxSearchDialogWrapper::GetChildWindowId();
@@ -254,7 +251,6 @@ void SwView::ExecSearch(SfxRequest& rReq
 						pSrchDlg->SetSrchFlag();				
 					}
 				}
-				//-----IAccessibility2 Implementation 2009
 			}
 			break;
 			case SVX_SEARCHCMD_REPLACE:
@@ -306,7 +302,6 @@ void SwView::ExecSearch(SfxRequest& rReq
 					pSrchItem->SetCommand( nOldCmd );
 					rReq.SetReturnValue(SfxBoolItem(nSlot, bRet));
 				}
-				//IAccessibility2 Implementation 2009-----
 				{					
 					const sal_uInt16 nId = SvxSearchDialogWrapper::GetChildWindowId();
 					SvxSearchDialogWrapper *pWrp = (SvxSearchDialogWrapper*)GetViewFrame()->GetChildWindow(nId);
@@ -318,7 +313,6 @@ void SwView::ExecSearch(SfxRequest& rReq
 						pSrchDlg->SetSrchFlag();			
 					}
 				}
-				//-----IAccessibility2 Implementation 2009
 				break;
 
 			case SVX_SEARCHCMD_REPLACE_ALL:
@@ -368,7 +362,6 @@ void SwView::ExecSearch(SfxRequest& rReq
 						InfoBox( pParentWindow, aText ).Execute();
 					}
 				}
-				//IAccessibility2 Implementation 2009-----
 				const sal_uInt16 nId = SvxSearchDialogWrapper::GetChildWindowId();
 				SvxSearchDialogWrapper *pWrp = (SvxSearchDialogWrapper*)GetViewFrame()->GetChildWindow(nId);
 			
@@ -378,7 +371,6 @@ void SwView::ExecSearch(SfxRequest& rReq
 					pSrchDlg->SetDocWin( (Window*)pEditWin );
 					pSrchDlg->SetSrchFlag();				
 				}
-				//-----IAccessibility2 Implementation 2009
 				break;
 			}
 

Modified: openoffice/branches/l10n40/main/sw/source/ui/utlui/content.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/utlui/content.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/utlui/content.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/utlui/content.cxx Sun Dec  1 11:40:24 2013
@@ -85,14 +85,12 @@
 #include <numrule.hxx>
 #include <swundo.hxx>
 #include <ndtxt.hxx>
-//IAccessibility2 Implementation 2009-----
 //#include <ndgrf.hxx>
 #include <fmtcntnt.hxx>
 #include <PostItMgr.hxx>
 //#include <../../core/inc/flyfrm.hxx>
 //#include <../../core/inc/cntfrm.hxx>
 //#include <ndnotxt.hxx>
-//-----IAccessibility2 Implementation 2009
 //#include <postit.hxx>
 #include <postithelper.hxx>
 #include <redline.hxx>
@@ -899,7 +897,7 @@ SwContentTree::SwContentTree(Window* pPa
 		bIsOutlineMoveable(sal_True),
 		bViewHasChanged(sal_False),
 		bIsImageListInitialized(sal_False),
-		bIsKeySpace(sal_False) //IAccessibility2 Implementation 2009
+		bIsKeySpace(sal_False)
 {
 	sal_uInt16 i;
 
@@ -936,7 +934,6 @@ SwContentTree::~SwContentTree()
 	bIsInDrag = sal_False;
 }
 
-//IAccessibility2 Implementation 2009-----
 String SwContentTree::GetEntryAltText( SvLBoxEntry* pEntry ) const
 {
 	if( pEntry == NULL)
@@ -1108,7 +1105,6 @@ String SwContentTree::GetEntryLongDescri
 	return String();
 }
 
-//-----IAccessibility2 Implementation 2009
 /***************************************************************************
 	Drag&Drop methods
 ***************************************************************************/
@@ -1394,7 +1390,6 @@ void  SwContentTree::RequestingChilds( S
 						sEntry = sSpace;
 					SvLBoxEntry* pChild = InsertEntry(sEntry, pParent,
 							sal_False, LIST_APPEND, (void*)pCnt);
-					//IAccessibility2 Implementation 2009-----
 					//Solution: If object is marked , the corresponding entry is set true ,
 					//else the corresponding entry is set false .
 					//==================================================
@@ -1416,7 +1411,6 @@ void  SwContentTree::RequestingChilds( S
 
 						}
 					}
-					//-----IAccessibility2 Implementation 2009
 				}
 			}
 		}
@@ -1426,7 +1420,6 @@ void  SwContentTree::RequestingChilds( S
 	Beschreibung:	Expand - Zustand fuer Inhaltstypen merken
 ***************************************************************************/
 
-//IAccessibility2 Implementation 2009-----
 //Solution: Get drawing Objects by content .
 SdrObject* SwContentTree::GetDrawingObjectsByContent(const SwContent *pCnt)
 {
@@ -1460,7 +1453,6 @@ SdrObject* SwContentTree::GetDrawingObje
 	}
 	return pRetObj;
 }
-//-----IAccessibility2 Implementation 2009
 
 sal_Bool  SwContentTree::Expand( SvLBoxEntry* pParent )
 {
@@ -2460,7 +2452,6 @@ IMPL_LINK( SwContentTree, TimerUpdate, T
 		{
 			FindActiveTypeAndRemoveUserData();
 			Display(sal_True);
-			//IAccessibility2 Implementation 2009-----
 			//Solution: Set focus
 			if( bIsKeySpace )
 			{
@@ -2468,7 +2459,6 @@ IMPL_LINK( SwContentTree, TimerUpdate, T
 				ShowFocus( oldRectangle);
 				bIsKeySpace = sal_False;
 			}
-			//-----IAccessibility2 Implementation 2009
 		}
 	}
 	else if(!pView && bIsActive && !bIsIdleClear)
@@ -2691,7 +2681,6 @@ void  SwContentTree::KeyInput(const KeyE
             GrabFocus();
         }
 	}
-	//IAccessibility2 Implementation 2009-----
 	//Solution: Make KEY_SPACE has same function as DoubleClick ,
 	//and realize multi-selection .
 	else if(aCode.GetCode() == KEY_SPACE && 0 == aCode.GetModifier())
@@ -2714,7 +2703,6 @@ void  SwContentTree::KeyInput(const KeyE
 
 				SwContent* pCnt = (SwContent*)pEntry->GetUserData();
 
-				sal_Bool bSel = sal_False;
 				sal_uInt16 nJumpType = pCnt->GetParent()->GetType();
 				switch(nJumpType)
 				{
@@ -2775,7 +2763,6 @@ void  SwContentTree::KeyInput(const KeyE
 										break;
 									default:
 										nCmpId = pTemp->GetObjIdentifier();
-										//IAccessibility2 Implementation 2009-----
 										if ( bMark )
 										{
 											SdrPageView* pPV = pDrawView->GetSdrPageView/*GetPageViewPvNum*/(/*0*/);
@@ -2784,7 +2771,6 @@ void  SwContentTree::KeyInput(const KeyE
 												pDrawView->MarkObj(pTemp, pPV, sal_True);
 											}
 										}
-										//-----IAccessibility2 Implementation 2009
 								}
 								//mod end							
 							}
@@ -2812,7 +2798,6 @@ void  SwContentTree::KeyInput(const KeyE
 		}		
 
 	}	
-	//-----IAccessibility2 Implementation 2009
 	else
 		SvTreeListBox::KeyInput(rEvent);
 
@@ -3575,7 +3560,6 @@ void SwContentLBoxString::Paint( const P
 		rDev.DrawText( rPos, GetText() );
 		rDev.SetFont( aOldFont );
 	}
-	//IAccessibility2 Implementation 2009-----
 	// IA2 CWS. MT: Removed for now (also in SvLBoxEntry) - only used in Sw/Sd/ScContentLBoxString, they should decide if they need this
 	/*
 	else if (pEntry->IsMarked())
@@ -3593,7 +3577,6 @@ void SwContentLBoxString::Paint( const P
 			rDev.DrawText( rPosStar, str);
 			rDev.SetFont( aOldFont );
 	}
-	//-----IAccessibility2 Implementation 2009
 	*/
 	else 
 		SvLBoxString::Paint( rPos, rDev, nFlags, pEntry);
@@ -3615,7 +3598,6 @@ void    SwContentTree::DataChanged( cons
 }
 
 
-//IAccessibility2 Implementation 2009-----
 sal_Int32  SwContentTree::GetEntryRealChildsNum( SvLBoxEntry* pParent ) const
 {
 	// ist es ein Inhaltstyp?
@@ -3629,4 +3611,3 @@ sal_Int32  SwContentTree::GetEntryRealCh
 	}
 	return 0;
 }
-//-----IAccessibility2 Implementation 2009

Modified: openoffice/branches/l10n40/main/sw/source/ui/utlui/navipi.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/utlui/navipi.hrc?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/utlui/navipi.hrc (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/utlui/navipi.hrc Sun Dec  1 11:40:24 2013
@@ -85,7 +85,5 @@
 #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

Modified: openoffice/branches/l10n40/main/sw/source/ui/utlui/navipi.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/utlui/navipi.src?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/utlui/navipi.src (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/utlui/navipi.src Sun Dec  1 11:40:24 2013
@@ -532,7 +532,6 @@ ImageList IMG_NAVI_ENTRYBMPH
     NAVI_ENTRY_IDS
 };
 
-//IAccessibility2 Implementation 2009-----
 String STR_ACCESS_TL_GLOBAL
 {
 	Text [ en-US ] = "Global View";
@@ -541,5 +540,4 @@ String STR_ACCESS_TL_CONTENT
 {
 	Text [ en-US ] = "Content View";
 };
-//-----IAccessibility2 Implementation 2009
 

Modified: openoffice/branches/l10n40/main/sw/source/ui/utlui/poolfmt.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/utlui/poolfmt.src?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/utlui/poolfmt.src (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/utlui/poolfmt.src Sun Dec  1 11:40:24 2013
@@ -734,7 +734,6 @@ String STR_POOLCHR_RUBYTEXT
 {
 	Text [ en-US ] = "Rubies";
 };
-//IAccessibility2 Implementation 2009-----
 String STR_COLUMN_VALUESET_ITEM0
 {	
 	Text [ en-US ] = "1 column";
@@ -755,7 +754,6 @@ String STR_COLUMN_VALUESET_ITEM4
 {	
 	Text [ en-US ] = "2 columns with different size (left < right)";
 };
-//-----IAccessibility2 Implementation 2009
 String STR_POOLCHR_VERT_NUM
 {
 	Text [ en-US ] = "Vertical Numbering Symbols";

Modified: openoffice/branches/l10n40/main/sw/source/ui/wrtsh/select.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/wrtsh/select.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/wrtsh/select.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/wrtsh/select.cxx Sun Dec  1 11:40:24 2013
@@ -46,11 +46,9 @@
 #include <swdtflvr.hxx>
 #include <crsskip.hxx>
 
-//IAccessibility2 Implementation 2009-----
 #ifndef _DOC_HXX
 #include <doc.hxx>
 #endif
-//-----IAccessibility2 Implementation 2009
 #if OSL_DEBUG_LEVEL > 1
 #include <pam.hxx>
 #endif
@@ -172,13 +170,11 @@ long SwWrtShell::SelAll()
         SttSelect();
         GoEnd(sal_True, &bMoveTable);
 
-		//IAccessibility2 Implementation 2009-----
 		SwDoc *pDoc = GetDoc();
 		if ( pDoc )
 		{
 			pDoc->SetPrepareSelAll();
 		}
-		//-----IAccessibility2 Implementation 2009
         if( pStartPos )
         {
             pTmpCrsr = getShellCrsr( false );

Modified: openoffice/branches/l10n40/main/sw/source/ui/wrtsh/wrtsh1.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/ui/wrtsh/wrtsh1.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/ui/wrtsh/wrtsh1.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/ui/wrtsh/wrtsh1.cxx Sun Dec  1 11:40:24 2013
@@ -426,7 +426,7 @@ void SwWrtShell::InsertObject( const svt
                     aCmd += pSlot->GetUnoName();
                     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                     SfxAbstractInsertObjectDialog* pDlg =
-                            pFact->CreateInsertObjectDialog( GetWin(), rtl::OUString( aCmd, aCmd.getLength(), RTL_TEXTENCODING_UTF8 ), xStor, &aServerList );
+                            pFact->CreateInsertObjectDialog( GetWin(), rtl::OStringToOUString( aCmd, RTL_TEXTENCODING_UTF8 ), xStor, &aServerList );
                     if ( pDlg )
                     {
                         pDlg->Execute();

Modified: openoffice/branches/l10n40/main/testtools/source/bridgetest/multi.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/testtools/source/bridgetest/multi.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/testtools/source/bridgetest/multi.cxx (original)
+++ openoffice/branches/l10n40/main/testtools/source/bridgetest/multi.cxx Sun Dec  1 11:40:24 2013
@@ -34,6 +34,8 @@
 
 #include <sstream>
 
+inline std::ostream& operator<<( std::ostream& s, const rtl::OUString r) { return (s << r.getStr()); }
+
 namespace css = com::sun::star;
 
 namespace {

Modified: openoffice/branches/l10n40/main/toolkit/inc/toolkit/awt/vclxwindows.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/toolkit/inc/toolkit/awt/vclxwindows.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/toolkit/inc/toolkit/awt/vclxwindows.hxx (original)
+++ openoffice/branches/l10n40/main/toolkit/inc/toolkit/awt/vclxwindows.hxx Sun Dec  1 11:40:24 2013
@@ -876,10 +876,8 @@ public:
 class TOOLKIT_DLLPUBLIC VCLXDateField :	public ::com::sun::star::awt::XDateField,
 						public VCLXFormattedSpinField
 {
-//IAccessibility2 Impplementaton 2009-----
 protected:
 	virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext();
-//-----IAccessibility2 Impplementaton 2009
 public:
 					VCLXDateField();
 					~VCLXDateField();
@@ -926,10 +924,8 @@ public:
 class VCLXTimeField :	public ::com::sun::star::awt::XTimeField,
 						public VCLXFormattedSpinField
 {
-//IAccessibility2 Impplementaton 2009-----
 protected:
 	virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext();
-//-----IAccessibility2 Impplementaton 2009
 public:
 					VCLXTimeField();
 					~VCLXTimeField();

Modified: openoffice/branches/l10n40/main/toolkit/source/awt/vclxaccessiblecomponent.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/toolkit/source/awt/vclxaccessiblecomponent.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/toolkit/source/awt/vclxaccessiblecomponent.cxx (original)
+++ openoffice/branches/l10n40/main/toolkit/source/awt/vclxaccessiblecomponent.cxx Sun Dec  1 11:40:24 2013
@@ -37,10 +37,8 @@
 #include <toolkit/awt/vclxfont.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/window.hxx>
-//IAccessibility2 Implementation 2009-----
 //Solution:Need methods in Edit.
 #include <vcl/edit.hxx>
-//-----IAccessibility2 Implementation 2009
 #include <tools/debug.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <unotools/accessiblerelationsethelper.hxx>
@@ -445,9 +443,7 @@ void VCLXAccessibleComponent::FillAccess
 	Window* pWindow = GetWindow();
 	if ( pWindow )
 	{
-//IAccessibility2 Implementation 2009-----
 		Window *pLabeledBy = pWindow->GetAccessibleRelationLabeledBy();
-//-----IAccessibility2 Implementation 2009
 		if ( pLabeledBy && pLabeledBy != pWindow )
 		{
 			uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1);
@@ -462,7 +458,6 @@ void VCLXAccessibleComponent::FillAccess
 			aSequence[0] = pLabelFor->GetAccessible();
 			rRelationSet.AddRelation( accessibility::AccessibleRelation( accessibility::AccessibleRelationType::LABEL_FOR, aSequence ) );
 		}
-//IAccessibility2 Implementation 2009-----
 		Window* pMemberOf = pWindow->GetAccessibleRelationMemberOf();	
 		if ( pMemberOf && pMemberOf != pWindow )
 		{
@@ -475,7 +470,6 @@ void VCLXAccessibleComponent::FillAccess
 		{
 			rRelationSet.AddRelation( accessibility::AccessibleRelation( accessibility::AccessibleRelationType::CONTENT_FLOWS_TO, aFlowToSequence ) );		
 		}
-//-----IAccessibility2 Implementation 2009
 	}
 }
 
@@ -524,19 +518,16 @@ void VCLXAccessibleComponent::FillAccess
 
 		if ( pWindow->GetStyle() & WB_SIZEABLE )
 			rStateSet.AddState( accessibility::AccessibleStateType::RESIZABLE );
-//IAccessibility2 Implementation 2009-----
 		// 6. frame doesn't have MOVABLE state
 		// 10. for password text, where is the sensitive state? 
 		if( ( getAccessibleRole() == accessibility::AccessibleRole::FRAME ||getAccessibleRole() == accessibility::AccessibleRole::DIALOG )&& pWindow->GetStyle() & WB_MOVEABLE )
 			rStateSet.AddState( accessibility::AccessibleStateType::MOVEABLE );
-//-----IAccessibility2 Implementation 2009
         if( pWindow->IsDialog() )
         {
             Dialog *pDlg = static_cast< Dialog* >( pWindow );
             if( pDlg->IsInExecute() )
 			    rStateSet.AddState( accessibility::AccessibleStateType::MODAL );
         }
-//IAccessibility2 Implementation 2009-----
         //Solution:If a combobox or list's edit child isn't read-only,EDITABLE state
         //         should be set.
 		if( pWindow && pWindow->GetType() == WINDOW_COMBOBOX )
@@ -567,7 +558,6 @@ void VCLXAccessibleComponent::FillAccess
 			}
 			pChild = pChild->GetWindow( WINDOW_NEXT );
 		}
-//-----IAccessibility2 Implementation 2009
 	}
 	else
 	{
@@ -903,11 +893,9 @@ sal_Int32 SAL_CALL VCLXAccessibleCompone
 			else
 				aFont = pWindow->GetFont();
 			nColor = aFont.GetColor().GetColor();
-//IAccessibility2 Implementation 2009-----
 // COL_AUTO is not very meaningful for AT
 			if ( nColor == (sal_Int32)COL_AUTO)
 				nColor = pWindow->GetTextColor().GetColor();
-//-----IAccessibility2 Implementation 2009
 		}
 	}
 

Modified: openoffice/branches/l10n40/main/toolkit/source/awt/vclxtoolkit.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/toolkit/source/awt/vclxtoolkit.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/toolkit/source/awt/vclxtoolkit.cxx (original)
+++ openoffice/branches/l10n40/main/toolkit/source/awt/vclxtoolkit.cxx Sun Dec  1 11:40:24 2013
@@ -632,11 +632,9 @@ void SAL_CALL VCLXToolkit::disposing()
 
 ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > VCLXToolkit::createWindow( const ::com::sun::star::awt::WindowDescriptor& rDescriptor ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
-//IAccessibility2 Implementation 2009-----
 #ifdef WNT
 	CEnableAccessInterface e;
 #endif
-//-----IAccessibility2 Implementation 2009
     return ImplCreateWindow( rDescriptor, WinBits(0) );
 }
 

Modified: openoffice/branches/l10n40/main/toolkit/source/awt/vclxwindows.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/toolkit/source/awt/vclxwindows.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/toolkit/source/awt/vclxwindows.cxx (original)
+++ openoffice/branches/l10n40/main/toolkit/source/awt/vclxwindows.cxx Sun Dec  1 11:40:24 2013
@@ -4505,7 +4505,6 @@ VCLXDateField::~VCLXDateField()
 {
 }
 
-//IAccessibility2 Implementation 2009-----
 //change the window type here to match the role
 ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXDateField::CreateAccessibleContext()
 {
@@ -4516,7 +4515,6 @@ VCLXDateField::~VCLXDateField()
 	}
 	return getAccessibleFactory().createAccessibleContext( this );
 }
-//-----IAccessibility2 Implementation 2009
 
 // ::com::sun::star::uno::XInterface
 ::com::sun::star::uno::Any VCLXDateField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
@@ -4859,7 +4857,6 @@ VCLXTimeField::VCLXTimeField()
 VCLXTimeField::~VCLXTimeField()
 {
 }
-//IAccessibility2 Implementation 2009-----
 //change the window type here to match the role
 ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXTimeField::CreateAccessibleContext()
 {
@@ -4870,7 +4867,6 @@ VCLXTimeField::~VCLXTimeField()
 	}
 	return getAccessibleFactory().createAccessibleContext( this );
 }
-//-----IAccessibility2 Implementation 2009
 
 // ::com::sun::star::uno::XInterface
 ::com::sun::star::uno::Any VCLXTimeField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)

Modified: openoffice/branches/l10n40/main/toolkit/source/helper/property.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/toolkit/source/helper/property.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/toolkit/source/helper/property.cxx (original)
+++ openoffice/branches/l10n40/main/toolkit/source/helper/property.cxx Sun Dec  1 11:40:24 2013
@@ -78,9 +78,9 @@ struct ImplPropertyInfo
    		bDependsOnOthers = sal_False;
 	 }
 
-	ImplPropertyInfo( const sal_Unicode* pName, sal_uInt16 nId, const ::com::sun::star::uno::Type& rType,
+	ImplPropertyInfo( const rtl::OUString& rName, sal_uInt16 nId, const ::com::sun::star::uno::Type& rType,
 						sal_Int16 nAttrs, sal_Bool bDepends = sal_False )
-	 : aName( pName )
+	 : aName( rName )
 	 {
 	 	nPropId = nId;
 		aType = rType;

Modified: openoffice/branches/l10n40/main/toolkit/source/layout/vcl/wrapper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/toolkit/source/layout/vcl/wrapper.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/toolkit/source/layout/vcl/wrapper.cxx (original)
+++ openoffice/branches/l10n40/main/toolkit/source/layout/vcl/wrapper.cxx Sun Dec  1 11:40:24 2013
@@ -152,7 +152,7 @@ PeerHandle Context::GetPeerHandle( const
     if ( nId != 0 )
     {
         rtl::OString aStr = rtl::OString::valueOf( (sal_Int32) nId );
-        xHandle = GetPeerHandle( aStr, 0 );
+        xHandle = GetPeerHandle( aStr.getStr(), 0 );
     }
     return xHandle;
 }
@@ -955,7 +955,7 @@ void MessageBox::init (OUString const& m
         else
             noButton.Hide ();
     }
-    if (help_id)
+    if( !help_id.isEmpty())
         SetHelpId (help_id);
     else
         helpButton.Hide ();

Modified: openoffice/branches/l10n40/main/tools/inc/tools/debug.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/tools/inc/tools/debug.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/tools/inc/tools/debug.hxx (original)
+++ openoffice/branches/l10n40/main/tools/inc/tools/debug.hxx Sun Dec  1 11:40:24 2013
@@ -345,23 +345,11 @@ TOOLS_DLLPUBLIC void DbgOutTypef( sal_uI
 TOOLS_DLLPUBLIC void DbgOutf( const sal_Char* pFStr, ... );
 TOOLS_DLLPUBLIC void ImpDbgOutfBuf( sal_Char* pBuf, const sal_Char* pFStr, ... );
 
-inline void DbgTrace( const sal_Char* pMsg,
-                      const sal_Char* pFile = NULL, sal_uInt16 nLine = 0 )
-{
-    DbgOut( pMsg, DBG_OUT_TRACE, pFile, nLine );
-}
+#define DbgTrace( msg) do{ DbgOut( msg, DBG_OUT_TRACE, __FILE__, __LINE__ ); } while(0)
 
-inline void DbgWarning( const sal_Char* pMsg,
-                        const sal_Char* pFile = NULL, sal_uInt16 nLine = 0 )
-{
-    DbgOut( pMsg, DBG_OUT_WARNING, pFile, nLine );
-}
+#define DbgWarning( msg) do{ DbgOut( msg, DBG_OUT_WARNING, __FILE__, __LINE__ ); } while(0)
 
-inline void DbgError( const sal_Char* pMsg,
-                      const sal_Char* pFile = NULL, sal_uInt16 nLine = 0 )
-{
-    DbgOut( pMsg, DBG_OUT_ERROR, pFile, nLine );
-}
+#define DbgError( msg) do{ DbgOut( msg, DBG_OUT_ERROR, __FILE__, __LINE__ ); } while(0)
 
 // --- Dbg-Test-Functions ---
 
@@ -473,8 +461,7 @@ do                                      
     {                                               \
         if ( !( sCon ) )                            \
         {                                           \
-            DbgWarning( aWarning, __FILE__,         \
-                        __LINE__ );                 \
+            DbgWarning( aWarning);                  \
         }                                           \
     }                                               \
 } while(0)
@@ -486,8 +473,7 @@ do                                      
     {                                               \
         if ( !( sCon ) )                            \
         {                                           \
-            DbgError( aError,                       \
-                      __FILE__, __LINE__ );         \
+            DbgError( aError);                      \
         }                                           \
     }                                               \
 } while(0)
@@ -498,8 +484,7 @@ do                                      
 {                                               \
     if ( !( sCon ) )                            \
     {                                           \
-        DbgError( aError,                       \
-                  __FILE__, __LINE__ );         \
+        DbgError( aError);                      \
     }                                           \
 } while(0)
 #else
@@ -561,7 +546,7 @@ do                                      
 do                                                  \
 {                                                   \
     if ( DbgIsTraceOut() )                          \
-        DbgTrace( aTrace, __FILE__, __LINE__ );     \
+        DbgTrace( aTrace );                         \
 } while(0)
 
 #define DBG_WARNING( aWarning )                     \
@@ -619,7 +604,7 @@ do                                      
 do                                                  \
 {                                                   \
     if ( DbgIsWarningOut() )                        \
-        DbgWarning( aWarning, __FILE__, __LINE__ ); \
+        DbgWarning( aWarning );                     \
 } while(0)
 
 #define DBG_ERROR( aError )                         \
@@ -677,7 +662,7 @@ do                                      
 do                                                  \
 {                                                   \
     if ( DbgIsErrorOut() )                          \
-        DbgError( aError, __FILE__, __LINE__ );     \
+        DbgError( aError );                         \
 } while(0)
 
 #define DBG_TESTSOLARMUTEX()                \

Modified: openoffice/branches/l10n40/main/tools/source/fsys/tempfile.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/tools/source/fsys/tempfile.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/tools/source/fsys/tempfile.cxx (original)
+++ openoffice/branches/l10n40/main/tools/source/fsys/tempfile.cxx Sun Dec  1 11:40:24 2013
@@ -80,7 +80,7 @@ String ConstructTempDir_Impl( const Stri
             if ( aRet[i-1] == '/' )
                 i--;
 
-            if ( DirectoryItem::get( ::rtl::OUString( aRet, i ), aItem ) == FileBase::E_None )
+            if ( DirectoryItem::get( ::rtl::OUString( aRet.getStr(), i ), aItem ) == FileBase::E_None )
                 aName = aRet;
         }
     }

Modified: openoffice/branches/l10n40/main/tools/source/generic/color.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/tools/source/generic/color.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/tools/source/generic/color.cxx (original)
+++ openoffice/branches/l10n40/main/tools/source/generic/color.cxx Sun Dec  1 11:40:24 2013
@@ -143,14 +143,14 @@ void Color::Invert()
 
 sal_Bool Color::IsDark() const
 {
-    return GetLuminance() <= 38; 
+    return GetLuminance() <= 55;
 }
 
 // -----------------------------------------------------------------------
 
 sal_Bool Color::IsBright() const
 {
-    return GetLuminance() >= 245; 
+    return GetLuminance() >= 245;
 }
 
 // -----------------------------------------------------------------------
@@ -259,53 +259,53 @@ ColorData Color::HSBtoRGB( sal_uInt16 nH
 
 // -----------------------------------------------------------------------
 
-// CMYK values from 0 to 1
-ColorData Color::CMYKtoRGB( double fCyan, double fMagenta, double fYellow, double fKey )
-{
-    fCyan = (fCyan * ( 1.0 - fKey )) + fKey;
-    fMagenta = (fMagenta * ( 1.0 - fKey )) + fKey;
-    fYellow = (fYellow * ( 1.0 - fKey )) + fKey;
-
-    sal_uInt8 nRed = static_cast< sal_uInt8 >( std::max( std::min( ( 1.0 - fCyan ) * 255.0, 255.0), 0.0 ) );
-    sal_uInt8 nGreen = static_cast< sal_uInt8 >( std::max( std::min( ( 1.0 - fMagenta ) * 255.0, 255.0), 0.0 ) );
-    sal_uInt8 nBlue = static_cast< sal_uInt8 >( std::max( std::min( ( 1.0 - fYellow ) * 255.0, 255.0), 0.0 ) );
-
-    return RGB_COLORDATA( nRed, nGreen, nBlue );
-}
-
-// -----------------------------------------------------------------------
-
-// RGB values from 0 to 255
-// CMY results from 0 to 1
-void Color::RGBtoCMYK( double& fCyan, double& fMagenta, double& fYellow, double& fKey )
-{
-    fCyan = 1 - ( GetRed() / 255.0 );
-    fMagenta = 1 - ( GetGreen() / 255.0 );
-    fYellow = 1 - ( GetBlue() / 255.0 );
-
-    //CMYK and CMY values from 0 to 1
-    fKey = 1.0;
-    if( fCyan < fKey ) fKey = fCyan;
-    if( fMagenta < fKey ) fKey = fMagenta;
-    if( fYellow < fKey ) fKey = fYellow;
-
-    if ( fKey == 1.0 )
-    {
-       //Black
-       fCyan = 0.0;
-       fMagenta = 0.0;
-       fYellow = 0.0;
-    }
-    else
-    {
-       fCyan = ( fCyan - fKey ) / ( 1.0 - fKey );
-       fMagenta = ( fMagenta - fKey ) / ( 1.0 - fKey );
-       fYellow = ( fYellow - fKey ) / ( 1.0 - fKey );
-    }
-}
-
-// -----------------------------------------------------------------------
-
+// CMYK values from 0 to 1
+ColorData Color::CMYKtoRGB( double fCyan, double fMagenta, double fYellow, double fKey )
+{
+    fCyan = (fCyan * ( 1.0 - fKey )) + fKey;
+    fMagenta = (fMagenta * ( 1.0 - fKey )) + fKey;
+    fYellow = (fYellow * ( 1.0 - fKey )) + fKey;
+
+    sal_uInt8 nRed = static_cast< sal_uInt8 >( std::max( std::min( ( 1.0 - fCyan ) * 255.0, 255.0), 0.0 ) );
+    sal_uInt8 nGreen = static_cast< sal_uInt8 >( std::max( std::min( ( 1.0 - fMagenta ) * 255.0, 255.0), 0.0 ) );
+    sal_uInt8 nBlue = static_cast< sal_uInt8 >( std::max( std::min( ( 1.0 - fYellow ) * 255.0, 255.0), 0.0 ) );
+
+    return RGB_COLORDATA( nRed, nGreen, nBlue );
+}
+
+// -----------------------------------------------------------------------
+
+// RGB values from 0 to 255
+// CMY results from 0 to 1
+void Color::RGBtoCMYK( double& fCyan, double& fMagenta, double& fYellow, double& fKey )
+{
+    fCyan = 1 - ( GetRed() / 255.0 );
+    fMagenta = 1 - ( GetGreen() / 255.0 );
+    fYellow = 1 - ( GetBlue() / 255.0 );
+
+    //CMYK and CMY values from 0 to 1
+    fKey = 1.0;
+    if( fCyan < fKey ) fKey = fCyan;
+    if( fMagenta < fKey ) fKey = fMagenta;
+    if( fYellow < fKey ) fKey = fYellow;
+
+    if ( fKey == 1.0 )
+    {
+       //Black
+       fCyan = 0.0;
+       fMagenta = 0.0;
+       fYellow = 0.0;
+    }
+    else
+    {
+       fCyan = ( fCyan - fKey ) / ( 1.0 - fKey );
+       fMagenta = ( fMagenta - fKey ) / ( 1.0 - fKey );
+       fYellow = ( fYellow - fKey ) / ( 1.0 - fKey );
+    }
+}
+
+// -----------------------------------------------------------------------
+
 SvStream& Color::Read( SvStream& rIStm, sal_Bool bNewFormat )
 {
 	if ( bNewFormat )

Modified: openoffice/branches/l10n40/main/ucb/source/ucp/gvfs/gvfs_content.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/ucb/source/ucp/gvfs/gvfs_content.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/ucb/source/ucp/gvfs/gvfs_content.cxx (original)
+++ openoffice/branches/l10n40/main/ucb/source/ucp/gvfs/gvfs_content.cxx Sun Dec  1 11:40:24 2013
@@ -98,7 +98,7 @@ static char *
 OUStringToGnome( const rtl::OUString &str )
 {
     rtl::OString aTempStr = rtl::OUStringToOString( str, RTL_TEXTENCODING_UTF8 );
-    return g_strdup( (const sal_Char *) aTempStr );
+    return g_strdup( aTempStr.getStr() );
 }
 
 static rtl::OUString
@@ -403,7 +403,7 @@ uno::Any SAL_CALL Content::execute(
         aCommand.Argument >>= bDeletePhysical;
 
         ::rtl::OString aURI = getOURI();
-        GnomeVFSResult result = gnome_vfs_unlink ((const sal_Char *) aURI);
+        GnomeVFSResult result = gnome_vfs_unlink( aURI.getStr());
 
         if (result != GNOME_VFS_OK)
             cancelCommandExecution( result, xEnv, sal_True );
@@ -554,8 +554,7 @@ rtl::OUString Content::getParentURL()
 
 #ifdef DEBUG
     g_warning ("getParentURL '%s' -> '%s'",
-           getURI(), (const sal_Char *) rtl::OUStringToOString
-               ( aParentURL, RTL_TEXTENCODING_UTF8 ) );
+           getURI(), rtl::OUStringToOString( aParentURL, RTL_TEXTENCODING_UTF8).getStr() );
 #endif
 
     return aParentURL;
@@ -633,8 +632,7 @@ uno::Reference< sdbc::XRow > Content::ge
             GnomeVFSFileInfo* fileInfo = gnome_vfs_file_info_new ();
 
             ::rtl::OString aURI = getOURI();
-            gnome_vfs_get_file_info
-                ( (const sal_Char *)aURI, fileInfo,
+            gnome_vfs_get_file_info( aURI.getStr(), fileInfo,
                         GNOME_VFS_FILE_INFO_GET_ACCESS_RIGHTS );
 
             if (fileInfo->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_ACCESS) {
@@ -735,7 +733,7 @@ Content::doSetFileInfo( const GnomeVFSFi
     // The simple approach:
     if( setMask != GNOME_VFS_SET_FILE_INFO_NONE )
         result = gnome_vfs_set_file_info // missed a const in the API there
-            ( (const sal_Char *) aURI, (GnomeVFSFileInfo *)newInfo, setMask );
+            ( aURI.getStr(), (GnomeVFSFileInfo *)newInfo, setMask );
 
     if ( result == GNOME_VFS_ERROR_NOT_SUPPORTED &&
          ( setMask & GNOME_VFS_SET_FILE_INFO_NAME ) ) {
@@ -746,7 +744,7 @@ Content::doSetFileInfo( const GnomeVFSFi
 
         char *newURI = OUStringToGnome( makeNewURL( newInfo->name ) );
 
-        result = gnome_vfs_move ((const sal_Char *)aURI, newURI, FALSE);
+        result = gnome_vfs_move( aURI.getStr(), newURI, FALSE);
 
         g_free (newURI);
     }
@@ -958,7 +956,7 @@ void Content::insert(
 #ifdef DEBUG
         g_warning ("Make directory");
 #endif
-        result = gnome_vfs_make_directory( (const sal_Char *) aURI, perm );
+        result = gnome_vfs_make_directory( aURI.getStr(), perm );
 
         if( result != GNOME_VFS_OK )
             cancelCommandExecution( result, xEnv, sal_True );
@@ -982,7 +980,7 @@ void Content::insert(
     result = GNOME_VFS_OK;
     if ( bReplaceExisting ) {
         Authentication aAuth( xEnv );
-        result = gnome_vfs_open( &handle, (const sal_Char *)aURI,
+        result = gnome_vfs_open( &handle, aURI.getStr(),
                      GNOME_VFS_OPEN_WRITE );
     }
 
@@ -994,7 +992,7 @@ void Content::insert(
              ( GNOME_VFS_PERM_GROUP_WRITE | GNOME_VFS_PERM_GROUP_READ ) );
 
         result = gnome_vfs_create
-            ( &handle, (const sal_Char *)aURI, GNOME_VFS_OPEN_WRITE, TRUE, perm );
+            ( &handle, aURI.getStr(), GNOME_VFS_OPEN_WRITE, TRUE, perm );
     }
 
     if( result != GNOME_VFS_OK )
@@ -1134,7 +1132,7 @@ Content::getInfo( const uno::Reference< 
         ::rtl::OString aURI = getOURI();
         Authentication aAuth( xEnv );
         result = gnome_vfs_get_file_info
-            ( (const sal_Char *)aURI, &m_info, GNOME_VFS_FILE_INFO_DEFAULT );
+            ( aURI.getStr(), &m_info, GNOME_VFS_FILE_INFO_DEFAULT );
         if (result != GNOME_VFS_OK)
             gnome_vfs_file_info_clear( &m_info );
     } else
@@ -1453,8 +1451,7 @@ Content::createTempStream(
     if ( !xTempOut.is() )
         cancelCommandExecution( GNOME_VFS_ERROR_IO, xEnv );
 
-    result = gnome_vfs_open
-        ( &handle, (const sal_Char *)aURI, GNOME_VFS_OPEN_READ );
+    result = gnome_vfs_open( &handle, aURI.getStr(), GNOME_VFS_OPEN_READ );
     if (result != GNOME_VFS_OK)
         cancelCommandExecution( result, xEnv );
 
@@ -1482,8 +1479,7 @@ Content::createInputStream(
     if ( !(m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE) )
         return createTempStream( xEnv );
 
-    result = gnome_vfs_open
-        ( &handle, (const sal_Char *)aURI,
+    result = gnome_vfs_open( &handle, aURI.getStr(),
           (GnomeVFSOpenMode) (GNOME_VFS_OPEN_READ | GNOME_VFS_OPEN_RANDOM ) );
 
     if (result == GNOME_VFS_ERROR_INVALID_OPEN_MODE ||

Modified: openoffice/branches/l10n40/main/ucb/source/ucp/gvfs/gvfs_provider.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/ucb/source/ucp/gvfs/gvfs_provider.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/ucb/source/ucp/gvfs/gvfs_provider.cxx (original)
+++ openoffice/branches/l10n40/main/ucb/source/ucp/gvfs/gvfs_provider.cxx Sun Dec  1 11:40:24 2013
@@ -108,8 +108,7 @@ ContentProvider::queryContent(
 {
 #ifdef DEBUG
     g_warning ("QueryContent: '%s'",
-               (const sal_Char *)rtl::OUStringToOString
-               (Identifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8));
+               rtl::OUStringToOString( Identifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8).getStr());
 #endif
 
     osl::MutexGuard aGuard( m_aMutex );

Modified: openoffice/branches/l10n40/main/ucb/source/ucp/webdav/DAVProperties.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/ucb/source/ucp/webdav/DAVProperties.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/ucb/source/ucp/webdav/DAVProperties.cxx (original)
+++ openoffice/branches/l10n40/main/ucb/source/ucp/webdav/DAVProperties.cxx Sun Dec  1 11:40:24 2013
@@ -66,7 +66,7 @@ void DAVProperties::createSerfPropName( 
         rName.name
             = strdup( rtl::OUStringToOString(
                         rFullName.copy( RTL_CONSTASCII_LENGTH( "DAV:" ) ),
-                                        RTL_TEXTENCODING_UTF8 ) );
+                                        RTL_TEXTENCODING_UTF8 ).getStr() );
     }
     else if ( rFullName.compareToAscii( RTL_CONSTASCII_STRINGPARAM(
                 "http://apache.org/dav/props/" ) ) == 0 )
@@ -77,7 +77,7 @@ void DAVProperties::createSerfPropName( 
                         rFullName.copy(
                             RTL_CONSTASCII_LENGTH(
                                 "http://apache.org/dav/props/" ) ),
-                            RTL_TEXTENCODING_UTF8 ) );
+                            RTL_TEXTENCODING_UTF8 ).getStr() );
     }
     else if ( rFullName.compareToAscii( RTL_CONSTASCII_STRINGPARAM(
                 "http://ucb.openoffice.org/dav/props/" ) ) == 0 )
@@ -88,7 +88,7 @@ void DAVProperties::createSerfPropName( 
                         rFullName.copy(
                             RTL_CONSTASCII_LENGTH(
                                 "http://ucb.openoffice.org/dav/props/" ) ),
-                            RTL_TEXTENCODING_UTF8 ) );
+                            RTL_TEXTENCODING_UTF8 ).getStr() );
     }
     else if ( rFullName.compareToAscii( RTL_CONSTASCII_STRINGPARAM(
                 "<prop:" ) ) == 0 )
@@ -102,11 +102,11 @@ void DAVProperties::createSerfPropName( 
 
         sal_Int32 nStart = RTL_CONSTASCII_LENGTH( "<prop:" );
         sal_Int32 nLen = aFullName.indexOf( ' ' ) - nStart;
-        rName.name = strdup( aFullName.copy( nStart, nLen ) );
+        rName.name = strdup( aFullName.copy( nStart, nLen ).getStr() );
 
         nStart = aFullName.indexOf( '=', nStart + nLen ) + 2; // after ="
         nLen = aFullName.getLength() - RTL_CONSTASCII_LENGTH( "\">" ) - nStart;
-        rName.nspace = strdup( aFullName.copy( nStart, nLen ) );
+        rName.nspace = strdup( aFullName.copy( nStart, nLen ).getStr() );
     }
     else
     {
@@ -114,7 +114,7 @@ void DAVProperties::createSerfPropName( 
         rName.nspace = "http://ucb.openoffice.org/dav/props/";
         rName.name
             = strdup( rtl::OUStringToOString( rFullName,
-                                              RTL_TEXTENCODING_UTF8 ) );
+                                              RTL_TEXTENCODING_UTF8 ).getStr() );
     }
 }
 

Modified: openoffice/branches/l10n40/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx (original)
+++ openoffice/branches/l10n40/main/ucb/source/ucp/webdav/SerfRequestProcessor.cxx Sun Dec  1 11:40:24 2013
@@ -55,7 +55,7 @@ SerfRequestProcessor::SerfRequestProcess
     , mbHandleSerfResponseCalled( false )
 {
     mPathStr = apr_pstrdup( mrSerfSession.getAprPool(), 
-                            rtl::OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ) );
+                            rtl::OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr() );
 }
 
 SerfRequestProcessor::~SerfRequestProcessor()
@@ -214,9 +214,9 @@ bool SerfRequestProcessor::processPost( 
                                         apr_status_t& outSerfStatus )
 {
     mContentType = apr_pstrdup( mrSerfSession.getAprPool(), 
-                                rtl::OUStringToOString( inContentType, RTL_TEXTENCODING_UTF8 ) );
+                                rtl::OUStringToOString( inContentType, RTL_TEXTENCODING_UTF8 ).getStr() );
     mReferer = apr_pstrdup( mrSerfSession.getAprPool(), 
-                                rtl::OUStringToOString( inReferer, RTL_TEXTENCODING_UTF8 ) );
+                                rtl::OUStringToOString( inReferer, RTL_TEXTENCODING_UTF8 ).getStr() );
     mpProcImpl = createPostReqProcImpl( mPathStr,
                                         mrSerfSession.getRequestEnvironment().m_aRequestHeaders,
                                         inData,
@@ -238,9 +238,9 @@ bool SerfRequestProcessor::processPost( 
                                         apr_status_t& outSerfStatus )
 {
     mContentType = apr_pstrdup( mrSerfSession.getAprPool(), 
-                                rtl::OUStringToOString( inContentType, RTL_TEXTENCODING_UTF8 ) );
+                                rtl::OUStringToOString( inContentType, RTL_TEXTENCODING_UTF8 ).getStr() );
     mReferer = apr_pstrdup( mrSerfSession.getAprPool(), 
-                            rtl::OUStringToOString( inReferer, RTL_TEXTENCODING_UTF8 ) );
+                            rtl::OUStringToOString( inReferer, RTL_TEXTENCODING_UTF8 ).getStr() );
     mpProcImpl = createPostReqProcImpl( mPathStr,
                                         mrSerfSession.getRequestEnvironment().m_aRequestHeaders,
                                         inData,
@@ -279,7 +279,7 @@ bool SerfRequestProcessor::processCopy( 
                                         apr_status_t& outSerfStatus )
 {
     mDestPathStr = apr_pstrdup( mrSerfSession.getAprPool(), 
-                                rtl::OUStringToOString( inDestinationPath, RTL_TEXTENCODING_UTF8 ) );
+                                rtl::OUStringToOString( inDestinationPath, RTL_TEXTENCODING_UTF8 ).getStr() );
     mpProcImpl = createCopyReqProcImpl( mPathStr,
                                         mrSerfSession.getRequestEnvironment().m_aRequestHeaders,
                                         mDestPathStr,
@@ -295,7 +295,7 @@ bool SerfRequestProcessor::processMove( 
                                         apr_status_t& outSerfStatus )
 {
     mDestPathStr = apr_pstrdup( mrSerfSession.getAprPool(), 
-                                rtl::OUStringToOString( inDestinationPath, RTL_TEXTENCODING_UTF8 ) );
+                                rtl::OUStringToOString( inDestinationPath, RTL_TEXTENCODING_UTF8 ).getStr() );
     mpProcImpl = createMoveReqProcImpl( mPathStr,
                                         mrSerfSession.getRequestEnvironment().m_aRequestHeaders,
                                         mDestPathStr,

Modified: openoffice/branches/l10n40/main/ucb/source/ucp/webdav/SerfSession.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/ucb/source/ucp/webdav/SerfSession.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/ucb/source/ucp/webdav/SerfSession.cxx (original)
+++ openoffice/branches/l10n40/main/ucb/source/ucp/webdav/SerfSession.cxx Sun Dec  1 11:40:24 2013
@@ -163,7 +163,7 @@ void SerfSession::Init()
         {
             apr_sockaddr_t *proxy_address = NULL;
             status = apr_sockaddr_info_get( &proxy_address, 
-                                                               rtl::OUStringToOString( m_aProxyName, RTL_TEXTENCODING_UTF8 ), 
+                                                               rtl::OUStringToOString( m_aProxyName, RTL_TEXTENCODING_UTF8 ).getStr(), 
                                                                APR_UNSPEC,
                                                                static_cast<apr_port_t>(m_nProxyPort), 
                                                                0, getAprPool() );
@@ -339,8 +339,8 @@ apr_status_t SerfSession::provideSerfCre
 
     if ( theRetVal == 0 )
     {
-        *outUsername = apr_pstrdup( inAprPool, rtl::OUStringToOString( theUserName, RTL_TEXTENCODING_UTF8 ) );
-        *outPassword = apr_pstrdup( inAprPool, rtl::OUStringToOString( thePassWord, RTL_TEXTENCODING_UTF8 ) );
+        *outUsername = apr_pstrdup( inAprPool, rtl::OUStringToOString( theUserName, RTL_TEXTENCODING_UTF8 ).getStr() );
+        *outPassword = apr_pstrdup( inAprPool, rtl::OUStringToOString( thePassWord, RTL_TEXTENCODING_UTF8 ).getStr() );
     }
 
     return theRetVal != 0 ? SERF_ERROR_AUTHN_FAILED : APR_SUCCESS;

Modified: openoffice/branches/l10n40/main/unodevtools/source/skeletonmaker/skeletoncommon.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/unodevtools/source/skeletonmaker/skeletoncommon.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/unodevtools/source/skeletonmaker/skeletoncommon.hxx (original)
+++ openoffice/branches/l10n40/main/unodevtools/source/skeletonmaker/skeletoncommon.hxx Sun Dec  1 11:40:24 2013
@@ -32,6 +32,8 @@
 #include <hash_set>
 #include <map>
 
+inline std::ostream& operator<<( std::ostream& s, const rtl::OString r) { return (s << r.getStr()); }
+
 namespace skeletonmaker {
 
 typedef ::std::map< ::rtl::OString, ::std::vector< ::rtl::OString >,

Modified: openoffice/branches/l10n40/main/unotools/source/config/cmdoptions.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/unotools/source/config/cmdoptions.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/unotools/source/config/cmdoptions.cxx (original)
+++ openoffice/branches/l10n40/main/unotools/source/config/cmdoptions.cxx Sun Dec  1 11:40:24 2013
@@ -102,7 +102,7 @@ class SvtCmdOptions
 
         void SetContainerSize( sal_Int32 nSize )
 		{
-			m_aCommandHashMap.resize( nSize );
+			m_aCommandHashMap.rehash( nSize );
 		}
 
 		sal_Bool Lookup( const OUString& aCmd ) const

Modified: openoffice/branches/l10n40/main/unotools/source/ucbhelper/tempfile.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/unotools/source/ucbhelper/tempfile.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/unotools/source/ucbhelper/tempfile.cxx (original)
+++ openoffice/branches/l10n40/main/unotools/source/ucbhelper/tempfile.cxx Sun Dec  1 11:40:24 2013
@@ -156,7 +156,7 @@ String ConstructTempDir_Impl( const Stri
                 if ( aRet[i-1] == '/' )
                     i--;
 
-                if ( DirectoryItem::get( ::rtl::OUString( aRet, i ), aItem ) == FileBase::E_None )
+                if ( DirectoryItem::get( ::rtl::OUString( aRet.getStr(), i ), aItem ) == FileBase::E_None )
                     aName = aRet;
             }
         }

Modified: openoffice/branches/l10n40/main/unoxml/source/dom/characterdata.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/unoxml/source/dom/characterdata.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/unoxml/source/dom/characterdata.cxx (original)
+++ openoffice/branches/l10n40/main/unoxml/source/dom/characterdata.cxx Sun Dec  1 11:40:24 2013
@@ -89,7 +89,7 @@ namespace DOM
             ::boost::shared_ptr<xmlChar const> const pContent(
                 xmlNodeGetContent(m_aNodePtr), xmlFree);
             OString aData(reinterpret_cast<sal_Char const*>(pContent.get()));
-            OUString tmp(aData, aData.getLength(), RTL_TEXTENCODING_UTF8);
+            OUString tmp( aData.getStr(), aData.getLength(), RTL_TEXTENCODING_UTF8);
             if (offset > tmp.getLength() || offset < 0 || count < 0) {
                 DOMException e;
                 e.Code = DOMExceptionType_INDEX_SIZE_ERR;
@@ -160,7 +160,7 @@ namespace DOM
             ::boost::shared_ptr<xmlChar const> const pContent(
                 xmlNodeGetContent(m_aNodePtr), xmlFree);
             OString aData(reinterpret_cast<sal_Char const*>(pContent.get()));
-            OUString tmp(aData, aData.getLength(), RTL_TEXTENCODING_UTF8);
+            OUString tmp( aData.getStr(), aData.getLength(), RTL_TEXTENCODING_UTF8);
             if (offset > tmp.getLength() || offset < 0) {
                 DOMException e;
                 e.Code = DOMExceptionType_INDEX_SIZE_ERR;
@@ -195,7 +195,7 @@ namespace DOM
             ::boost::shared_ptr<xmlChar const> const pContent(
                 xmlNodeGetContent(m_aNodePtr), xmlFree);
             OString aData(reinterpret_cast<sal_Char const*>(pContent.get()));
-            OUString tmp(aData, aData.getLength(), RTL_TEXTENCODING_UTF8);
+            OUString tmp( aData.getStr(), aData.getLength(), RTL_TEXTENCODING_UTF8);
             if (offset > tmp.getLength() || offset < 0 || count < 0){
                 DOMException e;
                 e.Code = DOMExceptionType_INDEX_SIZE_ERR;
@@ -250,7 +250,7 @@ namespace DOM
             ::boost::shared_ptr<xmlChar const> const pContent(
                 xmlNodeGetContent(m_aNodePtr), xmlFree);
             OString aData(reinterpret_cast<sal_Char const*>(pContent.get()));
-            OUString tmp(aData, aData.getLength(), RTL_TEXTENCODING_UTF8);
+            OUString tmp( aData.getStr(), aData.getLength(), RTL_TEXTENCODING_UTF8);
             if (offset > tmp.getLength() || offset < 0 || count < 0) {
                 DOMException e;
                 e.Code = DOMExceptionType_INDEX_SIZE_ERR;

Modified: openoffice/branches/l10n40/main/vcl/inc/ilstbox.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/inc/ilstbox.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/inc/ilstbox.hxx (original)
+++ openoffice/branches/l10n40/main/vcl/inc/ilstbox.hxx Sun Dec  1 11:40:24 2013
@@ -250,10 +250,8 @@ private:
 	Link			maDoubleClickHdl;
 	Link			maUserDrawHdl;
 	Link			maMRUChangedHdl;
-//IAccessibility2 Implementation 2009-----
 	Link			maFocusHdl;
 	Link			maListItemSelectHdl;
-//-----IAccessibility2 Implementation 2009
 
     ::vcl::QuickSelectionEngine maQuickSelectionEngine;
 
@@ -267,10 +265,8 @@ protected:
 	virtual void	GetFocus();
 	virtual void	LoseFocus();
 
-	//IAccessibility2 Implementation 2009-----
 	//sal_Bool			SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLET, sal_Bool bShift = sal_False, sal_Bool bCtrl = sal_False );
 	sal_Bool			SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLET, sal_Bool bShift = sal_False, sal_Bool bCtrl = sal_False, sal_Bool bSelectPosChange = sal_False );
-	//-----IAccessibility2 Implementation 2009
 	void			ImplPaint( sal_uInt16 nPos, sal_Bool bErase = sal_False, bool bLayout = false );
     void			ImplDoPaint( const Rectangle& rRect, bool bLayout = false );
 	void			ImplCalcMetrics();
@@ -367,13 +363,11 @@ public:
 	const Link& 	GetUserDrawHdl() const				{ return maUserDrawHdl; }
 	void			SetMRUChangedHdl( const Link& rLink )	{ maMRUChangedHdl = rLink; }
 	const Link& 	GetMRUChangedHdl() const				{ return maMRUChangedHdl; }
-//IAccessibility2 Implementation 2009-----
 	void			SetFocusHdl( const Link& rLink )	{ maFocusHdl = rLink ; }
 	const Link& 	GetFocusHdl() const				{ return maFocusHdl; }
 
 	void			SetListItemSelectHdl( const Link& rLink )	{ maListItemSelectHdl = rLink ; }
 	const Link& 	GetListItemSelectHdl() const				{ return maListItemSelectHdl; }
-//-----IAccessibility2 Implementation 2009
 	bool			IsSelectionChanged() const { return mbSelectionChanged; }
 	sal_uInt16			GetSelectModifier() const { return mnSelectModifier; }
 
@@ -510,12 +504,10 @@ public:
 	void			SetUserDrawHdl( const Link& rLink )	{ maLBWindow.SetUserDrawHdl( rLink ); }
 	const Link& 	GetUserDrawHdl() const				{ return maLBWindow.GetUserDrawHdl(); }
 
-//IAccessibility2 Implementation 2009-----
 	void			SetFocusHdl( const Link& rLink )	{ maLBWindow.SetFocusHdl( rLink ); }
 	const Link& 	GetFocusHdl() const				{ return maLBWindow.GetFocusHdl(); }
 	void			SetListItemSelectHdl( const Link& rLink )	{ maLBWindow.SetListItemSelectHdl( rLink ); }
 	const Link& 	GetListItemSelectHdl() const	{ return maLBWindow.GetListItemSelectHdl(); }
-//-----IAccessibility2 Implementation 2009
 	void			SetSelectionChangedHdl( const Link& rLnk )	{ maLBWindow.GetEntryList()->SetSelectionChangedHdl( rLnk ); }
 	void			SetCallSelectionChangedHdl( sal_Bool bCall )	{ maLBWindow.GetEntryList()->SetCallSelectionChangedHdl( bCall ); }
 	sal_Bool			IsSelectionChanged() const 					{ return maLBWindow.IsSelectionChanged(); }

Modified: openoffice/branches/l10n40/main/vcl/inc/svdata.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/inc/svdata.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/inc/svdata.hxx (original)
+++ openoffice/branches/l10n40/main/vcl/inc/svdata.hxx Sun Dec  1 11:40:24 2013
@@ -182,9 +182,7 @@ struct ImplSVAppData
      */
     ImeStatusWindowMode meShowImeStatusWindow;
 
-//IAccessibility2 Implementation 2009-----
 	long m_bEnableAccessInterface;
-//-----IAccessibility2 Implementation 2009
                             DECL_STATIC_LINK( ImplSVAppData, ImplQuitMsg, void* );
                            
 };

Modified: openoffice/branches/l10n40/main/vcl/inc/vcl/combobox.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/inc/vcl/combobox.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/inc/vcl/combobox.hxx (original)
+++ openoffice/branches/l10n40/main/vcl/inc/vcl/combobox.hxx Sun Dec  1 11:40:24 2013
@@ -67,9 +67,7 @@ private:
     DECL_DLLPRIVATE_LINK(   ImplSelectionChangedHdl, void* );
     DECL_DLLPRIVATE_LINK(   ImplUserDrawHdl, UserDrawEvent* );
     DECL_DLLPRIVATE_LINK(   ImplAutocompleteHdl, Edit* );
-    //IAccessibility2 Implementation 2009-----
     DECL_DLLPRIVATE_LINK( ImplListItemSelectHdl , void* );
-    //-----IAccessibility2 Implementation 2009
 
 protected:
     using Window::ImplInit;
@@ -185,9 +183,7 @@ public:
     XubString       GetMRUEntries( xub_Unicode cSep = ';' ) const;
     void            SetMaxMRUCount( sal_uInt16 n );
     sal_uInt16          GetMaxMRUCount() const;
-//IAccessibility2 Implementation 2009-----
     sal_uInt16 	GetMRUCount() const;
-//-----IAccessibility2 Implementation 2009
     void            SetEntryData( sal_uInt16 nPos, void* pNewData );
     void*           GetEntryData( sal_uInt16 nPos ) const;
 
@@ -227,9 +223,7 @@ public:
      */
     using Control::GetIndexForPoint;
     long GetIndexForPoint( const Point& rPoint, sal_uInt16& rPos ) const;
-//IAccessibility2 Implementation 2009-----
   	void  SetMpSubEditAccessibleName(String &aName);
-//-----IAccessibility2 Implementation 2009
 };
 
 #endif  // _COMBOBOX_HXX

Modified: openoffice/branches/l10n40/main/vcl/inc/vcl/lstbox.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/inc/vcl/lstbox.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/inc/vcl/lstbox.hxx (original)
+++ openoffice/branches/l10n40/main/vcl/inc/vcl/lstbox.hxx Sun Dec  1 11:40:24 2013
@@ -67,10 +67,8 @@ private:
 	DECL_DLLPRIVATE_LINK(  ImplPopupModeEndHdl, void* );
 	DECL_DLLPRIVATE_LINK(  ImplSelectionChangedHdl, void* );
 	DECL_DLLPRIVATE_LINK(  ImplUserDrawHdl, UserDrawEvent* );
-//IAccessibility2 Implementation 2009-----
 					DECL_DLLPRIVATE_LINK( ImplFocusHdl, void* );					
 					DECL_DLLPRIVATE_LINK( ImplListItemSelectHdl , void* );
-//-----IAccessibility2 Implementation 2009
 protected:
     using Window::ImplInit;
 	SAL_DLLPRIVATE void    ImplInit( Window* pParent, WinBits nStyle );
@@ -220,9 +218,7 @@ public:
 	XubString		GetMRUEntries( xub_Unicode cSep = ';' ) const;
 	void			SetMaxMRUCount( sal_uInt16 n );
 	sal_uInt16			GetMaxMRUCount() const;
-//IAccessibility2 Implementation 2009-----
 	sal_uInt16 			GetMRUCount() const;
-//-----IAccessibility2 Implementation 2009
     sal_uInt16			GetDisplayLineCount() const;
 
 	void			EnableMirroring();

Modified: openoffice/branches/l10n40/main/vcl/inc/vcl/menu.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/inc/vcl/menu.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/inc/vcl/menu.hxx (original)
+++ openoffice/branches/l10n40/main/vcl/inc/vcl/menu.hxx Sun Dec  1 11:40:24 2013
@@ -151,9 +151,7 @@ private:
 	sal_uInt16				nMenuFlags;
 	sal_uInt16				nDefaultItem;		// Id vom Default-Item
 	sal_uInt16				nSelectedId;
-//IAccessibility2 Implementation 2009-----
 	sal_uInt16				nHighlightedItem;
-//-----IAccessibility2 Implementation 2009
 	// Fuer Ausgabe:
 	sal_uInt16				nCheckPos;
 	sal_uInt16				nImagePos;
@@ -244,14 +242,12 @@ public:
 	sal_uInt16				GetItemPos( sal_uInt16 nItemId ) const;
 	MenuItemType		GetItemType( sal_uInt16 nPos ) const;
 	sal_uInt16				GetCurItemId() const;
-//IAccessibility2 Implementation 2009-----
 	void 					SetHightlightItem( sal_uInt16 nHighlightedItem );
 	sal_uInt16 				GetHighlightItem() const;
 
 	XubString			GetItemAccKeyStrFromPos(sal_uInt16 nPos ) const ;
 
 	sal_Bool				IsTemporaryItemFromPos(sal_uInt16 nPos ) const;
-//-----IAccessibility2 Implementation 2009
 	void				SetDefaultItem( sal_uInt16 nItemId )	{ nDefaultItem = nItemId; }
 	sal_uInt16				GetDefaultItem() const				{ return nDefaultItem; }
 
@@ -380,9 +376,7 @@ public:
 
 	void				SetAccessibleDescription( sal_uInt16 nItemId, const XubString& rStr );
 	XubString			GetAccessibleDescription( sal_uInt16 nItemId ) const;
-//IAccessibility2 Implementation 2009
 	Menu* GetStartedFromMenu(){ return pStartedFrom ;}
-//-----IAccessibility2 Implementation 2009
     
     // returns whether the item a position nItemPos is highlighted or not.
     bool  IsHighlighted( sal_uInt16 nItemPos ) const;

Modified: openoffice/branches/l10n40/main/vcl/inc/vcl/svapp.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/inc/vcl/svapp.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/inc/vcl/svapp.hxx (original)
+++ openoffice/branches/l10n40/main/vcl/inc/vcl/svapp.hxx Sun Dec  1 11:40:24 2013
@@ -448,10 +448,8 @@ public:
     
     static void                 ShowNativeErrorBox(const String& sTitle  ,
                                                    const String& sMessage);
-//IAccessibility2 Implementation 2009-----
 	static bool					EnableAccessInterface(bool bEnable);
 	static bool					IsEnableAccessInterface();
-//-----IAccessibility2 Implementation 2009
 
     // IME Status Window Control:
 
@@ -518,7 +516,6 @@ inline void Application::EndYield()
     PostUserEvent( Link() );
 }
 
-//IAccessibility2 Implementation 2009-----
 #ifdef WNT
 VCL_DLLPUBLIC sal_Bool HasAtHook();
 VCL_DLLPUBLIC bool IsWNTInitAccessBridge();
@@ -540,5 +537,4 @@ private:
 	bool m_bIsEnableAccessInterface;
 };
 #endif
-//-----IAccessibility2 Implementation 2009
 #endif // _APP_HXX



Mime
View raw message