openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1546803 [2/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/accessibilit...
Date Sun, 01 Dec 2013 11:40:35 GMT
Modified: openoffice/branches/l10n40/main/connectivity/source/drivers/adabas/BDriver.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/connectivity/source/drivers/adabas/BDriver.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/connectivity/source/drivers/adabas/BDriver.cxx (original)
+++ openoffice/branches/l10n40/main/connectivity/source/drivers/adabas/BDriver.cxx Sun Dec  1 11:40:24 2013
@@ -44,6 +44,9 @@
 #include <memory>
 #include <sys/stat.h>
 
+inline SvStream& operator<<( SvStream& s, const rtl::OString r) { return (s << r.getStr()); }
+inline SvStream& operator<<( SvStream& s, const rtl::OUString r) { return (s << ::rtl::OUStringToOString(r,gsl_getSystemTextEncoding())); }
+
 #if defined(UNX)
 const char sNewLine = '\012';
 #else
@@ -959,7 +962,7 @@ void ODriver::createDb( const TDatabaseS
 		{
 			::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(aInitFile.GetURL(),STREAM_WRITE) );
 			(*pFileStream)	<< "ALTER USER \""
-							<< ::rtl::OString(_aInfo.sSysUser,_aInfo.sSysUser.getLength(),gsl_getSystemTextEncoding())
+							<< _aInfo.sSysUser
 							<< "\" NOT EXCLUSIVE "
 							<< sNewLine;
 			pFileStream->Flush();
@@ -989,13 +992,13 @@ int ODriver::X_PARAM(const ::rtl::OUStri
 						<< ".exe"
 #endif
 						<< " -d "
-						<< ::rtl::OString(_DBNAME,_DBNAME.getLength(),gsl_getSystemTextEncoding())
+						<< _DBNAME
 						<< " -u "
-						<< ::rtl::OString(_USR,_USR.getLength(),gsl_getSystemTextEncoding())
+						<< _USR
 						<< ","
-						<< ::rtl::OString(_PWD,_PWD.getLength(),gsl_getSystemTextEncoding())
+						<< _PWD
 						<< " "
-						<< ::rtl::OString(_CMD,_CMD.getLength(),gsl_getSystemTextEncoding())
+						<< _CMD
 #if defined(WNT)
 #if (OSL_DEBUG_LEVEL > 1) || defined(DBG_UTIL)
 						<< " >> %DBWORK%\\create.log 2>&1"
@@ -1197,15 +1200,15 @@ void ODriver::XUTIL(const ::rtl::OUStrin
 							"utility"
 #endif
 						<< " -u "
-						<< ::rtl::OString(_USRNAME,_USRNAME.getLength(),gsl_getSystemTextEncoding())
+						<< _USRNAME
 						<< ","
-						<< ::rtl::OString(_USRPWD,_USRPWD.getLength(),gsl_getSystemTextEncoding())
+						<< _USRPWD
 						<< " -d "
-						<< ::rtl::OString(_DBNAME,_DBNAME.getLength(),gsl_getSystemTextEncoding())
+						<< _DBNAME
 						<< " "
-						<< ::rtl::OString(_rParam,_rParam.getLength(),gsl_getSystemTextEncoding())
+						<< _rParam
 						<< " > "
-						<< ::rtl::OString(sPhysicalPath.GetBuffer(),sPhysicalPath.Len(),gsl_getSystemTextEncoding())
+						<< sPhysicalPath
 						<< " 2>&1"
 						<< sNewLine;
 		pFileStream->Flush();
@@ -1248,20 +1251,20 @@ void ODriver::LoadBatch(const ::rtl::OUS
 						<< ".exe"
 #endif
 						<< " -d "
-						<< ::rtl::OString(sDBName,sDBName.getLength(),gsl_getSystemTextEncoding())
+						<< sDBName
 						<< " -u "
-						<< ::rtl::OString(_rUSR,_rUSR.getLength(),gsl_getSystemTextEncoding())
+						<< _rUSR
 						<< ","
-						<< ::rtl::OString(_rPWD,_rPWD.getLength(),gsl_getSystemTextEncoding());
+						<< _rPWD;
 						
 		if ( !isKernelVersion(CURRENT_DB_VERSION) )
 			(*pFileStream) << " -S adabas -b ";
 		else
 			(*pFileStream) << " -S NATIVE -b ";
 
-		(*pFileStream)	<< ::rtl::OString(_rBatch,_rBatch.getLength(),gsl_getSystemTextEncoding())
+		(*pFileStream)	<< _rBatch
 						<< " > "
-						<< ::rtl::OString(sPhysicalPath.GetBuffer(),sPhysicalPath.Len(),gsl_getSystemTextEncoding())
+						<< sPhysicalPath
 						<< " 2>&1"
 						<< sNewLine;
 
@@ -1378,7 +1381,7 @@ void ODriver::fillEnvironmentVariables()
 		{
 			String sTemp;
 			LocalFileHelper::ConvertURLToPhysicalName(_aDBInfo.sSysDevSpace,sTemp);
-			(*pFileStream) << ::rtl::OString(sTemp.GetBuffer(),sTemp.Len(),gsl_getSystemTextEncoding());
+			(*pFileStream) << sTemp;
 		}
 		(*pFileStream) << "\n* log devspace size:\n";
 		(*pFileStream) << ::rtl::OString::valueOf(_aDBInfo.nLogSize);
@@ -1386,7 +1389,7 @@ void ODriver::fillEnvironmentVariables()
 		{
 			String sTemp;
 			LocalFileHelper::ConvertURLToPhysicalName(_aDBInfo.sTransLogName,sTemp);
-			(*pFileStream) << ::rtl::OString(sTemp.GetBuffer(),sTemp.Len(),gsl_getSystemTextEncoding());
+			(*pFileStream) << sTemp;
 		}
 		(*pFileStream) << "\n* data devspace size:\n";
 		(*pFileStream) << ::rtl::OString::valueOf(_aDBInfo.nDataSize);
@@ -1394,7 +1397,7 @@ void ODriver::fillEnvironmentVariables()
 		{
 			String sTemp;
 			LocalFileHelper::ConvertURLToPhysicalName(_aDBInfo.sDataDevName,sTemp);
-			(*pFileStream) << ::rtl::OString(sTemp.GetBuffer(),sTemp.Len(),gsl_getSystemTextEncoding());
+			(*pFileStream) << sTemp;
 		}
 
 		(*pFileStream) << "\n* END INIT CONFIG\n";
@@ -1405,7 +1408,7 @@ void ODriver::fillEnvironmentVariables()
 			{
 				String sTemp;
 				LocalFileHelper::ConvertURLToPhysicalName(_aDBInfo.sBackupFile,sTemp);
-				(*pFileStream) << ::rtl::OString(sTemp.GetBuffer(),sTemp.Len(),gsl_getSystemTextEncoding());
+				(*pFileStream) << sTemp;
 			}
 			(*pFileStream) << "' BLOCKSIZE 8\n";
 			(*pFileStream) << "if $rc <> 0 then stop\n";
@@ -1415,9 +1418,9 @@ void ODriver::fillEnvironmentVariables()
 		else
 		{
 			(*pFileStream) << "ACTIVATE SERVERDB SYSDBA \"";
-			(*pFileStream) << ::rtl::OString(_aDBInfo.sSysUser,_aDBInfo.sSysUser.getLength(),gsl_getSystemTextEncoding());
+			(*pFileStream) << _aDBInfo.sSysUser;
 			(*pFileStream) << "\" PASSWORD \"";
-			(*pFileStream) << ::rtl::OString(_aDBInfo.sSysPassword,_aDBInfo.sSysPassword.getLength(),gsl_getSystemTextEncoding());
+			(*pFileStream) << _aDBInfo.sSysPassword;
 			(*pFileStream) << "\"\n";
 		}
 		(*pFileStream) << "if $rc <> 0 then stop\n";
@@ -1441,11 +1444,11 @@ void ODriver::X_CONS(const ::rtl::OUStri
 						<< ".exe"
 #endif
 						<< " "
-						<< ::rtl::OString(sDBName,sDBName.getLength(),gsl_getSystemTextEncoding())
+						<< sDBName
 						<< " SHOW "
 						<< _ACTION
 						<< " > "
-						<< ::rtl::OString(sPhysicalPath.GetBuffer(),sPhysicalPath.Len(),gsl_getSystemTextEncoding())
+						<< sPhysicalPath
 						<< sNewLine;
 		pFileStream->Flush();
 	}
@@ -1524,9 +1527,9 @@ sal_Bool ODriver::isVersion(const ::rtl:
 						<< ".exe"
 #endif
 						<< " "
-						<< ::rtl::OString(sDBName,sDBName.getLength(),gsl_getSystemTextEncoding())
+						<< sDBName
 						<< " KERNELVERSION > "
-						<< ::rtl::OString(sPhysicalPath.GetBuffer(),sPhysicalPath.Len(),gsl_getSystemTextEncoding())
+						<< sPhysicalPath
 						<< sNewLine;
 	}
 
@@ -1574,9 +1577,9 @@ void ODriver::checkAndInsertNewDevSpace(
 						<< ".exe"
 #endif
 						<< " "
-						<< ::rtl::OString(sDBName,sDBName.getLength(),gsl_getSystemTextEncoding())
+						<< sDBName
 						<< " DATA_CACHE_PAGES > "
-						<< ::rtl::OString(sPhysicalPath.GetBuffer(),sPhysicalPath.Len(),gsl_getSystemTextEncoding())
+						<< sPhysicalPath
 						<< sNewLine;
 	}
 
@@ -1621,7 +1624,7 @@ sal_Bool ODriver::isKernelVersion(const 
 
 		(*pFileStream)	<< "dbversion"
 						<< " > "
-						<< ::rtl::OString(sPhysicalPath.GetBuffer(),sPhysicalPath.Len(),gsl_getSystemTextEncoding())
+						<< sPhysicalPath
 						<< sNewLine;
 	}
 
@@ -1731,13 +1734,13 @@ void ODriver::installSystemTables(	const
 		pFileStream->Seek(STREAM_SEEK_TO_END);
 		(*pFileStream)	<< "x_dbinst"
 						<< " -d "
-						<< ::rtl::OString(_aInfo.sDBName,_aInfo.sDBName.getLength(),gsl_getSystemTextEncoding())
+						<< _aInfo.sDBName
 						<< " -u "
-						<< ::rtl::OString(_aInfo.sSysUser,_aInfo.sSysUser.getLength(),gsl_getSystemTextEncoding())
+						<< _aInfo.sSysUser
 						<< ","
-						<< ::rtl::OString(_aInfo.sSysPassword,_aInfo.sSysPassword.getLength(),gsl_getSystemTextEncoding())
+						<< _aInfo.sSysPassword
 						<< " -w "
-						<< ::rtl::OString(_aInfo.sDomainPassword,_aInfo.sDomainPassword.getLength(),gsl_getSystemTextEncoding())
+						<< _aInfo.sDomainPassword
 						<< " -b ";
 
 		if ( isKernelVersion(ADABAS_KERNEL_11) )

Modified: openoffice/branches/l10n40/main/connectivity/source/drivers/jdbc/Class.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/connectivity/source/drivers/jdbc/Class.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/connectivity/source/drivers/jdbc/Class.cxx (original)
+++ openoffice/branches/l10n40/main/connectivity/source/drivers/jdbc/Class.cxx Sun Dec  1 11:40:24 2013
@@ -53,7 +53,7 @@ java_lang_Class * java_lang_Class::forNa
 	{
 		::rtl::OString sClassName = ::rtl::OUStringToOString(_par0, RTL_TEXTENCODING_JAVA_UTF8);
 		sClassName = sClassName.replace('.','/');
-		out = t.pEnv->FindClass(sClassName);
+		out = t.pEnv->FindClass( sClassName.getStr());
 		ThrowSQLException(t.pEnv,0);
 	} //t.pEnv
 	// ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!!

Modified: openoffice/branches/l10n40/main/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx (original)
+++ openoffice/branches/l10n40/main/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx Sun Dec  1 11:40:24 2013
@@ -879,7 +879,7 @@ void ODatabaseMetaDataResultSet::openTab
 
 	const char	*pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr()	: NULL,
 				*pPKO = pSchemaPat && pSchemaPat->getLength() ? aPKO.getStr() : NULL,
-				*pPKN = aPKN = ::rtl::OUStringToOString(tableNamePattern,m_nTextEncoding).getStr();
+				*pPKN = (aPKN = ::rtl::OUStringToOString(tableNamePattern,m_nTextEncoding)).getStr();
 
 
 	const char	*pCOL = NULL;
@@ -981,8 +981,8 @@ void ODatabaseMetaDataResultSet::openCol
 
 	const char	*pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr()	: NULL,
 				*pPKO = pSchemaPat && pSchemaPat->getLength() ? aPKO.getStr() : NULL,
-				*pPKN = aPKN = ::rtl::OUStringToOString(table,m_nTextEncoding).getStr(),
-				*pCOL = aCOL = ::rtl::OUStringToOString(columnNamePattern,m_nTextEncoding).getStr();
+				*pPKN = (aPKN = ::rtl::OUStringToOString(table,m_nTextEncoding)).getStr(),
+				*pCOL = (aCOL = ::rtl::OUStringToOString(columnNamePattern,m_nTextEncoding)).getStr();
 
 
 	SQLRETURN nRetcode = N3SQLColumnPrivileges(m_aStatementHandle,
@@ -1014,8 +1014,8 @@ void ODatabaseMetaDataResultSet::openCol
 
 	const char	*pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr()	: NULL,
 				*pPKO = pSchemaPat && pSchemaPat->getLength() && pSchemaPat->getLength() ? aPKO.getStr() : NULL,
-				*pPKN = aPKN = ::rtl::OUStringToOString(tableNamePattern,m_nTextEncoding).getStr(),
-				*pCOL = aCOL = ::rtl::OUStringToOString(columnNamePattern,m_nTextEncoding).getStr();
+				*pPKN = (aPKN = ::rtl::OUStringToOString(tableNamePattern,m_nTextEncoding)).getStr(),
+				*pCOL = (aCOL = ::rtl::OUStringToOString(columnNamePattern,m_nTextEncoding)).getStr();
 
 
 	SQLRETURN nRetcode = N3SQLColumns(m_aStatementHandle,
@@ -1081,8 +1081,8 @@ void ODatabaseMetaDataResultSet::openPro
 
 	const char	*pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr()	: NULL,
 				*pPKO = pSchemaPat && pSchemaPat->getLength() ? aPKO.getStr() : NULL,
-				*pPKN = aPKN = ::rtl::OUStringToOString(procedureNamePattern,m_nTextEncoding).getStr(),
-				*pCOL = aCOL = ::rtl::OUStringToOString(columnNamePattern,m_nTextEncoding).getStr();
+				*pPKN = (aPKN = ::rtl::OUStringToOString(procedureNamePattern,m_nTextEncoding)).getStr(),
+				*pCOL = (aCOL = ::rtl::OUStringToOString(columnNamePattern,m_nTextEncoding)).getStr();
 
 
 	SQLRETURN nRetcode = N3SQLProcedureColumns(m_aStatementHandle,
@@ -1115,7 +1115,7 @@ void ODatabaseMetaDataResultSet::openPro
 
 	const char	*pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr()	: NULL,
 				*pPKO = pSchemaPat && pSchemaPat->getLength() ? aPKO.getStr() : NULL,
-				*pPKN = aPKN = ::rtl::OUStringToOString(procedureNamePattern,m_nTextEncoding).getStr();
+				*pPKN = (aPKN = ::rtl::OUStringToOString(procedureNamePattern,m_nTextEncoding)).getStr();
 
 
 	SQLRETURN nRetcode = N3SQLProcedures(m_aStatementHandle,
@@ -1145,7 +1145,7 @@ void ODatabaseMetaDataResultSet::openSpe
 
 	const char	*pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr()	: NULL,
 				*pPKO = pSchemaPat && pSchemaPat->getLength() ? aPKO.getStr() : NULL,
-				*pPKN = aPKN = ::rtl::OUStringToOString(table,m_nTextEncoding).getStr();
+				*pPKN = (aPKN = ::rtl::OUStringToOString(table,m_nTextEncoding)).getStr();
 
 
 	SQLRETURN nRetcode = N3SQLSpecialColumns(m_aStatementHandle,_bRowVer ? SQL_ROWVER : SQL_BEST_ROWID,

Modified: openoffice/branches/l10n40/main/connectivity/source/parse/sqlflex.l
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/connectivity/source/parse/sqlflex.l?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/connectivity/source/parse/sqlflex.l (original)
+++ openoffice/branches/l10n40/main/connectivity/source/parse/sqlflex.l Sun Dec  1 11:40:24 2013
@@ -784,7 +784,7 @@ void OSQLScanner::prepareScan(const ::rt
 	BEGIN(m_nRule);
 
 	m_sErrorMessage = ::rtl::OUString();	
-	m_sStatement	= ::rtl::OString(rNewStatement,rNewStatement.getLength(), RTL_TEXTENCODING_UTF8);
+	m_sStatement	= ::rtl::OUStringToOString( rNewStatement, RTL_TEXTENCODING_UTF8);
 	m_nCurrentPos	= 0;
 	m_bInternational = bInternational;
 	m_pContext		= pContext;

Modified: openoffice/branches/l10n40/main/connectivity/source/parse/sqlnode.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/connectivity/source/parse/sqlnode.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/connectivity/source/parse/sqlnode.cxx (original)
+++ openoffice/branches/l10n40/main/connectivity/source/parse/sqlnode.cxx Sun Dec  1 11:40:24 2013
@@ -1576,7 +1576,7 @@ OSQLParseNode::OSQLParseNode(const ::rtl
                              SQLNodeType eNewNodeType,
                              sal_uInt32 nNewNodeID)
         :m_pParent(NULL)
-        ,m_aNodeValue(_rNewValue,_rNewValue.getLength(),RTL_TEXTENCODING_UTF8)
+        ,m_aNodeValue( rtl::OStringToOUString( _rNewValue, RTL_TEXTENCODING_UTF8))
         ,m_eNodeType(eNewNodeType)
         ,m_nNodeID(nNewNodeID)
 {
@@ -2465,7 +2465,7 @@ void OSQLParseNode::parseLeaf(::rtl::OUS
                 rString.appendAscii(" ");
 
             const ::rtl::OString sT = OSQLParser::TokenIDToStr(m_nNodeID, rParam.bInternational ? &rParam.m_rContext :  NULL);
-            rString.append(::rtl::OUString(sT,sT.getLength(),RTL_TEXTENCODING_UTF8));
+            rString.append( ::rtl::OStringToOUString( sT, RTL_TEXTENCODING_UTF8));
         }   break;
         case SQL_NODE_STRING:
             if (rString.getLength())
@@ -2550,7 +2550,7 @@ void OSQLParseNode::parseLeaf(::rtl::OUS
 sal_Int32 OSQLParser::getFunctionReturnType(const ::rtl::OUString& _sFunctionName, const IParseContext* pContext)
 {
     sal_Int32 nType = DataType::VARCHAR;
-    ::rtl::OString sFunctionName(_sFunctionName,_sFunctionName.getLength(),RTL_TEXTENCODING_UTF8);
+    ::rtl::OString sFunctionName( rtl::OUStringToOString( _sFunctionName, RTL_TEXTENCODING_UTF8));
 
     if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_ASCII,pContext)))                     nType = DataType::INTEGER;
     else if(sFunctionName.equalsIgnoreAsciiCase(TokenIDToStr(SQL_TOKEN_BIT_LENGTH,pContext)))           nType = DataType::INTEGER;

Modified: openoffice/branches/l10n40/main/cui/source/customize/cfg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/cui/source/customize/cfg.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/cui/source/customize/cfg.cxx (original)
+++ openoffice/branches/l10n40/main/cui/source/customize/cfg.cxx Sun Dec  1 11:40:24 2013
@@ -1662,7 +1662,6 @@ SvxConfigPage::SvxConfigPage(
     aDescriptionField.SetControlBackground( GetSettings().GetStyleSettings().GetDialogColor() );
     aDescriptionField.SetAutoScroll( sal_True );
     aDescriptionField.EnableCursor( sal_False );
-	//IAccessibility2 Implementation 2009-----
 	aMoveUpButton.SetAccessibleName(String(CUI_RES(BUTTON_STR_UP)));
 	aMoveDownButton.SetAccessibleName(String(CUI_RES(BUTTON_STR_DOWN)));
 	aMoveUpButton.SetAccessibleRelationMemberOf(&aContentsSeparator);
@@ -1671,7 +1670,6 @@ SvxConfigPage::SvxConfigPage(
 	aModifyTopLevelButton.SetAccessibleRelationMemberOf(&aTopLevelSeparator);
 	aAddCommandsButton.SetAccessibleRelationMemberOf(&aContentsSeparator);
 	aModifyCommandButton.SetAccessibleRelationMemberOf(&aContentsSeparator);
-	//-----IAccessibility2 Implementation 2009
 }
 
 SvxConfigPage::~SvxConfigPage()
@@ -2930,10 +2928,8 @@ SvxMainMenuOrganizerDialog::SvxMainMenuO
 		LINK( this, SvxMainMenuOrganizerDialog, MoveHdl) );
 	aMoveDownButton.SetClickHdl	(
 		LINK( this, SvxMainMenuOrganizerDialog, MoveHdl) );
-	//IAccessibility2 Implementation 2009-----
 	aMoveUpButton.SetAccessibleName(String(CUI_RES(BUTTON_STR_UP)));
 	aMoveDownButton.SetAccessibleName(String(CUI_RES(BUTTON_STR_DOWN)));
-	//-----IAccessibility2 Implementation 2009
 }
 
 IMPL_LINK(SvxMainMenuOrganizerDialog, ModifyHdl, Edit*, pEdit)

Modified: openoffice/branches/l10n40/main/cui/source/customize/cfg.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/cui/source/customize/cfg.hrc?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/cui/source/customize/cfg.hrc (original)
+++ openoffice/branches/l10n40/main/cui/source/customize/cfg.hrc Sun Dec  1 11:40:24 2013
@@ -100,7 +100,5 @@
 #define MD_BTN_OK (122 + CFG_OFFSET)
 #define FI_INFO (123 + CFG_OFFSET)
 
-//IAccessibility2 Implementation 2009-----
 #define BUTTON_STR_UP	(130 + CFG_OFFSET)
 #define BUTTON_STR_DOWN	(131 + CFG_OFFSET)
-//-----IAccessibility2 Implementation 2009

Modified: openoffice/branches/l10n40/main/cui/source/customize/cfg.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/cui/source/customize/cfg.src?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/cui/source/customize/cfg.src (original)
+++ openoffice/branches/l10n40/main/cui/source/customize/cfg.src Sun Dec  1 11:40:24 2013
@@ -822,7 +822,6 @@ String RID_SVXSTR_RENAME_TOOLBAR
 {
 	Text [ en-US ] = "Rename Toolbar";
 };
-//IAccessibility2 Implementation 2009-----
 String BUTTON_STR_UP
 {
 	Text [ en-US ] = "Up";
@@ -831,5 +830,4 @@ String BUTTON_STR_DOWN
 {
 	Text [ en-US ] = "Down";
 };
-//-----IAccessibility2 Implementation 2009
 

Modified: openoffice/branches/l10n40/main/cui/source/customize/macropg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/cui/source/customize/macropg.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/cui/source/customize/macropg.cxx (original)
+++ openoffice/branches/l10n40/main/cui/source/customize/macropg.cxx Sun Dec  1 11:40:24 2013
@@ -162,8 +162,8 @@ long _HeaderTabListBox::Notify( NotifyEv
 
 _HeaderTabListBox::_HeaderTabListBox( Window* pParent, const ResId& rId ) :
     Control( pParent, rId ),
-    maListBox( this, WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ),
-    maHeaderBar( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER )
+    maHeaderBar( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER ),
+    maListBox( this, WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP )
 {
     maListBox.SetHelpId( HID_MACRO_HEADERTABLISTBOX );
 

Modified: openoffice/branches/l10n40/main/cui/source/dialogs/cuicharmap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/cui/source/dialogs/cuicharmap.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/cui/source/dialogs/cuicharmap.cxx (original)
+++ openoffice/branches/l10n40/main/cui/source/dialogs/cuicharmap.cxx Sun Dec  1 11:40:24 2013
@@ -257,7 +257,12 @@ SvxShowText::~SvxShowText()
 
 SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, sal_Bool bOne_, ResMgr* pResContext )
 :   mpDialog( pDialog ),
+    aFontText       ( pDialog, ResId( FT_FONT, *pResContext ) ),
+    aFontLB         ( pDialog, ResId( LB_FONT, *pResContext ) ),
+    aSubsetText     ( pDialog, ResId( FT_SUBSET, *pResContext ) ),
+    aSubsetLB       ( pDialog, ResId( LB_SUBSET, *pResContext ) ),
     aShowSet        ( pDialog, ResId( CT_SHOWSET, *pResContext ) ),
+    aSymbolText     ( pDialog, ResId( FT_SYMBOLE, *pResContext ) ),
     aShowText       ( pDialog, ResId( CT_SHOWTEXT, *pResContext ) ),
 //    aShowShortcut   ( pDialog, ResId( CT_ASSIGN, *pResContext ) ),
     aOKBtn          ( pDialog, ResId( BTN_CHAR_OK, *pResContext ) ),
@@ -265,11 +270,6 @@ SvxCharMapData::SvxCharMapData( SfxModal
     aHelpBtn        ( pDialog, ResId( BTN_CHAR_HELP, *pResContext ) ),
     aDeleteBtn      ( pDialog, ResId( BTN_DELETE, *pResContext ) ),
 //    aAssignBtn      ( pDialog, ResId( BT_ASSIGN, *pResContext ) ),
-    aFontText       ( pDialog, ResId( FT_FONT, *pResContext ) ),
-    aFontLB         ( pDialog, ResId( LB_FONT, *pResContext ) ),
-    aSubsetText     ( pDialog, ResId( FT_SUBSET, *pResContext ) ),
-    aSubsetLB       ( pDialog, ResId( LB_SUBSET, *pResContext ) ),
-    aSymbolText     ( pDialog, ResId( FT_SYMBOLE, *pResContext ) ),
     aShowChar       ( pDialog, ResId( CT_SHOWCHAR, *pResContext ), sal_True ),
     aCharCodeText   ( pDialog, ResId( FT_CHARCODE, *pResContext ) ),
 //    aAssignText     ( pDialog, ResId( FT_ASSIGN, *pResContext ) ),

Modified: openoffice/branches/l10n40/main/cui/source/dialogs/cuigrfflt.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/cui/source/dialogs/cuigrfflt.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/cui/source/dialogs/cuigrfflt.cxx (original)
+++ openoffice/branches/l10n40/main/cui/source/dialogs/cuigrfflt.cxx Sun Dec  1 11:40:24 2013
@@ -534,9 +534,6 @@ GraphicFilterSolarize::GraphicFilterSola
 
 	maCbxInvert.Check( bInvert );
 	maCbxInvert.SetToggleHdl( GetModifyHdl() );
-
-	// IAccessibility2 Implementation 2009
-	// maMtrThreshold.GrabFocus();
 }
 
 // -----------------------------------------------------------------------------
@@ -595,9 +592,6 @@ GraphicFilterSepia::GraphicFilterSepia( 
 
 	maMtrSepia.SetValue( nSepiaPercent );
 	maMtrSepia.SetModifyHdl( GetModifyHdl() );
-
-	// IAccessibility2 Implementation 2009
-	// maMtrSepia.GrabFocus();
 }
 
 // -----------------------------------------------------------------------------
@@ -648,9 +642,6 @@ GraphicFilterPoster::GraphicFilterPoster
     maNumPoster.SetLast( rGraphic.GetBitmapEx().GetBitCount() );
 	maNumPoster.SetValue( nPosterCount );
 	maNumPoster.SetModifyHdl( GetModifyHdl() );
-
-	// IAccessibility2 Implementation 2009
-	// maNumPoster.GrabFocus();
 }
 
 // -----------------------------------------------------------------------------

Modified: openoffice/branches/l10n40/main/cui/source/dialogs/hlmarkwn.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/cui/source/dialogs/hlmarkwn.hrc?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/cui/source/dialogs/hlmarkwn.hrc (original)
+++ openoffice/branches/l10n40/main/cui/source/dialogs/hlmarkwn.hrc Sun Dec  1 11:40:24 2013
@@ -24,9 +24,7 @@
 #define BT_APPLY	1
 #define BT_CLOSE	2
 #define TLB_MARK	3
-// IAccessibility2 implementation 2009. ------
 #define STR_MARK_TREE	5000
-// ------ IAccessibility2 implementation 2009.
 
 //#define HYPERLINK_BMP_EXPAND		301
 //#define HYPERLINK_BMP_COLLAPSE	302

Modified: openoffice/branches/l10n40/main/cui/source/dialogs/linkdlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/cui/source/dialogs/linkdlg.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/cui/source/dialogs/linkdlg.cxx (original)
+++ openoffice/branches/l10n40/main/cui/source/dialogs/linkdlg.cxx Sun Dec  1 11:40:24 2013
@@ -113,12 +113,10 @@ SvBaseLinksDlg::SvBaseLinksDlg( Window *
     //JP 24.02.99: UpdateTimer fuer DDE-/Grf-Links, auf die gewarted wird
     aUpdateTimer.SetTimeoutHdl( LINK( this, SvBaseLinksDlg, UpdateWaitingHdl ) );
     aUpdateTimer.SetTimeout( 1000 );
-	//IAccessibility2 Implementation 2009-----
 	// Set the ZOrder, and accessible name to the dialog's title	
 	aTbLinks.SetZOrder(0, WINDOW_ZORDER_FIRST);
 	aTbLinks.SetAccessibleName(this->GetText());
 	aTbLinks.SetAccessibleRelationLabeledBy(&aFtFiles);
-	//-----IAccessibility2 Implementation 2009
 
     OpenSource().Hide();
 

Modified: openoffice/branches/l10n40/main/cui/source/dialogs/showcols.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/cui/source/dialogs/showcols.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/cui/source/dialogs/showcols.cxx (original)
+++ openoffice/branches/l10n40/main/cui/source/dialogs/showcols.cxx Sun Dec  1 11:40:24 2013
@@ -119,7 +119,7 @@ void FmShowColsDialog::SetColumns(const 
 			//CHINA001 xCurCol->getPropertyValue(::svxform::FM_PROP_LABEL) >>= sName;
 			
 			xCurCol->getPropertyValue(CUIFM_PROP_LABEL) >>= sName;
-			sCurName = (const sal_Unicode*)sName;
+			sCurName = sName.getStr();
 		}
 		catch(...)
 		{

Modified: openoffice/branches/l10n40/main/cui/source/factory/dlgfact.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/cui/source/factory/dlgfact.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/cui/source/factory/dlgfact.cxx (original)
+++ openoffice/branches/l10n40/main/cui/source/factory/dlgfact.cxx Sun Dec  1 11:40:24 2013
@@ -1900,7 +1900,7 @@ SfxAbstractInsertObjectDialog* AbstractD
 
     if ( pDlg )
     {
-        pDlg->SetHelpId( rtl::OString( rCommand, rCommand.getLength(), RTL_TEXTENCODING_UTF8 ) );
+        pDlg->SetHelpId( rtl::OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 ) );
         return new AbstractInsertObjectDialog_Impl( pDlg );
     }
     return 0;
@@ -1913,7 +1913,7 @@ VclAbstractDialog* AbstractDialogFactory
     if ( rCommand.equalsAscii(".uno:InsertObjectFloatingFrame" ) )
     {
         pDlg = new SfxInsertFloatingFrameDialog( pParent, xObj );
-        pDlg->SetHelpId( rtl::OString( rCommand, rCommand.getLength(), RTL_TEXTENCODING_UTF8 ) );
+        pDlg->SetHelpId( rtl::OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 ) );
         return new VclAbstractDialog_Impl( pDlg );
     }
     return 0;

Modified: openoffice/branches/l10n40/main/cui/source/options/optlingu.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/cui/source/options/optlingu.hrc?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/cui/source/options/optlingu.hrc (original)
+++ openoffice/branches/l10n40/main/cui/source/options/optlingu.hrc Sun Dec  1 11:40:24 2013
@@ -81,8 +81,6 @@
 #define CLB_EDIT_MODULES_MODULES            320
 #define FT_EDIT_MODULES_NEWDICTSLINK        321
 #define FL_EDIT_MODULES_BUTTONS             322
-// IAccessibility2 implementation 2009. ------
 #define STR_LINGU_MODULES_EDIT 			323
 #define STR_LINGU_DICS_EDIT_DIC 		324
 #define STR_LINGU_OPTIONS_EDIT 			325
-// ------ IAccessibility2 implementation 2009.

Modified: openoffice/branches/l10n40/main/cui/source/options/optlingu.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/cui/source/options/optlingu.src?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/cui/source/options/optlingu.src (original)
+++ openoffice/branches/l10n40/main/cui/source/options/optlingu.src Sun Dec  1 11:40:24 2013
@@ -352,7 +352,6 @@ TabPage RID_SFXPAGE_LINGU
 	{
 		Text [ en-US ] = "Edit Options";
 	};
-	// ------ IAccessibility2 implementation 2009.
 };
 // end: TabPage RID_SFXPAGE_LINGU
 

Modified: openoffice/branches/l10n40/main/cui/source/tabpages/autocdlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/cui/source/tabpages/autocdlg.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/cui/source/tabpages/autocdlg.cxx (original)
+++ openoffice/branches/l10n40/main/cui/source/tabpages/autocdlg.cxx Sun Dec  1 11:40:24 2013
@@ -2100,7 +2100,6 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window
 	aDblStandardPB.SetClickHdl(LINK(this, 	OfaQuoteTabPage, StdQuoteHdl));
 	aSglStandardPB.SetClickHdl(LINK(this, 	OfaQuoteTabPage, StdQuoteHdl));
 
-	//IAccessibility2 Implementation 2009-----
 	// Move down from the position before FreeResource() 
 	// For lost help ID issue
 	aSglStandardPB.SetAccessibleName(String(CUI_RES(STR_PB_SGL_STD) ) );

Modified: openoffice/branches/l10n40/main/cui/source/tabpages/autocdlg.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/cui/source/tabpages/autocdlg.hrc?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/cui/source/tabpages/autocdlg.hrc (original)
+++ openoffice/branches/l10n40/main/cui/source/tabpages/autocdlg.hrc Sun Dec  1 11:40:24 2013
@@ -150,7 +150,6 @@
 #define FT_SMARTTAGS                    221
 #define LB_SMARTTAGS                    222
 #define PB_SMARTTAGS                    223
-//IAccessibility2 Implementation 2009-----
 #define  STR_PB_NEWABBREV				224
 #define  STR_PB_DELABBREV				225
 #define  STR_PB_NEWDOUBLECAPS			226
@@ -161,7 +160,6 @@
 #define	 STR_PB_DBL_START				231
 #define  STR_PB_SGL_END					232
 #define  STR_PB_DBL_END					233
-//-----IAccessibility2 Implementation 2009
 
 #endif
 

Modified: openoffice/branches/l10n40/main/cui/source/tabpages/connect.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/cui/source/tabpages/connect.hrc?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/cui/source/tabpages/connect.hrc (original)
+++ openoffice/branches/l10n40/main/cui/source/tabpages/connect.hrc Sun Dec  1 11:40:24 2013
@@ -39,5 +39,4 @@
 #define FT_TYPE 8
 #define LB_TYPE 1
 #define CTL_PREVIEW 1
-//IAccessibility2 Implementation 2009-----
 #define STR_EXAMPLE 1

Modified: openoffice/branches/l10n40/main/cui/source/tabpages/paragrph.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/cui/source/tabpages/paragrph.hrc?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/cui/source/tabpages/paragrph.hrc (original)
+++ openoffice/branches/l10n40/main/cui/source/tabpages/paragrph.hrc Sun Dec  1 11:40:24 2013
@@ -113,9 +113,7 @@
 
 #define CB_AS_SCRIPT_SPACE				7
 
-//IAccessibility2 Implementation 2009-----
 #define STR_EXAMPLE						5010
 #define STR_PAGE_STYLE					5011
-//-----IAccessibility2 Implementation 2009
 #endif
 

Modified: openoffice/branches/l10n40/main/cui/source/tabpages/tabarea.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/cui/source/tabpages/tabarea.hrc?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/cui/source/tabpages/tabarea.hrc (original)
+++ openoffice/branches/l10n40/main/cui/source/tabpages/tabarea.hrc Sun Dec  1 11:40:24 2013
@@ -181,7 +181,5 @@
 
 #define IMG_LOAD_H	23
 #define IMG_SAVE_H	24
-// IAccessibility2 implementation 2009 ------
 #define STR_CUI_COLORMODEL	5030
 #define STR_LB_HATCHINGSTYLE 5031
-// ------ IAccessibility2 implementation 2009.

Modified: openoffice/branches/l10n40/main/cui/source/tabpages/tabarea.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/cui/source/tabpages/tabarea.src?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/cui/source/tabpages/tabarea.src (original)
+++ openoffice/branches/l10n40/main/cui/source/tabpages/tabarea.src Sun Dec  1 11:40:24 2013
@@ -875,9 +875,7 @@ TabPage RID_SVXPAGE_BITMAP
         Pos = MAP_APPFONT ( 12 , 25  ) ;
 		Size = MAP_APPFONT ( 72 , 72 ) ;
 		TabStop = TRUE ;
-		//IAccessibility2 Implementation 2009-----
 		Text [ en-US ] = "Pattern Editor";
-		//-----IAccessibility2 Implementation 2009
 	};
     FixedText FT_COLOR
 	{
@@ -1319,18 +1317,14 @@ TabPage RID_SVXPAGE_COLOR
         Border = TRUE;
         Pos = MAP_APPFONT ( 157 , 14  ) ;
         Size = MAP_APPFONT ( 34 , 25 ) ;
-        // IAccessibility2 implementation 2009. ------
 		Text [ en-US ] = "Old Color" ;
-		// ------ IAccessibility2 implementation 2009.
 	};
 	Control CTL_PREVIEW_NEW
 	{
         Border = TRUE;
         Pos = MAP_APPFONT ( 157, 39  ) ;
         Size = MAP_APPFONT ( 34 , 25 ) ;
-        // IAccessibility2 implementation 2009. ------
         Text [ en-US ] = "New Color" ;
-        // ------ IAccessibility2 implementation 2009.
 	};
     ListBox LB_COLORMODEL
 	{

Modified: openoffice/branches/l10n40/main/cui/source/tabpages/tabline.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/cui/source/tabpages/tabline.hrc?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/cui/source/tabpages/tabline.hrc (original)
+++ openoffice/branches/l10n40/main/cui/source/tabpages/tabline.hrc Sun Dec  1 11:40:24 2013
@@ -37,7 +37,6 @@
 #define FT_LINE_ENDS_WIDTH 6
 #define LB_START_STYLE 3
 #define LB_END_STYLE 4
-//IAccessibility2 Impplementaton 2009-----
 #define STR_STYLE (LB_END_STYLE+1)
 #define STR_LB_START_STYLE 	30
 #define STR_LB_END_STYLE 	31
@@ -51,7 +50,6 @@
 #define STR_END_NUM 		39
 #define STR_START_LENGTH 	40
 #define STR_END_LENGTH 		41
-//-----IAccessibility2 Impplementaton 2009
 #define MTR_FLD_START_WIDTH 3
 #define MTR_FLD_END_WIDTH 2
 #define CBX_SYNCHRONIZE 1
@@ -121,12 +119,10 @@
 #define MN_GALLERY_ENTRY 100
 
 /*
-//IAccessibility2 Implementation 2009-----
 #define STR_START_TYPE 		1
 #define STR_END_TYPE 		2
 #define STR_START_NUM 		3
 #define STR_END_NUM 		4
 #define STR_START_LENGTH 	5
 #define STR_END_LENGTH 		6
-//-----IAccessibility2 Implementation 2009
 */

Modified: openoffice/branches/l10n40/main/cui/source/tabpages/tabstpge.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/cui/source/tabpages/tabstpge.hrc?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/cui/source/tabpages/tabstpge.hrc (original)
+++ openoffice/branches/l10n40/main/cui/source/tabpages/tabstpge.hrc Sun Dec  1 11:40:24 2013
@@ -55,8 +55,6 @@
 #define BTN_DELALL                      52
 #define ST_LEFTTAB_ASIAN                53
 #define ST_RIGHTTAB_ASIAN               54
-//IAccessibility2 Implementation 2009-----
 #define ST_FILLCHAR_OTHER				55
-//-----IAccessibility2 Implementation 2009
 #endif
 

Modified: openoffice/branches/l10n40/main/cui/source/tabpages/tparea.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/cui/source/tabpages/tparea.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/cui/source/tabpages/tparea.cxx (original)
+++ openoffice/branches/l10n40/main/cui/source/tabpages/tparea.cxx Sun Dec  1 11:40:24 2013
@@ -2213,11 +2213,9 @@ IMPL_LINK( SvxAreaTabPage, ClickBitmapHd
 	aMtrFldYOffset.Show();
     aFlPosition.Show();
 	aRbtRow.Show();
-//IAccessible2 Implementation 2009-----
 	//Solution:Check one when initializing.
 	if(!aRbtRow.IsChecked()&&!aRbtColumn.IsChecked())
 	        aRbtRow.Check();
-//-----IAccessible2 Implementation 2009
 	aRbtColumn.Show();
 	aMtrFldOffset.Show();
     aFlOffset.Show();

Modified: openoffice/branches/l10n40/main/dbaccess/source/core/recovery/dbdocrecovery.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/dbaccess/source/core/recovery/dbdocrecovery.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/dbaccess/source/core/recovery/dbdocrecovery.cxx (original)
+++ openoffice/branches/l10n40/main/dbaccess/source/core/recovery/dbdocrecovery.cxx Sun Dec  1 11:40:24 2013
@@ -394,7 +394,7 @@ namespace dbaccess
                     message.append( "' not found in '" );
                     message.append( ::rtl::OUStringToOString( SubComponentRecovery::getComponentsStorageName( eComponentType ), RTL_TEXTENCODING_ASCII_US ) );
                     message.append( "', but required per map file!" );
-                    OSL_ENSURE( false, message.makeStringAndClear() );
+                    OSL_ENSURE( false, message.getStr() );
                 #endif
                     continue;
                 }

Modified: openoffice/branches/l10n40/main/dbaccess/source/ui/browser/brwctrlr.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/dbaccess/source/ui/browser/brwctrlr.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/dbaccess/source/ui/browser/brwctrlr.cxx (original)
+++ openoffice/branches/l10n40/main/dbaccess/source/ui/browser/brwctrlr.cxx Sun Dec  1 11:40:24 2013
@@ -2013,7 +2013,7 @@ void SbaXDataBrowserController::ExecuteS
 	Reference< XInterface >  xCurControl(xColControls->getByIndex(nViewCol),UNO_QUERY);
 	::rtl::OUString aInitialText;
 	if (IsSearchableControl(xCurControl, &aInitialText))
-		sInitialText = (const sal_Unicode*)aInitialText;
+		sInitialText = aInitialText.getStr();
 
 	// prohibit the synchronization of the grid's display with the cursor's position
 	Reference< XPropertySet >  xModelSet(getControlModel(), UNO_QUERY);
@@ -2569,7 +2569,7 @@ IMPL_LINK(SbaXDataBrowserController, OnS
 		Reference< XPropertySet >  xCurrentColModel(xModelColumns->getByIndex(nModelPos),UNO_QUERY);
 		::rtl::OUString aName = ::comphelper::getString(xCurrentColModel->getPropertyValue(PROPERTY_CONTROLSOURCE));
 
-		sFieldList += (const sal_Unicode*)aName;
+		sFieldList += aName.getStr();
 		sFieldList += ';';
 
 		pContext->arrFields.push_back(xCurrentColumn);

Modified: openoffice/branches/l10n40/main/dbaccess/source/ui/browser/exsrcbrw.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/dbaccess/source/ui/browser/exsrcbrw.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/dbaccess/source/ui/browser/exsrcbrw.cxx (original)
+++ openoffice/branches/l10n40/main/dbaccess/source/ui/browser/exsrcbrw.cxx Sun Dec  1 11:40:24 2013
@@ -202,7 +202,7 @@ void SAL_CALL SbaExternalSourceBrowser::
 					aControlProps = *(Sequence< ::com::sun::star::beans::PropertyValue>*)pArguments->Value.getValue();
 			}
 			else
-				OSL_ENSURE(sal_False, ((ByteString("SbaExternalSourceBrowser::dispatch(AddGridColumn) : unknown argument (") += ByteString((const sal_Unicode*)pArguments->Name, gsl_getSystemTextEncoding()).GetBuffer()) += ") !").GetBuffer());
+				OSL_ENSURE(sal_False, ((ByteString("SbaExternalSourceBrowser::dispatch(AddGridColumn) : unknown argument (") += ByteString(pArguments->Name.getStr(), gsl_getSystemTextEncoding()).GetBuffer()) += ") !").GetBuffer());
 		}
 		if (!sControlType.getLength())
 		{

Modified: openoffice/branches/l10n40/main/dbaccess/source/ui/misc/TokenWriter.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/dbaccess/source/ui/misc/TokenWriter.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/dbaccess/source/ui/misc/TokenWriter.cxx (original)
+++ openoffice/branches/l10n40/main/dbaccess/source/ui/misc/TokenWriter.cxx Sun Dec  1 11:40:24 2013
@@ -76,6 +76,8 @@ using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::util;
 using ::com::sun::star::frame::XModel;
 
+inline SvStream& operator<<( SvStream& s, const rtl::OString r) { return (s << r.getStr()); }
+
 #if defined(UNX)
 const char __FAR_DATA ODatabaseImportExport::sNewLine = '\012';
 #else
@@ -819,7 +821,7 @@ void OHTMLImportExport::WriteBody()
 	IncIndent(1); TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_style );
 
 	(*m_pStream) << sMyBegComment; OUT_LF();
-	(*m_pStream) << OOO_STRING_SVTOOLS_HTML_body << " { " << sFontFamily << '\"' << ::rtl::OString(m_aFont.Name,m_aFont.Name.getLength(), gsl_getSystemTextEncoding()) << '\"';
+	(*m_pStream) << OOO_STRING_SVTOOLS_HTML_body << " { " << sFontFamily << '\"' << ::rtl::OUStringToOString( m_aFont.Name, gsl_getSystemTextEncoding()) << '\"';
 		// TODO : think about the encoding of the font name
 	(*m_pStream) << "; " << sFontSize;
 	m_pStream->WriteNumber(m_aFont.Height);
@@ -895,14 +897,14 @@ void OHTMLImportExport::WriteTables()
 	aStrOut	= aStrOut + "=1";
 
 	IncIndent(1);
-	TAG_ON( aStrOut );
+	TAG_ON( aStrOut.getStr() );
 
 	FontOn();
 
 	TAG_ON( OOO_STRING_SVTOOLS_HTML_caption );
 	TAG_ON( OOO_STRING_SVTOOLS_HTML_bold );
 
-	(*m_pStream)	<< ::rtl::OString(m_sName,m_sName.getLength(), gsl_getSystemTextEncoding());
+	(*m_pStream)	<< ::rtl::OUStringToOString( m_sName, gsl_getSystemTextEncoding());
 		// TODO : think about the encoding of the name
 	TAG_OFF( OOO_STRING_SVTOOLS_HTML_bold );
 	TAG_OFF( OOO_STRING_SVTOOLS_HTML_caption );
@@ -1072,7 +1074,7 @@ void OHTMLImportExport::WriteCell( sal_I
 		}
 	}
 
-	TAG_ON( aStrTD );
+	TAG_ON( aStrTD.getStr() );
 
 	FontOn();
 
@@ -1116,7 +1118,7 @@ void OHTMLImportExport::FontOn()
 	aStrOut  = aStrOut + OOO_STRING_SVTOOLS_HTML_O_face;
 	aStrOut  = aStrOut + "=";
 	aStrOut  = aStrOut + "\"";
-	aStrOut  = aStrOut + ::rtl::OString(m_aFont.Name,m_aFont.Name.getLength(),gsl_getSystemTextEncoding());
+	aStrOut  = aStrOut + ::rtl::OUStringToOString( m_aFont.Name, gsl_getSystemTextEncoding());
 		// TODO : think about the encoding of the font name
 	aStrOut  = aStrOut + "\"";
 	aStrOut  = aStrOut + " ";

Modified: openoffice/branches/l10n40/main/dbaccess/source/ui/misc/UITools.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/dbaccess/source/ui/misc/UITools.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/dbaccess/source/ui/misc/UITools.cxx (original)
+++ openoffice/branches/l10n40/main/dbaccess/source/ui/misc/UITools.cxx Sun Dec  1 11:40:24 2013
@@ -1500,7 +1500,7 @@ namespace
 	aURL.Complete = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.help://" ) );
 	aURL.Complete += _sModuleName;
 	aURL.Complete += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) );
-	aURL.Complete += ::rtl::OUString(sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8);
+	aURL.Complete += ::rtl::OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8);
 
 	::rtl::OUString sAnchor;
 	::rtl::OUString sTempURL = aURL.Complete;

Modified: openoffice/branches/l10n40/main/dbaccess/source/ui/querydesign/querycontroller.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/dbaccess/source/ui/querydesign/querycontroller.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/dbaccess/source/ui/querydesign/querycontroller.cxx (original)
+++ openoffice/branches/l10n40/main/dbaccess/source/ui/querydesign/querycontroller.cxx Sun Dec  1 11:40:24 2013
@@ -178,7 +178,7 @@ namespace dbaui
 					{
 						rString+= ::rtl::OUString::createFromAscii("SQL_KEYWORD:");
 						::rtl::OString sT = OSQLParser::TokenIDToStr(_pNode->getTokenID());
-						rString += ::rtl::OUString(sT,sT.getLength(),RTL_TEXTENCODING_UTF8);
+						rString += ::rtl::OStringToOUString( sT, RTL_TEXTENCODING_UTF8);
 					 break;}
 
 				case SQL_NODE_COMPARISON:

Modified: openoffice/branches/l10n40/main/desktop/source/app/app.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/desktop/source/app/app.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/desktop/source/app/app.cxx (original)
+++ openoffice/branches/l10n40/main/desktop/source/app/app.cxx Sun Dec  1 11:40:24 2013
@@ -253,12 +253,12 @@ ResMgr* Desktop::GetDesktopResManager()
 {
     if ( !Desktop::pResMgr )
     {
-        String aMgrName = String::CreateFromAscii( "dkt" );
+        const char* pMgrName = "dkt";
 
         // Create desktop resource manager and bootstrap process
         // was successful. Use default way to get language specific message.
         if ( Application::IsInExecute() )
-            Desktop::pResMgr = ResMgr::CreateResMgr( U2S( aMgrName ));
+            Desktop::pResMgr = ResMgr::CreateResMgr( pMgrName);
 
         if ( !Desktop::pResMgr )
         {
@@ -268,7 +268,7 @@ ResMgr* Desktop::GetDesktopResManager()
 /*
             LanguageType aLanguageType = LANGUAGE_DONTKNOW;
 
-            Desktop::pResMgr = ResMgr::SearchCreateResMgr( U2S( aMgrName ), aLanguageType );
+            Desktop::pResMgr = ResMgr::SearchCreateResMgr( pMgrName, aLanguageType );
             AllSettings as = GetSettings();
             as.SetUILanguage(aLanguageType);
             SetSettings(as);
@@ -282,7 +282,7 @@ ResMgr* Desktop::GetDesktopResManager()
 
             ::com::sun::star::lang::Locale aLocale( aLanguage, aCountry, aVariant );
 
-            Desktop::pResMgr = ResMgr::SearchCreateResMgr( U2S( aMgrName ), aLocale);
+            Desktop::pResMgr = ResMgr::SearchCreateResMgr( pMgrName, aLocale);
             AllSettings as = GetSettings();
             as.SetUILocale(aLocale);
             SetSettings(as);
@@ -1935,17 +1935,14 @@ void Desktop::Main()
 
         // set static variable to enabled/disable crash reporter
         retrieveCrashReporterState();
-        if ( !isCrashReporterEnabled() )
-        {
-            osl_setErrorReporting( sal_False );
-            // disable stack trace feature
-        }
+        const bool bCrashReporterEnabled = isCrashReporterEnabled();
+        osl_setErrorReporting( !bCrashReporterEnabled );
 
         // create title string
         sal_Bool bCheckOk = sal_False;
         ::com::sun::star::lang::Locale aLocale;
-        String aMgrName = String::CreateFromAscii( "ofa" );
-        ResMgr* pLabelResMgr = ResMgr::SearchCreateResMgr( U2S( aMgrName ), aLocale );
+        const char* pMgrName = "ofa";
+	ResMgr* pLabelResMgr = ResMgr::SearchCreateResMgr( pMgrName, aLocale );
         String aTitle = pLabelResMgr ? String( ResId( RID_APPTITLE, *pLabelResMgr ) ) : String();
         delete pLabelResMgr;
 

Modified: openoffice/branches/l10n40/main/desktop/source/app/appfirststart.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/desktop/source/app/appfirststart.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/desktop/source/app/appfirststart.cxx (original)
+++ openoffice/branches/l10n40/main/desktop/source/app/appfirststart.cxx Sun Dec  1 11:40:24 2013
@@ -71,7 +71,7 @@ OUString Desktop::GetLicensePath()
 
     AllSettings aSettings(Application::GetSettings());
     aLocale = aSettings.GetUILocale();
-    ResMgr* pLocalResMgr = ResMgr::SearchCreateResMgr(aMgrName, aLocale);
+    ResMgr* pLocalResMgr = ResMgr::SearchCreateResMgr( aMgrName.getStr(), aLocale);
 
     aLangString = aLocale.Language;
     if ( aLocale.Country.getLength() != 0 )

Modified: openoffice/branches/l10n40/main/desktop/source/migration/wizard.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/desktop/source/migration/wizard.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/desktop/source/migration/wizard.cxx (original)
+++ openoffice/branches/l10n40/main/desktop/source/migration/wizard.cxx Sun Dec  1 11:40:24 2013
@@ -108,10 +108,7 @@ ResMgr *FirstStartWizard::pResMgr = 0;
 ResMgr *FirstStartWizard::GetResManager()
 {
     if ( !FirstStartWizard::pResMgr )
-    {
-        String aMgrName = String::CreateFromAscii( "dkt" );
-        FirstStartWizard::pResMgr = ResMgr::CreateResMgr( OUStringToOString( aMgrName, RTL_TEXTENCODING_UTF8 ));
-    }
+        FirstStartWizard::pResMgr = ResMgr::CreateResMgr( "dkt");
     return FirstStartWizard::pResMgr;
 }
 

Modified: openoffice/branches/l10n40/main/dtrans/source/cnttype/mcnttype.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/dtrans/source/cnttype/mcnttype.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/dtrans/source/cnttype/mcnttype.cxx (original)
+++ openoffice/branches/l10n40/main/dtrans/source/cnttype/mcnttype.cxx Sun Dec  1 11:40:24 2013
@@ -327,7 +327,7 @@ OUString SAL_CALL CMimeContentType::pVal
 			throw IllegalArgumentException( );
 
 		// remove the last quote-sign
-		OUString qpvalue( pvalue, pvalue.getLength( ) - 1 );
+		const OUString qpvalue( pvalue.getStr(), pvalue.getLength( ) - 1 );
 		pvalue = qpvalue;
 
 		if ( !pvalue.getLength( ) )

Modified: openoffice/branches/l10n40/main/editeng/inc/editeng/AccessibleEditableTextPara.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/editeng/inc/editeng/AccessibleEditableTextPara.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/editeng/inc/editeng/AccessibleEditableTextPara.hxx (original)
+++ openoffice/branches/l10n40/main/editeng/inc/editeng/AccessibleEditableTextPara.hxx Sun Dec  1 11:40:24 2013
@@ -373,13 +373,11 @@ namespace accessibility
         /// Check whether 0<=nStart<=n and 0<=nEnd<=n
         void CheckRange( sal_Int32 nStart, sal_Int32 nEnd ) SAL_THROW((::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException));
 
-//IAccessibility2 Implementation 2009-----
 		void _correctValues( const sal_Int32 nIndex, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rValues );
 	 	sal_Int32 SkipField(sal_Int32 nIndex, sal_Bool bForward);
 	 // get overlapped field, extend return string. Only extend forward for now
 		sal_Bool ExtendByField( ::com::sun::star::accessibility::TextSegment& Segment );
 		String GetFieldTypeNameAtIndex(sal_Int32 nIndex);
-//-----IAccessibility2 Implementation 2009
         // the paragraph index in the edit engine (guarded by solar mutex)
         sal_Int32	mnParagraphIndex;
 
@@ -407,14 +405,12 @@ namespace accessibility
 
         /// Our listeners (guarded by maMutex)
         int mnNotifierClientId;
-	//IAccessibility2 Implementation 2009-----
 public:
 		void SetParagraphBackColorAccessible(const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > & ref)
 		{ m_xAccInfo = ref ;}		
 private:
 		::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xAccInfo;
         //virtual sal_Bool IsShapeParaFocusable( );
-	//-----IAccessibility2 Implementation 2009
 
         // --> OD 2006-01-11 #i27138#
         // the paragraph manager, which created this instance - is NULL, if

Modified: openoffice/branches/l10n40/main/editeng/inc/editeng/editdata.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/editeng/inc/editeng/editdata.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/editeng/inc/editeng/editdata.hxx (original)
+++ openoffice/branches/l10n40/main/editeng/inc/editeng/editdata.hxx Sun Dec  1 11:40:24 2013
@@ -364,9 +364,7 @@ enum EENotifyType
 
     /// Denotes the end of a high-level action triggered by a key press
     EE_NOTIFY_INPUT_END,
-//IAccessibility2 Implementation 2009-----
 	EE_NOTIFY_TEXTVIEWSELECTIONCHANGED_ENDD_PARA
-//-----IAccessibility2 Implementation 2009
 };
 
 struct EENotify

Modified: openoffice/branches/l10n40/main/editeng/inc/editeng/editeng.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/editeng/inc/editeng/editeng.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/editeng/inc/editeng/editeng.hxx (original)
+++ openoffice/branches/l10n40/main/editeng/inc/editeng/editeng.hxx Sun Dec  1 11:40:24 2013
@@ -108,9 +108,7 @@ const sal_uInt8 EditEngineAttribs_OnlyHa
 #define GETATTRIBS_CHARATTRIBS  (sal_uInt8)0x04
 #define GETATTRIBS_ALL          (sal_uInt8)0xFF
 
-//IAccessibility2 Implementation 2009-----
 class SdrObject;
-//-----IAccessibility2 Implementation 2009
 class EDITENG_DLLPUBLIC EditEngine
 {
 	friend class EditView;
@@ -475,9 +473,7 @@ public:
 	static void		ImportBulletItem( SvxNumBulletItem& rNumBullet, sal_uInt16 nLevel, const SvxBulletItem* pOldBullet, const SvxLRSpaceItem* pOldLRSpace );
 	static sal_Bool 	IsPrintable( sal_Unicode c ) { return ( ( c >= 32 ) && ( c != 127 ) ); }
     static sal_Bool     HasValidData( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rTransferable );
-	//IAccessibility2 Implementation 2009-----
 	virtual SdrObject* GetCurTextObj() { return NULL; }
-	//-----IAccessibility2 Implementation 2009
 	/** sets a link that is called at the beginning of a drag operation at an edit view */
 	void			SetBeginDropHdl( const Link& rLink );
 	Link			GetBeginDropHdl() const;

Modified: openoffice/branches/l10n40/main/editeng/inc/editeng/editview.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/editeng/inc/editeng/editview.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/editeng/inc/editeng/editview.hxx (original)
+++ openoffice/branches/l10n40/main/editeng/inc/editeng/editview.hxx Sun Dec  1 11:40:24 2013
@@ -219,10 +219,8 @@ public:
 
 	sal_Bool			IsCursorAtWrongSpelledWord( sal_Bool bMarkIfWrong = sal_False );
 	sal_Bool			IsWrongSpelledWordAtPos( const Point& rPosPixel, sal_Bool bMarkIfWrong = sal_False );
-	//IAccessibility2 Implementation 2009-----
     	sal_Bool IsShapeParaFocusable( ) ;
     sal_Bool WrongSpelledBreakPara(sal_Int32 nPara,sal_uInt16& nStartIndex, sal_uInt16& nEndIndex,sal_Int32 nIndex);
-	//-----IAccessibility2 Implementation 2009
 	void			SpellIgnoreWord();
 	void			ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack = 0 );
 

Modified: openoffice/branches/l10n40/main/editeng/inc/editeng/splwrap.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/editeng/inc/editeng/splwrap.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/editeng/inc/editeng/splwrap.hxx (original)
+++ openoffice/branches/l10n40/main/editeng/inc/editeng/splwrap.hxx Sun Dec  1 11:40:24 2013
@@ -39,7 +39,6 @@ namespace com { namespace sun { namespac
 }}}}
 
 class Window;
-//IAccessibility2 Impplementaton 2009-----
 class SdrObject;
 // misc functions ---------------------------------------------------------------
 
@@ -62,7 +61,6 @@ private:
 		::com::sun::star::linguistic2::XSpellChecker1 > xSpell;
 	::com::sun::star::uno::Reference<
 		::com::sun::star::linguistic2::XHyphenator > 	xHyph;
-//IAccessibility2 Impplementaton 2009-----
 	SdrObject* mpTextObj;
 	sal_uInt16 	nOldLang; 		// Sprache merken, nur bei Aenderung SetLanguage rufen
 	sal_Bool 	bOtherCntnt : 1; // gesetzt => Sonderbereiche zunaechst pruefen
@@ -154,10 +152,8 @@ protected:
 	virtual void AutoCorrect( const String& rAktStr, const String& rNewStr );
 	virtual void InsertHyphen( const sal_uInt16 nPos ); // Hyphen einfuegen
 
-//IAccessibility2 Impplementaton 2009-----
 	void SetCurTextObj( SdrObject* pObj ) { mpTextObj = pObj; }
 	SdrObject* GetCurTextObj() { return mpTextObj; }
-//-----IAccessibility2 Impplementaton 2009
 };
 
 #endif

Modified: openoffice/branches/l10n40/main/editeng/inc/editeng/unoedhlp.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/editeng/inc/editeng/unoedhlp.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/editeng/inc/editeng/unoedhlp.hxx (original)
+++ openoffice/branches/l10n40/main/editeng/inc/editeng/unoedhlp.hxx Sun Dec  1 11:40:24 2013
@@ -60,7 +60,6 @@ public:
 	void	SetStartValue( sal_uLong n );
 	void	SetEndValue( sal_uLong n );
 };
-//IAccessibility2 Implementation 2009-----
 class SvxEditSourceHintEndPara :public SvxEditSourceHint
 {
 public:
@@ -70,7 +69,6 @@ public:
 	SvxEditSourceHintEndPara( sal_uInt32 nId, sal_uInt32 nValue, sal_uInt32 nStart=0, sal_uInt32 nEnd=0 )
 		:SvxEditSourceHint(nId,nValue,nStart){ (void)nEnd; }
 };
-//-----IAccessibility2 Implementation 2009
 /** Helper class for common functionality in edit sources
  */
 class EDITENG_DLLPUBLIC SvxEditSourceHelper
@@ -107,10 +105,8 @@ public:
 
         @return sal_True, if the range has been successfully determined
      */
-	//IAccessibility2 Implementation 2009-----
     //static sal_Bool GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, const EditEngine& rEE, USHORT nPara, USHORT nIndex );
     static sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, const EditEngine& rEE, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell=sal_False );
-	//-----IAccessibility2 Implementation 2009
 
     /** Convert point from edit engine to user coordinate space
 

Modified: openoffice/branches/l10n40/main/editeng/inc/editeng/unoedprx.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/editeng/inc/editeng/unoedprx.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/editeng/inc/editeng/unoedprx.hxx (original)
+++ openoffice/branches/l10n40/main/editeng/inc/editeng/unoedprx.hxx Sun Dec  1 11:40:24 2013
@@ -74,7 +74,6 @@ public:
 	virtual OutputDevice*	GetRefDevice() const;
     virtual sal_Bool		GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16& nIndex ) const;
     virtual sal_Bool		GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const;
-	//IAccessibility2 Implementation 2009-----
 	virtual void	SetUpdateModeForAcc( sal_Bool bUp);
 	virtual sal_Bool	GetUpdateModeForAcc() const;
     virtual sal_Bool 		GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const;

Modified: openoffice/branches/l10n40/main/editeng/inc/editeng/unoedsrc.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/editeng/inc/editeng/unoedsrc.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/editeng/inc/editeng/unoedsrc.hxx (original)
+++ openoffice/branches/l10n40/main/editeng/inc/editeng/unoedsrc.hxx Sun Dec  1 11:40:24 2013
@@ -219,12 +219,10 @@ public:
         Index of paragraph to query bullet info on
      */
     virtual EBulletInfo     GetBulletInfo( sal_uInt16 nPara ) const = 0;
-//IAccessibility2 Implementation 2009-----
      virtual String       GetNumStr(sal_uInt16) const { return XubString();};
     //IAccessible2 migration fix
     virtual void					SetUpdateModeForAcc( sal_Bool ) {};
 	virtual sal_Bool					GetUpdateModeForAcc() const { return sal_True; };
-//-----IAccessibility2 Implementation 2009
     /** Query the bounding rectangle of the given character
 
         @param nPara[0 .. n]
@@ -336,10 +334,8 @@ public:
 
         @return sal_True, if the range has been successfully determined
      */
-	//IAccessibility2 Implementation 2009-----
 //    virtual sal_Bool 		GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const = 0;
     virtual sal_Bool 		GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const = 0;
-	//-----IAccessibility2 Implementation 2009
 
     /** Query number of lines in the formatted paragraph
 
@@ -550,11 +546,9 @@ public:
      */
     virtual sal_Bool Paste() = 0;
 
-//IAccessibility2 Implementation 2009-----
     virtual sal_Bool IsWrongSpelledWordAtPos( sal_Int32, sal_Int32 ) { return sal_False; };
     virtual sal_Bool IsShapeParaFocusable( ) { return sal_True; };
     virtual sal_Bool BreakParaWrongList(sal_Int32, sal_uInt16&, sal_uInt16&, sal_Int32){ return sal_False; };
-//-----IAccessibility2 Implementation 2009
 };
 
 #endif

Modified: openoffice/branches/l10n40/main/editeng/inc/editeng/unofored.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/editeng/inc/editeng/unofored.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/editeng/inc/editeng/unofored.hxx (original)
+++ openoffice/branches/l10n40/main/editeng/inc/editeng/unofored.hxx Sun Dec  1 11:40:24 2013
@@ -72,10 +72,7 @@ public:
 	virtual OutputDevice*	GetRefDevice() const;
     virtual sal_Bool		GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16& nIndex ) const;
     virtual sal_Bool		GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const;
-	//IAccessibility2 Implementation 2009-----
-//    virtual sal_Bool 		GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const;
     virtual sal_Bool 		GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const;
-	//-----IAccessibility2 Implementation 2009
     virtual sal_uInt16			GetLineCount( sal_uInt16 nPara ) const;
     virtual sal_uInt16			GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const;
     virtual void            GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const;

Modified: openoffice/branches/l10n40/main/editeng/inc/editeng/unoforou.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/editeng/inc/editeng/unoforou.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/editeng/inc/editeng/unoforou.hxx (original)
+++ openoffice/branches/l10n40/main/editeng/inc/editeng/unoforou.hxx Sun Dec  1 11:40:24 2013
@@ -93,10 +93,7 @@ public:
 	virtual OutputDevice*	GetRefDevice() const;
     virtual sal_Bool		GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16& nIndex ) const;
     virtual sal_Bool		GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const;
-	//IAccessibility2 Implementation 2009-----
-//    virtual sal_Bool 		GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const;
     virtual sal_Bool 		GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const;
-	//-----IAccessibility2 Implementation 2009
     virtual sal_uInt16			GetLineCount( sal_uInt16 nPara ) const;
     virtual sal_uInt16			GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const;
     virtual void            GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nPara, sal_uInt16 nLine ) const;

Modified: openoffice/branches/l10n40/main/editeng/inc/editeng/unotext.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/editeng/inc/editeng/unotext.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/editeng/inc/editeng/unotext.hxx (original)
+++ openoffice/branches/l10n40/main/editeng/inc/editeng/unotext.hxx Sun Dec  1 11:40:24 2013
@@ -218,10 +218,7 @@ public:
 	virtual OutputDevice*	GetRefDevice() const;
     virtual sal_Bool		GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16& nIndex ) const;
     virtual sal_Bool		GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const;
-	//IAccessibility2 Implementation 2009-----
-//    virtual sal_Bool 		GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const;
     virtual sal_Bool 		GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const;
-	//-----IAccessibility2 Implementation 2009
     virtual sal_uInt16			GetLineCount( sal_uInt16 nPara ) const;
     virtual sal_uInt16			GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const;
     virtual void            GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const;

Modified: openoffice/branches/l10n40/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx (original)
+++ openoffice/branches/l10n40/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx Sun Dec  1 11:40:24 2013
@@ -76,13 +76,11 @@
 #include "AccessibleHyperlink.hxx"
 
 #include <svtools/colorcfg.hxx>
-//IAccessibility2 Implementation 2009-----
 #include <algorithm>
 using namespace std;
 #include "editeng.hrc"
 #include <editeng/eerdll.hxx>
 #include <editeng/numitem.hxx>
-//-----IAccessibility2 Implementation 2009
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
@@ -97,7 +95,6 @@ using namespace ::com::sun::star::access
 
 namespace accessibility
 {
-//IAccessibility2 Implementation 2009-----
 
     const SvxItemPropertySet* ImplGetSvxCharAndParaPropertiesSet()
     {
@@ -224,12 +221,10 @@ namespace accessibility
         DBG_WARNING( "AccessibleEditableTextPara::implGetParagraphBoundary: only a base implementation, ignoring the index" );
 
         rBoundary.startPos = 0;
-	//IAccessibility2 Implementation 2009-----   
         //rBoundary.endPos = GetTextLen();
         ::rtl::OUString sText( implGetText() );
         sal_Int32 nLength = sText.getLength();
         rBoundary.endPos = nLength;
-	//-----IAccessibility2 Implementation 2009
     }
 
     void AccessibleEditableTextPara::implGetLineBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex )
@@ -387,9 +382,7 @@ namespace accessibility
 
             Dispose();
         }
-//IAccessibility2 Implementation 2009-----
 		mpEditSource = pEditSource; 
-//-----IAccessibility2 Implementation 2009
         // #108900# Init last text content
         try
         {
@@ -765,11 +758,9 @@ namespace accessibility
             !pStateSet->contains(nStateId) )
         {
             pStateSet->AddState( nStateId );
-//IAccessibility2 Implementation 2009-----
 		// MT: Removed method IsShapeParaFocusable which was introduced with IA2 - basically it was only about figuring out wether or not the window has the focus, should be solved differently
 		// if(IsShapeParaFocusable())
             GotPropertyEvent( uno::makeAny( nStateId ), AccessibleEventId::STATE_CHANGED );
-//-----IAccessibility2 Implementation 2009
         }
     }
 
@@ -824,10 +815,7 @@ namespace accessibility
         // must provide XAccesibleText by hand, since it comes publicly inherited by XAccessibleEditableText
         if ( rType == ::getCppuType((uno::Reference< XAccessibleText > *)0) )
         {
-	//IAccessibility2 Implementation 2009-----
-			//	uno::Reference< XAccessibleText > aAccText = this;
             uno::Reference< XAccessibleText > aAccText = static_cast< XAccessibleEditableText * >(this);
-	//-----IAccessibility2 Implementation 2009
             aRet <<= aAccText;
         }
         else if ( rType == ::getCppuType((uno::Reference< XAccessibleEditableText > *)0) )
@@ -835,13 +823,11 @@ namespace accessibility
             uno::Reference< XAccessibleEditableText > aAccEditText = this;
             aRet <<= aAccEditText;
         }
-	//IAccessibility2 Implementation 2009-----
 	else if ( rType == ::getCppuType((uno::Reference< XAccessibleHypertext > *)0) )
         {
             uno::Reference< XAccessibleHypertext > aAccHyperText = this;
             aRet <<= aAccHyperText;
         }
-	//-----IAccessibility2 Implementation 2009
         else
         {
             aRet = AccessibleTextParaInterfaceBase::queryInterface(rType);
@@ -939,7 +925,6 @@ namespace accessibility
     ::rtl::OUString SAL_CALL AccessibleEditableTextPara::getAccessibleDescription() throw (uno::RuntimeException)
     {
         DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-	//IAccessibility2 Implementation 2009-----
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         // append first 40 characters from text, or first line, if shorter
@@ -981,7 +966,6 @@ namespace accessibility
         }
 
         return ::rtl::OUString( sStr ) + aLine;
-	//-----IAccessibility2 Implementation 2009
     }
 
     ::rtl::OUString SAL_CALL AccessibleEditableTextPara::getAccessibleName() throw (uno::RuntimeException)
@@ -1058,7 +1042,6 @@ namespace accessibility
 
         if( !pStateSet )
             return uno::Reference<XAccessibleStateSet>();
-//IAccessibility2 Implementation 2009-----
 		uno::Reference<XAccessibleStateSet> xParentStates;
 		if (getAccessibleParent().is())
 		{
@@ -1069,7 +1052,6 @@ namespace accessibility
 		{
 			pStateSet->AddState(AccessibleStateType::EDITABLE);
 		}
-//-----IAccessibility2 Implementation 2009
         return uno::Reference<XAccessibleStateSet>( new ::utl::AccessibleStateSetHelper (*pStateSet) );
     }
 
@@ -1291,7 +1273,6 @@ namespace accessibility
             GetParagraphIndex() == aSelection.nEndPara )
         {
             // caret is always nEndPara,nEndPos
-			//IAccessibility2 Implementation 2009-----
 			EBulletInfo aBulletInfo = GetTextForwarder().GetBulletInfo( static_cast< sal_uInt16 >(GetParagraphIndex()) );
 			if( aBulletInfo.nParagraph != EE_PARA_NOT_FOUND &&
 				aBulletInfo.bVisible && 
@@ -1301,7 +1282,6 @@ namespace accessibility
 				if( aSelection.nEndPos - nBulletLen >= 0 )
 					return aSelection.nEndPos - nBulletLen;
 			}
-			//-----IAccessibility2 Implementation 2009
             return aSelection.nEndPos;
         }
 
@@ -1327,7 +1307,6 @@ namespace accessibility
 
         return OCommonAccessibleText::getCharacter( nIndex );
     }
-    //IAccessibility2 Implementation 2009-----
 	static uno::Sequence< ::rtl::OUString > getAttributeNames()
 	{
 		static uno::Sequence< ::rtl::OUString >* pNames = NULL;
@@ -1368,7 +1347,6 @@ namespace accessibility
 		}
 		return *pNames;
 	}
-//-----IAccessibility2 Implementation 2009
 	struct IndexCompare
 	{
 		const PropertyValue* pValues;
@@ -1468,7 +1446,6 @@ namespace accessibility
         DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 	
-		//IAccessibility2 Implementation 2009-----
 		//Skip the bullet range to ingnore the bullet text 
 		SvxTextForwarder& rCacheTF = GetTextForwarder();
 		EBulletInfo aBulletInfo = rCacheTF.GetBulletInfo( static_cast< sal_uInt16 >(GetParagraphIndex()) );
@@ -1492,7 +1469,6 @@ namespace accessibility
 
         // ... and override them with the direct attributes from the specific position
         uno::Sequence< beans::PropertyValue > aRunAttribs( getRunAttributes( nIndex, aPropertyNames ) );
-		//-----IAccessibility2 Implementation 2009
         sal_Int32 nRunAttribs = aRunAttribs.getLength();
         const beans::PropertyValue *pRunAttrib = aRunAttribs.getConstArray();
         for (sal_Int32 k = 0;  k < nRunAttribs;  ++k)
@@ -1540,7 +1516,6 @@ namespace accessibility
             rRes.Handle = -1;
             rRes.State  = bIsDirectVal ? PropertyState_DIRECT_VALUE : PropertyState_DEFAULT_VALUE;
         }
-		//IAccessibility2 Implementation 2009-----
 		if( bSupplementalMode )
 		{
 			_correctValues( nIndex, aRes );
@@ -1556,7 +1531,6 @@ namespace accessibility
 			rRes.Value <<= numStr;
 			rRes.Handle = -1;
 			rRes.State = PropertyState_DIRECT_VALUE;
-			//-----IAccessibility2 Implementation 2009
 			//For field object.
 			String strFieldType = GetFieldTypeNameAtIndex(nIndex);
 			if (strFieldType.Len() > 0)
@@ -1646,10 +1620,8 @@ namespace accessibility
         DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
 
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
-	//IAccessibility2 Implementation 2009-----
 	if ((rPoint.X <= 0) && (rPoint.Y <= 0))
 		return 0;
-	//-----IAccessibility2 Implementation 2009
         sal_uInt16 nPara, nIndex;
 
         // offset from surrounding cell/shape
@@ -1781,8 +1753,7 @@ namespace accessibility
 
         return OCommonAccessibleText::getTextRange(nStartIndex, nEndIndex);
     }
-//IAccessibility2 Implementation 2009-----
-	void AccessibleEditableTextPara::_correctValues( const sal_Int32 nIndex,
+	void AccessibleEditableTextPara::_correctValues( const sal_Int32 /* nIndex */,
 										   uno::Sequence< PropertyValue >& rValues)
 	{
 		SvxTextForwarder& rCacheTF = GetTextForwarder();
@@ -2051,7 +2022,6 @@ namespace accessibility
 		}
 		return bExtend;
     }
-//-----IAccessibility2 Implementation 2009
     ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
     {
         DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
@@ -2067,7 +2037,6 @@ namespace accessibility
 
         switch( aTextType )
         {
-	//IAccessibility2 Implementation 2009-----
 		case AccessibleTextType::CHARACTER:
 		case AccessibleTextType::WORD:				
 		{
@@ -2075,7 +2044,6 @@ namespace accessibility
 			ExtendByField( aResult );
 			break;
             	}
-	//-----IAccessibility2 Implementation 2009
             // Not yet handled by OCommonAccessibleText. Missing
             // implGetAttributeRunBoundary() method there
             case AccessibleTextType::ATTRIBUTE_RUN:
@@ -2113,7 +2081,6 @@ namespace accessibility
 		}
                 break;
             }
-//IAccessibility2 Implementation 2009-----
             case AccessibleTextType::LINE:
             {
                 SvxTextForwarder&	rCacheTF = GetTextForwarder();
@@ -2169,7 +2136,6 @@ namespace accessibility
                 }
                 break;
             }
-//-----IAccessibility2 Implementation 2009
             default:
                 aResult = OCommonAccessibleText::getTextAtIndex( nIndex, aTextType );
                 break;
@@ -2190,9 +2156,7 @@ namespace accessibility
         ::com::sun::star::accessibility::TextSegment aResult;
         aResult.SegmentStart = -1;
         aResult.SegmentEnd = -1;
-//IAccessibility2 Implementation 2009-----
 		i18n::Boundary aBoundary;
-//-----IAccessibility2 Implementation 2009
         switch( aTextType )
         {
             // Not yet handled by OCommonAccessibleText. Missing
@@ -2230,7 +2194,6 @@ namespace accessibility
                 }
                 break;
             }
-	    //IAccessibility2 Implementation 2009-----
             case AccessibleTextType::LINE:
             {
                 SvxTextForwarder&	rCacheTF = GetTextForwarder();
@@ -2341,7 +2304,6 @@ namespace accessibility
 				ExtendByField( aResult );
 				break;
 			}
-			//-----IAccessibility2 Implementation 2009
             default:
                 aResult = OCommonAccessibleText::getTextBeforeIndex( nIndex, aTextType );
                 break;
@@ -2362,9 +2324,7 @@ namespace accessibility
         ::com::sun::star::accessibility::TextSegment aResult;
         aResult.SegmentStart = -1;
         aResult.SegmentEnd = -1;
-//IAccessibility2 Implementation 2009-----
 		i18n::Boundary aBoundary;
-//-----IAccessibility2 Implementation 2009
         switch( aTextType )
         {
             case AccessibleTextType::ATTRIBUTE_RUN:
@@ -2387,7 +2347,6 @@ namespace accessibility
                 break;
             }
 
-//IAccessibility2 Implementation 2009-----
             case AccessibleTextType::LINE:
             {
                 SvxTextForwarder&	rCacheTF = GetTextForwarder();
@@ -2473,7 +2432,6 @@ namespace accessibility
 				ExtendByField( aResult );
 				break;
 			}
-			//-----IAccessibility2 Implementation 2009
             default:
                 aResult = OCommonAccessibleText::getTextBehindIndex( nIndex, aTextType );
                 break;
@@ -2550,7 +2508,6 @@ namespace accessibility
             if( aBulletInfo.nParagraph != EE_PARA_NOT_FOUND && aBulletInfo.bVisible )
                         nBulletLen = aBulletInfo.aText.Len();
             ESelection aSelection = MakeSelection (nStartIndex + nBulletLen, nEndIndex + nBulletLen);
-            //if( !rCacheTF.IsEditable( MakeSelection(nStartIndex, nEndIndex) ) )
             if( !rCacheTF.IsEditable( aSelection ) )
                 return sal_False; // non-editable area selected
 

Modified: openoffice/branches/l10n40/main/editeng/source/accessibility/AccessibleHyperlink.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/editeng/source/accessibility/AccessibleHyperlink.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/editeng/source/accessibility/AccessibleHyperlink.cxx (original)
+++ openoffice/branches/l10n40/main/editeng/source/accessibility/AccessibleHyperlink.cxx Sun Dec  1 11:40:24 2013
@@ -141,7 +141,6 @@ namespace accessibility
 // MT IA2: Accessiblehyperlink.hxx from IA2 CWS - meanwhile we also introduced one in DEV300 (above)
 // Keeping this for reference - we probably should get support for image maps in our implementation...
 
-//IAccessibility2 Implementation 2009-----
 
 /*
 
@@ -441,6 +440,5 @@ sal_Bool SAL_CALL SvxAccessibleHyperlink
 
 */
 
-//-----IAccessibility2 Implementation 2009
 
 

Modified: openoffice/branches/l10n40/main/editeng/source/accessibility/AccessibleStaticTextBase.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/editeng/source/accessibility/AccessibleStaticTextBase.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/editeng/source/accessibility/AccessibleStaticTextBase.cxx (original)
+++ openoffice/branches/l10n40/main/editeng/source/accessibility/AccessibleStaticTextBase.cxx Sun Dec  1 11:40:24 2013
@@ -83,9 +83,7 @@ namespace accessibility
             return ( lhs.Name == rhs.Name && lhs.Value == rhs.Value );
         }
     };
-//IAccessibility2 Implementation 2009-----
 sal_Unicode cNewLine(0x0a);
-//-----IAccessibility2 Implementation 2009
 	//------------------------------------------------------------------------
 	//
 	// Static Helper
@@ -122,9 +120,7 @@ sal_Unicode cNewLine(0x0a);
      */
     class AccessibleStaticTextBase_Impl
     {
-	//IAccessibility2 Implementation 2009-----
 		friend class AccessibleStaticTextBase;
-	//-----IAccessibility2 Implementation 2009
     public:
 
         // receive pointer to our frontend class and view window
@@ -198,9 +194,7 @@ sal_Unicode cNewLine(0x0a);
                                               sal_Int32 nEndPara, sal_Int32 nEndIndex );
 
         Rectangle                   GetParagraphBoundingBox() const;
-	//IAccessibility2 Implementation 2009-----
 		sal_Bool					RemoveLineBreakCount( sal_Int32& rIndex );
-	//-----IAccessibility2 Implementation 2009
 
     private:
 
@@ -393,9 +387,7 @@ sal_Unicode cNewLine(0x0a);
         {
             nCurrCount = GetParagraph( nCurrPara ).getCharacterCount();
             nCurrIndex += nCurrCount;
-	//IAccessibility2 Implementation 2009-----
             if( nCurrIndex >= nFlatIndex )
-	//-----IAccessibility2 Implementation 2009
             {
                 // check overflow
                 DBG_ASSERT(nCurrPara >= 0 && nCurrPara <= USHRT_MAX &&
@@ -485,7 +477,6 @@ sal_Unicode cNewLine(0x0a);
         }
         return aRect;
     }
-    	//IAccessibility2 Implementation 2009-----
 	//the input argument is the index(including "\n" ) in the string.
 	//the function will calculate the actual index(not including "\n") in the string.
 	//and return true if the index is just at a "\n"
@@ -537,7 +528,6 @@ sal_Unicode cNewLine(0x0a);
 		}
 		return sal_False;
 	}
-	//-----IAccessibility2 Implementation 2009
 	//------------------------------------------------------------------------
 	//
 	// AccessibleStaticTextBase implementation
@@ -726,10 +716,8 @@ sal_Unicode cNewLine(0x0a);
     uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleStaticTextBase::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
-	//IAccessibility2 Implementation 2009-----
 		//get the actual index without "\n"
 		mpImpl->RemoveLineBreakCount( nIndex );
-	//IAccessibility2 Implementation 2009-----
 
         EPosition aPos( mpImpl->Index2Internal(nIndex) );
 
@@ -761,10 +749,8 @@ sal_Unicode cNewLine(0x0a);
         sal_Int32 i, nCount, nParas;
         for( i=0, nCount=0, nParas=mpImpl->GetParagraphCount(); i<nParas; ++i )
             nCount += mpImpl->GetParagraph(i).getCharacterCount();
-	//IAccessibility2 Implementation 2009-----
 		//count on the number of "\n" which equals number of paragraphs decrease 1.
 		nCount = nCount + (nParas-1);
-	//IAccessibility2 Implementation 2009-----
         return nCount;
     }
 
@@ -867,7 +853,6 @@ sal_Unicode cNewLine(0x0a);
 
         if( nStartIndex > nEndIndex )
             ::std::swap(nStartIndex, nEndIndex);
-		//IAccessibility2 Implementation 2009-----
 		//if startindex equals endindex we will get nothing. So return an empty string directly.
 		if ( nStartIndex == nEndIndex )
 		{
@@ -907,21 +892,16 @@ sal_Unicode cNewLine(0x0a);
         {
 			//we don't return the string directly now for that we have to do some further process for "\n"
 			aRes = mpImpl->GetParagraph( aStartIndex.nPara ).getTextRange( aStartIndex.nIndex, aEndIndex.nIndex );
-            //return mpImpl->GetParagraph( aStartIndex.nPara ).getTextRange( aStartIndex.nIndex, aEndIndex.nIndex );
-			//-----IAccessibility2 Implementation 2009
         }
         else
         {
             sal_Int32 i( aStartIndex.nPara );
-	    		//IAccessibility2 Implementation 2009-----
 	            aRes = mpImpl->GetParagraph(i).getTextRange( aStartIndex.nIndex,
                                                                         mpImpl->GetParagraph(i).getCharacterCount()/*-1*/);
-			//-----IAccessibility2 Implementation 2009
             ++i;
 
             // paragraphs inbetween are fully included
             for( ; i<aEndIndex.nPara; ++i )
-	    //IAccessibility2 Implementation 2009-----
 			{
 				aRes += rtl::OUString(cNewLine);
                 aRes += mpImpl->GetParagraph(i).getText();
@@ -950,16 +930,13 @@ sal_Unicode cNewLine(0x0a);
 			aRes += rtl::OUString(cNewLine);
 		}
 		return aRes;
-		//-----IAccessibility2 Implementation 2009
     }
 
     ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleStaticTextBase::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
     {
-    	//IAccessibility2 Implementation 2009-----
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
 		sal_Bool bLineBreak = mpImpl->RemoveLineBreakCount( nIndex );
-	//-----IAccessibility2 Implementation 2009
         EPosition aPos( mpImpl->Range2Internal(nIndex) );
 
         ::com::sun::star::accessibility::TextSegment aResult;
@@ -979,7 +956,6 @@ sal_Unicode cNewLine(0x0a);
             aResult.SegmentStart = mpImpl->Internal2Index( EPosition( aPos.nPara, 0 ) );
             aResult.SegmentEnd = aResult.SegmentStart + aResult.SegmentText.getLength();
         }
-	//IAccessibility2 Implementation 2009-----
         else if ( AccessibleTextType::ATTRIBUTE_RUN == aTextType )
         {
               SvxAccessibleTextAdapter& rTextForwarder = mpImpl->GetParagraph( aPos.nIndex ).GetTextForwarder();
@@ -991,7 +967,6 @@ sal_Unicode cNewLine(0x0a);
                      aResult.SegmentEnd = nEndIndex;
               }
         }
-	//-----IAccessibility2 Implementation 2009
         else
         {
             // No special handling required, forward to wrapped class
@@ -999,12 +974,10 @@ sal_Unicode cNewLine(0x0a);
 
             // #112814# Adapt the start index with the paragraph offset
             mpImpl->CorrectTextSegment( aResult, aPos.nPara );
-	    //IAccessibility2 Implementation 2009-----
 			if ( bLineBreak )
 			{
 				aResult.SegmentText = rtl::OUString(cNewLine);
 			}
-	    //-----IAccessibility2 Implementation 2009
         }
 
         return aResult;
@@ -1013,10 +986,8 @@ sal_Unicode cNewLine(0x0a);
     ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleStaticTextBase::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
     {
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
-		//IAccessibility2 Implementation 2009-----
 		sal_Int32 nOldIdx = nIndex;
 		sal_Bool bLineBreak =  mpImpl->RemoveLineBreakCount( nIndex );
-		//-----IAccessibility2 Implementation 2009
         EPosition aPos( mpImpl->Range2Internal(nIndex) );
 
         ::com::sun::star::accessibility::TextSegment aResult;
@@ -1048,12 +1019,10 @@ sal_Unicode cNewLine(0x0a);
 
             // #112814# Adapt the start index with the paragraph offset
             mpImpl->CorrectTextSegment( aResult, aPos.nPara );
-			//IAccessibility2 Implementation 2009-----
 			if ( bLineBreak && (nOldIdx-1) >= 0)
 			{
 				aResult = getTextAtIndex( nOldIdx-1, aTextType );
 			}
-			//-----IAccessibility2 Implementation 2009			
         }
 
         return aResult;
@@ -1062,11 +1031,9 @@ sal_Unicode cNewLine(0x0a);
     ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleStaticTextBase::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
     {
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
-	//IAccessibility2 Implementation 2009-----
 		sal_Int32 nTemp = nIndex+1;
 		sal_Bool bLineBreak = mpImpl->RemoveLineBreakCount( nTemp );
 		mpImpl->RemoveLineBreakCount( nIndex );
-	//-----IAccessibility2 Implementation 2009
         EPosition aPos( mpImpl->Range2Internal(nIndex) );
 
         ::com::sun::star::accessibility::TextSegment aResult;
@@ -1092,12 +1059,10 @@ sal_Unicode cNewLine(0x0a);
 
             // #112814# Adapt the start index with the paragraph offset
             mpImpl->CorrectTextSegment( aResult, aPos.nPara );
-			//IAccessibility2 Implementation 2009-----
 			if ( bLineBreak )
 			{
 				aResult.SegmentText = rtl::OUString(cNewLine) + aResult.SegmentText;
 			}
-			//-----IAccessibility2 Implementation 2009
        }
 
         return aResult;



Mime
View raw message