openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1546803 [14/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/vcl/inc/vcl/vclevent.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/inc/vcl/vclevent.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/inc/vcl/vclevent.hxx (original)
+++ openoffice/branches/l10n40/main/vcl/inc/vcl/vclevent.hxx Sun Dec  1 11:40:24 2013
@@ -154,10 +154,8 @@ namespace com { namespace sun { namespac
 #define VCLEVENT_ITEM_COLLAPSED             1175
 // <--
 #define VCLEVENT_DROPDOWN_PRE_OPEN          1176
-//IAccessibility2 Implementation 2009-----
 #define VCLEVENT_LISTBOX_FOCUSITEMCHANGED	1180
 // #define VCLEVENT_EDIT_CARETCHANGED  		xxxx	// IA2 CWS. MT: VCL only has selection API - difference for selection_changed vs. caret_changed is handled in accessibility wrapper since OOo 3.2
-//-----IAccessibility2 Implementation 2009
 
 // VclMenuEvent
 #define VCLEVENT_MENU_ACTIVATE              1200
@@ -176,16 +174,13 @@ namespace com { namespace sun { namespac
 #define VCLEVENT_MENU_ITEMCHECKED			1213
 #define VCLEVENT_MENU_ITEMUNCHECKED			1214
 #define VCLEVENT_MENU_ACCESSIBLENAMECHANGED	1215
-//IAccessibility2 Implementation 2009-----
 #define VCLEVENT_TOOLBOX_ITEMWINDOWCHANGED  1216
 #define VCLEVENT_TOOLBOX_ITEMUPDATED  1217
-//-----IAccessibility2 Implementation 2009
 
 #define VCLEVENT_MENU_SHOW                  1250
 #define VCLEVENT_MENU_HIDE                  1251
 
 #define VCLEVENT_TOOLBOX_ITEMWINDOWCHANGED  1216
-//IAccessibility2 Implementation 2009-----
 #define VCLEVENT_LISTBOX_TREEEXPAND             1218
 #define VCLEVENT_LISTBOX_TREECOLLAPSE           1219
 #define VCLEVENT_LISTBOX_TREEFOCUS	            1220
@@ -195,7 +190,6 @@ namespace com { namespace sun { namespac
 
 #define VCLEVENT_LISTBOX_FOCUS             1224
 #define VCLEVENT_LISTBOX_CLEAR             1225
-//-----IAccessibility2 Implementation 2009
 // DockingWindow
 #define VCLEVENT_WINDOW_STARTDOCKING            1227    // pData = DockingData
 #define VCLEVENT_WINDOW_DOCKING                 1228
@@ -207,7 +201,6 @@ namespace com { namespace sun { namespac
 #define VCLEVENT_TOOLBOX_BUTTONSTATECHANGED     1233    // pData = itempos
 #define VCLEVENT_TABLECELL_NAMECHANGED          1234    // pData = struct(Entry, Column, oldText)
 #define VCLEVENT_TABLEROW_SELECT				1235
-// IAccessible2 implementation 2009
 #define VCLEVENT_LISTBOX_STATEUPDATE			1236
 class VCL_DLLPUBLIC VclSimpleEvent
 {

Modified: openoffice/branches/l10n40/main/vcl/inc/vcl/window.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/inc/vcl/window.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/inc/vcl/window.hxx (original)
+++ openoffice/branches/l10n40/main/vcl/inc/vcl/window.hxx Sun Dec  1 11:40:24 2013
@@ -629,11 +629,9 @@ public:
     virtual void        DataChanged( const DataChangedEvent& rDCEvt );
     virtual long        PreNotify( NotifyEvent& rNEvt );
     virtual long        Notify( NotifyEvent& rNEvt );
-//IAccessibility2 Implementation 2009-----
     virtual void        NotifyVCLEvent( sal_uLong nEvent ,void* pData = NULL);
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > GetAccFlowToSequence();
 	virtual void SwitchView() {}
-//-----IAccessibility2 Implementation 2009
     virtual Window*     GetPreferredKeyInputWindow();
 
     /*virtual*/ void    AddEventListener( const Link& rEventListener );

Modified: openoffice/branches/l10n40/main/vcl/source/app/svapp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/source/app/svapp.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/source/app/svapp.cxx (original)
+++ openoffice/branches/l10n40/main/vcl/source/app/svapp.cxx Sun Dec  1 11:40:24 2013
@@ -2049,13 +2049,11 @@ void Application::AddToRecentDocumentLis
 
 sal_Bool Application::IsAccessibilityEnabled()
 {
-//IAccessible2 Implementation 2009-----
 #ifdef WNT
 	return IsWNTInitAccessBridge();
 #else 
     return sal_False;
 #endif 
-//-----IAccessible2 Implementation 2009
 }
 
 sal_Bool InitAccessBridge( sal_Bool bShowCancel, sal_Bool &rCancelled )
@@ -2091,7 +2089,6 @@ sal_Bool InitAccessBridge( sal_Bool bSho
     return bRet;
 }
 
-//IAccessible2 Implementation 2009-----
 #ifdef WNT
 sal_Bool HasAtHook()
 {
@@ -2112,7 +2109,6 @@ sal_Bool HasAtHook()
 	return sal_False;
 }
 #endif
-//-----IAccessible2 Implementation 2009
 // MT: AppProperty, AppEvent was in oldsv.cxx, but is still needed...
 // ------------------------------------------------------------------------
 
@@ -2134,7 +2130,6 @@ void Application::SetPropertyHandler( Pr
         delete pHandler;
     pHandler = p;
 }
-//IAccessible2 Implementation 2009-----
 bool Application::EnableAccessInterface(bool bEnable)
 {
 #ifdef WNT
@@ -2148,7 +2143,6 @@ bool Application::IsEnableAccessInterfac
 {
 	return ImplGetSVData()->maAppData.m_bEnableAccessInterface;
 }
-//-----IAccessibility2 Implementation 2009
 
 
 

Modified: openoffice/branches/l10n40/main/vcl/source/app/svdata.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/source/app/svdata.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/source/app/svdata.cxx (original)
+++ openoffice/branches/l10n40/main/vcl/source/app/svdata.cxx Sun Dec  1 11:40:24 2013
@@ -36,7 +36,6 @@
 
 #include "unotools/fontcfg.hxx"
 
-//IAccessible2 Implementation 2009-----
 #ifdef WNT
 #ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_HPP_
 #include <com/sun/star/accessibility/XAccessible.hpp>
@@ -45,7 +44,6 @@
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #endif
 #endif
-//-----IAccessible2 Implementation 2009
 #include "vos/mutex.hxx"
 
 #include "cppuhelper/implbase1.hxx"
@@ -77,13 +75,11 @@
 #include "com/sun/star/java/JavaDisabledException.hpp"
 
 #include <stdio.h>
-//IAccessible2 Implementation 2009-----
 #ifdef WNT
 #include <unotools/processfactory.hxx>
 #include <com/sun/star/accessibility/XMSAAService.hpp>
 #include <win/g_msaasvc.h>
 #endif
-//-----IAccessible2 Implementation 2009
 
 namespace {
 
@@ -149,12 +145,10 @@ void ImplInitSVData()
             break;
         }
     }
-//IAccessible2 Implementation 2009-----
 #ifdef WNT
 	//Default enable the acc bridge interface
 	pImplSVData->maAppData.m_bEnableAccessInterface =true;
 #endif
-//-----IAccessible2 Implementation 2009
     
     // mark default layout border as unitialized
     pImplSVData->maAppData.mnDefaultLayoutBorder = -1;
@@ -362,7 +356,6 @@ com::sun::star::uno::Any AccessBridgeCur
     }
     return ret;
 }
-//IAccessible2 Implementation 2009-----
 #ifdef WNT
 void AccessBridgehandleExistingWindow(Window * pWindow, bool bShow)
 {
@@ -444,7 +437,6 @@ void AccessBridgeupdateOldTopWindows()
 	}
 }
 #endif
-//-----IAccessible2 Implementation 2009
 
 bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool &rCancelled)
 {
@@ -476,7 +468,6 @@ bool ImplInitAccessBridge(sal_Bool bAllo
 
             if( xFactory.is() )
             {
-//IAccessible2 Implementation 2009-----
 #ifdef WNT
 				pSVData->mxAccessBridge = xFactory->createInstance(
 			               OUString::createFromAscii( "com.sun.star.accessibility.MSAAService" ) ); 
@@ -491,7 +482,6 @@ bool ImplInitAccessBridge(sal_Bool bAllo
                     bSuccess = false;
                 return bSuccess;
 #endif
-//-----IAccessible2 Implementation 2009
                 css::uno::Reference< XExtendedToolkit > xToolkit = 
                     css::uno::Reference< XExtendedToolkit >(Application::GetVCLToolkit(), UNO_QUERY);
 

Modified: openoffice/branches/l10n40/main/vcl/source/app/svmain.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/source/app/svmain.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/source/app/svmain.cxx (original)
+++ openoffice/branches/l10n40/main/vcl/source/app/svmain.cxx Sun Dec  1 11:40:24 2013
@@ -55,11 +55,9 @@
 #include <process.h>    // for _beginthreadex
 #include <ole2.h>   // for _beginthreadex
 #include <tools/postwin.h>
-//IAccessibility2 Implementation 2009-----
 #include <com/sun/star/accessibility/XMSAAService.hpp>
 #include <win/g_msaasvc.h>
 using namespace com::sun::star::accessibility;
-//-----IAccessibility2 Implementation 2009
 #endif
 
 // [ed 5/14/02 Add in explicit check for quartz graphics.  OS X will define
@@ -220,12 +218,10 @@ sal_Bool ImplSVMain()
 	}
 
     DeInitVCL();
-//IAccessibility2 Implementation 2009-----
 	#ifdef WNT
 		if( g_acc_manager1 )
 			g_acc_manager1->release();
 	#endif 
-//-----IAccessibility2 Implementation 2009
     return bInit;
 }
 

Modified: openoffice/branches/l10n40/main/vcl/source/control/combobox.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/source/control/combobox.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/source/control/combobox.cxx (original)
+++ openoffice/branches/l10n40/main/vcl/source/control/combobox.cxx Sun Dec  1 11:40:24 2013
@@ -215,9 +215,7 @@ void ComboBox::ImplInit( Window* pParent
 	mpImplLB->SetDoubleClickHdl( LINK( this, ComboBox, ImplDoubleClickHdl ) );
 	mpImplLB->SetUserDrawHdl( LINK( this, ComboBox, ImplUserDrawHdl ) );
 	mpImplLB->SetSelectionChangedHdl( LINK( this, ComboBox, ImplSelectionChangedHdl ) );
-//IAccessibility2 Implementation 2009-----
 	mpImplLB->SetListItemSelectHdl( LINK( this, ComboBox, ImplListItemSelectHdl ) );
-//-----IAccessibility2 Implementation 2009
 	mpImplLB->Show();
 
 	if ( mpFloatWin )
@@ -276,13 +274,11 @@ sal_Bool ComboBox::IsAutocompleteEnabled
 {
 	return mpSubEdit->GetAutocompleteHdl().IsSet();
 }
-//IAccessibility2 Implementation 2009-----
 void  ComboBox::SetMpSubEditAccessibleName(String &aName)
 {
 	if(mpSubEdit!=NULL)
         mpSubEdit->SetAccessibleName(aName);
 }              
-//-----IAccessibility2 Implementation 2009
 // -----------------------------------------------------------------------
 
 IMPL_LINK( ComboBox, ImplClickBtnHdl, void*, EMPTYARG )
@@ -477,13 +473,11 @@ IMPL_LINK( ComboBox, ImplSelectHdl, void
 
 	return 0;
 }
-//IAccessibility2 Implementation 2009-----
 IMPL_LINK( ComboBox, ImplListItemSelectHdl,  void*, EMPTYARG )
 {
     ImplCallEventListeners( VCLEVENT_LISTBOX_SELECT );
 	return 1;
 }
-//-----IAccessibility2 Implementation 2009
 // -----------------------------------------------------------------------
 
 IMPL_LINK( ComboBox, ImplCancelHdl, void*, EMPTYARG )
@@ -1435,12 +1429,10 @@ sal_uInt16 ComboBox::GetMaxMRUCount() co
 	return mpImplLB->GetMaxMRUCount();
 }
 
-//IAccessibility2 Implementation 2009-----
 sal_uInt16 ComboBox::GetMRUCount() const
 {
 	return mpImplLB->GetEntryList()->GetMRUCount();
 }
-//-----IAccessibility2 Implementation 2009
 // -----------------------------------------------------------------------
 
 sal_uInt16 ComboBox::GetDisplayLineCount() const

Modified: openoffice/branches/l10n40/main/vcl/source/control/edit.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/source/control/edit.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/source/control/edit.cxx (original)
+++ openoffice/branches/l10n40/main/vcl/source/control/edit.cxx Sun Dec  1 11:40:24 2013
@@ -954,7 +954,7 @@ void Edit::ImplInsertText( const XubStri
                     ++nChgPos;
 
                 xub_StrLen nChgLen = static_cast< xub_StrLen >( nTmpLen - nChgPos );
-                String aChgText( aTmpText.copy( nChgPos ), nChgLen );
+                String aChgText( aTmpText.copy( nChgPos ).getStr(), nChgLen );
 
                 // remove text from first pos to be changed to current pos
                 maText.Erase( static_cast< xub_StrLen >( nChgPos ), static_cast< xub_StrLen >( nTmpPos - nChgPos ) );
@@ -2498,10 +2498,8 @@ void Edit::Modify()
             return;
 
         // #i13677# notify edit listeners about caret position change
-//IAccessibility2 Implementation 2009-----
         //ImplCallEventListeners( VCLEVENT_EDIT_SELECTIONCHANGED );
         ImplCallEventListeners( VCLEVENT_EDIT_CARETCHANGED );
-//-----IAccessibility2 Implementation 2009
         // FIXME: this is currently only on aqua
         // check for other platforms that need similar handling
         if( ImplGetSVData()->maNWFData.mbNoFocusRects &&
@@ -2656,15 +2654,12 @@ void Edit::ImplSetSelection( const Selec
 			if ( aNew != maSelection )
 			{
                 ImplClearLayoutData();
-//IAccessibility2 Implementation 2009-----
 				Selection aTemp = maSelection;
-//-----IAccessibility2 Implementation 2009
 				maSelection = aNew;
 
 				if ( bPaint && ( aOld.Len() || aNew.Len() || IsPaintTransparent() ) )
                     ImplInvalidateOrRepaint( 0, maText.Len() );
 				ImplShowCursor();
-//IAccessibility2 Implementation 2009-----
 				sal_Bool bCaret = sal_False, bSelection = sal_False;
 				long nB=aNew.Max(), nA=aNew.Min(),oB=aTemp.Max(), oA=aTemp.Min();
 				long nGap = nB-nA, oGap = oB-oA;
@@ -2686,7 +2681,6 @@ void Edit::ImplSetSelection( const Selec
 					else
 						ImplCallEventListeners( VCLEVENT_EDIT_SELECTIONCHANGED );
 				}
-//-----IAccessibility2 Implementation 2009
                 // #103511# notify combobox listeners of deselection
                 if( !maSelection && GetParent() && GetParent()->GetType() == WINDOW_COMBOBOX )
                     ((Edit*)GetParent())->ImplCallEventListeners( VCLEVENT_COMBOBOX_DESELECT );

Modified: openoffice/branches/l10n40/main/vcl/source/control/ilstbox.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/source/control/ilstbox.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/source/control/ilstbox.cxx (original)
+++ openoffice/branches/l10n40/main/vcl/source/control/ilstbox.cxx Sun Dec  1 11:40:24 2013
@@ -917,11 +917,9 @@ void ImplListBoxWindow::MouseButtonDown(
 
 				mnCurrentPos = nSelect;
 				mbTrackingSelect = true;
-				//IAccessibility2 Impplementaton 2009-----
 				sal_Bool bCurPosChange = (mnCurrentPos != nSelect);
 				//SelectEntries( nSelect, LET_MBDOWN, rMEvt.IsShift(), rMEvt.IsMod1() );
 				SelectEntries( nSelect, LET_MBDOWN, rMEvt.IsShift(), rMEvt.IsMod1() ,bCurPosChange);
-				//-----IAccessibility2 Impplementaton 2009
 				mbTrackingSelect = false;
 				if ( mbGrabFocus )
 					GrabFocus();
@@ -992,14 +990,12 @@ void ImplListBoxWindow::MouseMove( const
 			                ImplCallSelect();
 			                mbTravelSelect = false;
                         }
-//IAccessibility2 Implementation 2009----
 						// When list box selection change by mouse move, notity  
 						// VCLEVENT_LISTBOX_SELECT vcl event.
 						else
 						{
 							maListItemSelectHdl.Call(NULL);
 						}
-//----IAccessibility2 Implementation 2009
 		            }
 					mbTrackingSelect = false;
 				}
@@ -1232,12 +1228,10 @@ sal_Bool ImplListBoxWindow::SelectEntrie
             maFocusRect.SetSize( aSz );
 			if( HasFocus() )
 				ImplShowFocusRect();
-//IAccessibility2 Implementation 2009----
 			if (bSelectPosChange)
 			{
 				maFocusHdl.Call(reinterpret_cast<void*>(nSelect));
 			}
-//----IAccessibility2 Implementation 2009
 		}
         ImplClearLayoutData();
 	}
@@ -1700,12 +1694,10 @@ sal_Bool ImplListBoxWindow::ProcessKeyIn
 		DBG_ASSERT( !mpEntryList->IsEntryPosSelected( nSelect ) || mbMulti, "ImplListBox: Selecting same Entry" );
 	    if( nSelect >= mpEntryList->GetEntryCount() )
             nSelect = mpEntryList->GetEntryCount()-1;
-//IAccessibility2 Implementation 2009-----
 		sal_Bool bCurPosChange = (mnCurrentPos != nSelect);
 		mnCurrentPos = nSelect;
 		//if ( SelectEntries( nSelect, eLET, bShift, bCtrl ) )
 		if(SelectEntries( nSelect, eLET, bShift, bCtrl ,bCurPosChange))
-//-----IAccessibility2 Implementation 2009
 		{
 			mbTravelSelect = true;
 			mnSelectModifier = rKEvt.GetKeyCode().GetModifier();
@@ -2181,9 +2173,7 @@ Rectangle ImplListBoxWindow::GetBounding
     const ImplEntryType* pEntry = mpEntryList->GetEntryPtr( nItem );
     Size aSz( GetSizePixel().Width(), pEntry ? pEntry->mnHeight : GetEntryHeight() );
     //long nY = mpEntryList->GetAddedHeight( nItem, GetTopEntry() ) - mpEntryList->GetAddedHeight( GetTopEntry() );
-	//IAccessibility2 Impplementaton 2009-----
     long nY = mpEntryList->GetAddedHeight( nItem, GetTopEntry() ) + GetEntryList()->GetMRUCount()*GetEntryHeight();
-	//-----IAccessibility2 Impplementaton 2009
     Rectangle aRect( Point( 0, nY ), aSz );
     return aRect;
 }

Modified: openoffice/branches/l10n40/main/vcl/source/control/lstbox.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/source/control/lstbox.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/source/control/lstbox.cxx (original)
+++ openoffice/branches/l10n40/main/vcl/source/control/lstbox.cxx Sun Dec  1 11:40:24 2013
@@ -170,10 +170,8 @@ void ListBox::ImplInit( Window* pParent,
 	mpImplLB->SetCancelHdl( LINK( this, ListBox, ImplCancelHdl ) );
 	mpImplLB->SetDoubleClickHdl( LINK( this, ListBox, ImplDoubleClickHdl ) );
 	mpImplLB->SetUserDrawHdl( LINK( this, ListBox, ImplUserDrawHdl ) );
-//IAccessibility2 Implementation 2009-----
 	mpImplLB->SetFocusHdl( LINK( this, ListBox, ImplFocusHdl ) );
 	mpImplLB->SetListItemSelectHdl( LINK( this, ListBox, ImplListItemSelectHdl ) );
-//-----IAccessibility2 Implementation 2009
 	mpImplLB->SetPosPixel( Point() );
     mpImplLB->SetEdgeBlending(GetEdgeBlending());
 	mpImplLB->Show();
@@ -253,7 +251,6 @@ IMPL_LINK( ListBox, ImplSelectHdl, void*
 
 	return 1;
 }
-//IAccessibility2 Implementation 2009-----
 IMPL_LINK( ListBox, ImplFocusHdl, void *, nPos )
 {
     ImplCallEventListeners( VCLEVENT_LISTBOX_FOCUS , nPos);
@@ -264,7 +261,6 @@ IMPL_LINK( ListBox, ImplListItemSelectHd
     ImplCallEventListeners( VCLEVENT_LISTBOX_SELECT );
 	return 1;
 }
-//-----IAccessibility2 Implementation 2009
 
 // -----------------------------------------------------------------------
 
@@ -1076,7 +1072,6 @@ void ListBox::SetNoSelection()
 		mpImplWin->SetImage( aImage );
 		mpImplWin->Invalidate();
 	}
-	// IAccessible2 implementation 2009
 	NotifyVCLEvent( VCLEVENT_LISTBOX_STATEUPDATE);
 }
 
@@ -1223,7 +1218,6 @@ void ListBox::SelectEntryPos( sal_uInt16
 {
 	if ( nPos < mpImplLB->GetEntryList()->GetEntryCount() )
 	{
-		// IAccessible2 implementation 2009
 		sal_uInt16 oldSelectCount = GetSelectEntryCount(), newSelectCount = 0, nCurrentPos = mpImplLB->GetCurrentPos();
 		mpImplLB->SelectEntry( nPos + mpImplLB->GetEntryList()->GetMRUCount(), bSelect );
 		newSelectCount = GetSelectEntryCount();
@@ -1637,12 +1631,10 @@ sal_uInt16 ListBox::GetMaxMRUCount() con
 {
 	return mpImplLB->GetMaxMRUCount();
 }
-//IAccessibility2 Implementation 2009-----
 sal_uInt16 ListBox::GetMRUCount() const
 {
 	return mpImplLB->GetEntryList()->GetMRUCount();
 }
-//-----IAccessibility2 Implementation 2009
 
 // -----------------------------------------------------------------------
 

Modified: openoffice/branches/l10n40/main/vcl/source/control/morebtn.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/source/control/morebtn.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/source/control/morebtn.cxx (original)
+++ openoffice/branches/l10n40/main/vcl/source/control/morebtn.cxx Sun Dec  1 11:40:24 2013
@@ -153,10 +153,6 @@ void MoreButton::Click()
 	mbState = !mbState;
     ShowState();
 
-	// Hier den Click-Handler rufen, damit vorher die Controls initialisiert
-	// werden koennen
-	//PushButton::Click(); // IAccessibility2 Implementation 2009
-
 	// Je nach Status die Fenster updaten
 	if ( mbState )
 	{
@@ -197,9 +193,7 @@ void MoreButton::Click()
 			pWindow = mpMBData->mpItemList->Next();
 		}
 	}
-//IAccessibility2 Implementation 2009-----
 	PushButton::Click();
-//-----IAccessibility2 Implementation 2009
 }
 
 // -----------------------------------------------------------------------

Modified: openoffice/branches/l10n40/main/vcl/source/control/tabctrl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/source/control/tabctrl.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/source/control/tabctrl.cxx (original)
+++ openoffice/branches/l10n40/main/vcl/source/control/tabctrl.cxx Sun Dec  1 11:40:24 2013
@@ -619,9 +619,7 @@ void TabControl::ImplChangeTabPage( sal_
         }
 
         pPage->ActivatePage();
-//IAccessibility2 Implementation 2009-----
 		pPage->Show();
-//-----IAccessibility2 Implementation 2009
 
         if ( pOldPage && pOldPage->HasChildPathFocus() )
         {
@@ -633,9 +631,7 @@ void TabControl::ImplChangeTabPage( sal_
                 GrabFocus();
         }
 
-//IAccessibility2 Implementation 2009-----
         // pPage->Show(); 
-//-----IAccessibility2 Implementation 2009
     }
 
     if ( pOldPage )

Modified: openoffice/branches/l10n40/main/vcl/source/gdi/configsettings.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/source/gdi/configsettings.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/source/gdi/configsettings.cxx (original)
+++ openoffice/branches/l10n40/main/vcl/source/gdi/configsettings.cxx Sun Dec  1 11:40:24 2013
@@ -131,7 +131,7 @@ void SettingsConfigItem::getValues()
     m_aSettings.clear();
 
     Sequence< OUString > aNames( GetNodeNames( OUString() ) );
-    m_aSettings.resize( aNames.getLength() );
+    m_aSettings.rehash( aNames.getLength() );
 
     for( int j = 0; j < aNames.getLength(); j++ )
     {

Modified: openoffice/branches/l10n40/main/vcl/source/window/btndlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/source/window/btndlg.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/source/window/btndlg.cxx (original)
+++ openoffice/branches/l10n40/main/vcl/source/window/btndlg.cxx Sun Dec  1 11:40:24 2013
@@ -289,7 +289,6 @@ void ButtonDialog::StateChanged( StateCh
 	if ( nType == STATE_CHANGE_INITSHOW )
 	{
 		ImplPosControls();
-//IAccessibility2 Implementation 2009-----
 		ImplBtnDlgItem* pItem = mpItemList->First();
 		while ( pItem )
 		{
@@ -297,7 +296,6 @@ void ButtonDialog::StateChanged( StateCh
 				pItem->mpPushButton->SetZOrder(0, WINDOW_ZORDER_LAST);
 			pItem = mpItemList->Next();
 		}
-//-----IAccessibility2 Implementation 2009
 
 		// Focus evt. auf den entsprechenden Button setzen
 		if ( mnFocusButtonId != BUTTONDIALOG_BUTTON_NOTFOUND )

Modified: openoffice/branches/l10n40/main/vcl/source/window/dlgctrl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/source/window/dlgctrl.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/source/window/dlgctrl.cxx (original)
+++ openoffice/branches/l10n40/main/vcl/source/window/dlgctrl.cxx Sun Dec  1 11:40:24 2013
@@ -835,7 +835,6 @@ sal_Bool Window::ImplDlgCtrl( const KeyE
                 if ( nStyle & WB_GROUP )
                     break;
 
-//IAccessibility2 Implementation 2009-----
 				//Solution:Pure window shouldn't get window after controls such as buttons. 
                 //if ( pWindow->IsVisible() && pWindow->IsEnabled() && pWindow->IsInputEnabled() )
 				if ( pWindow->IsVisible() && pWindow->IsEnabled() && 
@@ -846,7 +845,6 @@ sal_Bool Window::ImplDlgCtrl( const KeyE
 									pWindow->GetType() != WINDOW_CONTROL
 								   )
 	   )
-//-----IAccessibility2 Implementation 2009
                 {
                     pWindow->ImplControlFocus( GETFOCUS_CURSOR | GETFOCUS_BACKWARD );
                     return sal_True;
@@ -1309,7 +1307,6 @@ Window* Window::GetAccessibleRelationMem
 	}
 	return pWindow;
 }
-//-----IAccessibility2 Implementation 2009
 
 // -----------------------------------------------------------------------
 

Modified: openoffice/branches/l10n40/main/vcl/source/window/menu.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/source/window/menu.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/source/window/menu.cxx (original)
+++ openoffice/branches/l10n40/main/vcl/source/window/menu.cxx Sun Dec  1 11:40:24 2013
@@ -1573,7 +1573,6 @@ sal_uInt16 Menu::GetCurItemId() const
 {
     return nSelectedId;
 }
-//IAccessibility2 Implementation 2009
 void Menu::SetHightlightItem( sal_uInt16 nHighlightedItem )
 {
 	this->nHighlightedItem = nHighlightedItem;
@@ -3758,12 +3757,10 @@ sal_uInt16 PopupMenu::ImplExecute( Windo
             String aTmpEntryText( ResId( SV_RESID_STRING_NOSELECTIONPOSSIBLE, *pResMgr ) );
             MenuItemData* pData = pItemList->Insert(
                 0xFFFF, MENUITEM_STRING, 0, aTmpEntryText, Image(), NULL, 0xFFFF );
-//IAccessibility2 Implementation 2009-----
 		sal_uInt16          nmPos;
 		pData = pItemList->GetData( pData->nId, nmPos );
                 pData->bIsTemporary = sal_True;
 		ImplCallEventListeners(VCLEVENT_MENU_SUBMENUCHANGED,nmPos);
-//-----IAccessibility2 Implementation 2009
         }
     }
     else if ( Application::GetSettings().GetStyleSettings().GetAutoMnemonic() && !( nMenuFlags & MENU_FLAG_NOAUTOMNEMONICS ) )
@@ -4040,9 +4037,7 @@ void MenuFloatingWindow::doShutdown()
         // otherwise the entry will not be read when the menu is opened again
         if( nHighlightedItem != ITEMPOS_INVALID )
             pMenu->ImplCallEventListeners( VCLEVENT_MENU_DEHIGHLIGHT, nHighlightedItem );
-//IAccessibility2 Implementation 2009-----
 	pMenu->SetHightlightItem(ITEMPOS_INVALID);
-//-----IAccessibility2 Implementation 2009
         if( !bKeyInput && pMenu && pMenu->pStartedFrom && !pMenu->pStartedFrom->bIsMenuBar )
         {
             // #102461# remove highlight in parent
@@ -4713,9 +4708,7 @@ void MenuFloatingWindow::ChangeHighlight
             }
         }
         HighlightItem( nHighlightedItem, sal_True );
-//IAccessibility2 Implementation 2009-----
 	pMenu->SetHightlightItem(nHighlightedItem);
-//-----IAccessibility2 Implementation 2009
         pMenu->ImplCallHighlight( nHighlightedItem );
     }
     else
@@ -5017,10 +5010,8 @@ void MenuFloatingWindow::KeyInput( const
                     MenuFloatingWindow* pFloat = ((PopupMenu*)pMenu->pStartedFrom)->ImplGetFloatingWindow();
                     pFloat->GrabFocus();
                     pFloat->KillActivePopup();
-//IAccessibility2 Implementation 2009-----
   		    sal_uInt16 highlightItem = pFloat->GetHighlightedItem();
 		    pFloat->ChangeHighlightItem(highlightItem, sal_False);
-//-----IAccessibility2 Implementation 2009
                 }
             }
         }
@@ -5610,9 +5601,7 @@ void MenuBarWindow::ChangeHighlightItem(
     nHighlightedItem = (sal_uInt16)n;
     DBG_ASSERT( ( nHighlightedItem == ITEMPOS_INVALID ) || pMenu->ImplIsVisible( nHighlightedItem ), "ChangeHighlightItem: Not visible!" );
     HighlightItem( nHighlightedItem, sal_True );
-//IAccessibility2 Implementation 2009-----
     pMenu->SetHightlightItem(nHighlightedItem);
-//-----IAccessibility2 Implementation 2009
     pMenu->ImplCallHighlight( nHighlightedItem );
 
     if( mbAutoPopup )

Modified: openoffice/branches/l10n40/main/vcl/source/window/toolbox.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/source/window/toolbox.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/source/window/toolbox.cxx (original)
+++ openoffice/branches/l10n40/main/vcl/source/window/toolbox.cxx Sun Dec  1 11:40:24 2013
@@ -6065,11 +6065,9 @@ void ToolBox::ImplChangeHighlight( ImplT
                 mnCurPos = aPos;
             ImplShowFocus();
 
-//IAccessibility2 Implementation 2009-----
 			if( pItem->mpWindow )
 				pItem->mpWindow->GrabFocus();
 			if( pItem != pOldItem )
-//-----IAccessibility2 Implementation 2009
             ImplCallEventListeners( VCLEVENT_TOOLBOX_HIGHLIGHT );
 		}
 	}

Modified: openoffice/branches/l10n40/main/vcl/source/window/toolbox2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/source/window/toolbox2.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/source/window/toolbox2.cxx (original)
+++ openoffice/branches/l10n40/main/vcl/source/window/toolbox2.cxx Sun Dec  1 11:40:24 2013
@@ -1737,11 +1737,9 @@ void ToolBox::SetItemState( sal_uInt16 n
             ImplCallEventListeners( VCLEVENT_TOOLBOX_BUTTONSTATECHANGED, reinterpret_cast< void* >( nPos ) );
 
             // Notify
-//IAccessibility2 Implementation 2009-----
 		    //Solution:Call accessivle listener to notify state_changed event
 		    ImplCallEventListeners( VCLEVENT_TOOLBOX_ITEMUPDATED,reinterpret_cast< void* >(nPos) );
 		    //ImplCallEventListeners( VCLEVENT_TOOLBOX_CLICK, reinterpret_cast< void* >( nPos ) );
-//-----IAccessibility2 Implementation 2009
 		}
 	}
 }

Modified: openoffice/branches/l10n40/main/vcl/source/window/window.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/source/window/window.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/source/window/window.cxx (original)
+++ openoffice/branches/l10n40/main/vcl/source/window/window.cxx Sun Dec  1 11:40:24 2013
@@ -5397,7 +5397,6 @@ long Window::Notify( NotifyEvent& rNEvt 
     return nRet;
 }
 
-// IAccessible2 implementation, 2009
 void Window::NotifyVCLEvent( sal_uLong nEvent ,void* pData /*= NULL*/)
 {
 	ImplCallEventListeners( nEvent ,pData);
@@ -9125,7 +9124,6 @@ sal_uInt16 Window::GetAccessibleRole() c
             case WINDOW_MULTILINEEDIT: nRole = accessibility::AccessibleRole::SCROLL_PANE; break;
 
             case WINDOW_PATTERNFIELD:
-//IAccessibility2 Impplementaton 2009-----
             // Need to set the role of those window control to spinbox
             /*
             case WINDOW_NUMERICFIELD:
@@ -9133,7 +9131,6 @@ sal_uInt16 Window::GetAccessibleRole() c
             case WINDOW_CURRENCYFIELD:
             case WINDOW_LONGCURRENCYFIELD:
             */
-//-----IAccessibility2 Impplementaton 2009
             case WINDOW_EDIT: nRole = ( GetStyle() & WB_PASSWORD ) ? (accessibility::AccessibleRole::PASSWORD_TEXT) : (accessibility::AccessibleRole::TEXT); break;
 
             case WINDOW_PATTERNBOX:
@@ -9151,7 +9148,6 @@ sal_uInt16 Window::GetAccessibleRole() c
             case WINDOW_FIXEDTEXT: nRole = accessibility::AccessibleRole::LABEL; break;
             case WINDOW_FIXEDBORDER:
 				nRole = accessibility::AccessibleRole::SEPARATOR; break;
-	    //IAccessibility2 Impplementaton 2009-----
             case WINDOW_FIXEDLINE: 
 				{	if( GetText().Len() > 0 )
 						nRole = accessibility::AccessibleRole::LABEL; 
@@ -9160,7 +9156,6 @@ sal_uInt16 Window::GetAccessibleRole() c
 					break;
 				}
             //case WINDOW_FIXEDLINE: nRole = accessibility::AccessibleRole::SEPARATOR; break;
-	    //-----IAccessibility2 Impplementaton 2009
             case WINDOW_FIXEDBITMAP:
             case WINDOW_FIXEDIMAGE: nRole = accessibility::AccessibleRole::ICON; break;
             case WINDOW_GROUPBOX: nRole = accessibility::AccessibleRole::GROUP_BOX; break;
@@ -9175,13 +9170,11 @@ sal_uInt16 Window::GetAccessibleRole() c
             case WINDOW_DATEFIELD:
             case WINDOW_TIMEFIELD: nRole = accessibility::AccessibleRole::DATE_EDITOR; break;
 
-//IAccessibility2 Impplementaton 2009-----
             // Need to set the role of those window control to spinbox
             case WINDOW_NUMERICFIELD:
             case WINDOW_METRICFIELD:
             case WINDOW_CURRENCYFIELD:
             case WINDOW_LONGCURRENCYFIELD:
-//-----IAccessibility2 Impplementaton 2009
             case WINDOW_SPINFIELD: nRole = accessibility::AccessibleRole::SPIN_BOX; break;
 
             case WINDOW_TOOLBOX: nRole = accessibility::AccessibleRole::TOOL_BAR; break;
@@ -9233,12 +9226,10 @@ void Window::SetAccessibleName( const St
    if ( !mpWindowImpl->mpAccessibleInfos )
         mpWindowImpl->mpAccessibleInfos = new ImplAccessibleInfos;
 
-//IAccessibility2 Implementation 2009-----
 	String oldName = GetAccessibleName();
     delete mpWindowImpl->mpAccessibleInfos->pAccessibleName;
     mpWindowImpl->mpAccessibleInfos->pAccessibleName = new String( rName );
     ImplCallEventListeners( VCLEVENT_WINDOW_FRAMETITLECHANGED, &oldName );	
-//-----IAccessibility2 Implementation 2009
 }
 
 String Window::GetAccessibleName() const
@@ -9283,12 +9274,10 @@ String Window::GetAccessibleName() const
                 if ( pLabel && pLabel != this )
                     aAccessibleName = pLabel->GetText();
             }
-		//IAccessibility2 Implementation 2009-----
 		if ( !aAccessibleName.Len() )
 	        {
 	            aAccessibleName = GetQuickHelpText();
 	        }
-		//-----IAccessibility2 Implementation 2009
             break;
 
             case WINDOW_IMAGEBUTTON:
@@ -9302,7 +9291,6 @@ String Window::GetAccessibleName() const
                 }
             break;
 
-//IAccessibility2 Implementation 2009-----
 			case WINDOW_TOOLBOX:
 				aAccessibleName = GetText();
 				if( aAccessibleName.Len() == 0 )
@@ -9311,7 +9299,6 @@ String Window::GetAccessibleName() const
 			case WINDOW_MOREBUTTON:
 				aAccessibleName = mpWindowImpl->maText;
 				break;
-//-----IAccessibility2 Implementation 2009
             default:
                 aAccessibleName = GetText();
                 break;

Modified: openoffice/branches/l10n40/main/vcl/unx/generic/dtrans/X11_selection.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/unx/generic/dtrans/X11_selection.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/unx/generic/dtrans/X11_selection.cxx (original)
+++ openoffice/branches/l10n40/main/vcl/unx/generic/dtrans/X11_selection.cxx Sun Dec  1 11:40:24 2013
@@ -739,8 +739,8 @@ Atom SelectionManager::getAtom( const OU
 	::std::hash_map< OUString, Atom, OUStringHash >::const_iterator it;
 	if( ( it = m_aStringToAtom.find( rString ) ) == m_aStringToAtom.end() )
 	{
-        static Atom nNoDisplayAtoms = 1;
-		Atom aAtom = m_pDisplay ? XInternAtom( m_pDisplay, OUStringToOString( rString, RTL_TEXTENCODING_ISO_8859_1 ), False ) : nNoDisplayAtoms++;
+		static Atom nNoDisplayAtoms = 1;
+		Atom aAtom = m_pDisplay ? XInternAtom( m_pDisplay, OUStringToOString( rString, RTL_TEXTENCODING_ISO_8859_1).getStr(), False ) : nNoDisplayAtoms++;
 		m_aStringToAtom[ rString ] = aAtom;
 		m_aAtomToString[ aAtom ] = rString;
 	}

Modified: openoffice/branches/l10n40/main/vcl/unx/generic/gdi/salgdi3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/unx/generic/gdi/salgdi3.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/unx/generic/gdi/salgdi3.cxx (original)
+++ openoffice/branches/l10n40/main/vcl/unx/generic/gdi/salgdi3.cxx Sun Dec  1 11:40:24 2013
@@ -131,7 +131,7 @@ void PspKernInfo::Initialize() const
         return;
 
     // feed psprint's kerning list into a lookup-friendly container
-    maUnicodeKernPairs.resize( rKernPairs.size() );
+    maUnicodeKernPairs.rehash( rKernPairs.size() );
     PspKernPairs::const_iterator it = rKernPairs.begin();
     for(; it != rKernPairs.end(); ++it )
     {

Modified: openoffice/branches/l10n40/main/vcl/unx/generic/printer/cupsmgr.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/unx/generic/printer/cupsmgr.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/unx/generic/printer/cupsmgr.cxx (original)
+++ openoffice/branches/l10n40/main/vcl/unx/generic/printer/cupsmgr.cxx Sun Dec  1 11:40:24 2013
@@ -274,7 +274,7 @@ struct GetPPDAttribs
     {
         // This CUPS method is not at all thread-safe we need
         // to dup the pointer to a static buffer it returns ASAP
-        OString aResult = m_pFunction( m_aParameter );
+        OString aResult = m_pFunction( m_aParameter.getStr() );
         MutexGuard aGuard( *m_pSyncMutex );
         m_aResult = aResult;
         m_aCondition.set();
@@ -289,9 +289,7 @@ struct GetPPDAttribs
             )
         {
             #if OSL_DEBUG_LEVEL > 1
-            fprintf( stderr, "cupsGetPPD %s timed out\n",
-            (const sal_Char *) m_aParameter
-            );
+            fprintf( stderr, "cupsGetPPD %s timed out\n", m_aParameter.getStr() );
             #endif
         }
         m_pSyncMutex->acquire();

Modified: openoffice/branches/l10n40/main/vcl/unx/generic/printergfx/printerjob.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/unx/generic/printergfx/printerjob.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/unx/generic/printergfx/printerjob.cxx (original)
+++ openoffice/branches/l10n40/main/vcl/unx/generic/printergfx/printerjob.cxx Sun Dec  1 11:40:24 2013
@@ -361,7 +361,7 @@ getLocalTime(sal_Char* pBuffer)
 
 static bool isAscii( const rtl::OUString& rStr )
 {
-    const sal_Unicode* pStr = rStr;
+    const sal_Unicode* pStr = rStr.getStr();
     sal_Int32 nLen = rStr.getLength();
     for( sal_Int32 i = 0; i < nLen; i++ )
         if( pStr[i] > 127 )

Modified: openoffice/branches/l10n40/main/vcl/unx/generic/printergfx/psputil.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/unx/generic/printergfx/psputil.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/unx/generic/printergfx/psputil.cxx (original)
+++ openoffice/branches/l10n40/main/vcl/unx/generic/printergfx/psputil.cxx Sun Dec  1 11:40:24 2013
@@ -181,7 +181,7 @@ WritePS (osl::File* pFile, const rtl::OS
     sal_uInt64 nOutLength = 0;
     
     if (nInLength > 0 && pFile)
-        pFile->write (rString, nInLength, nOutLength);
+        pFile->write( rString.getStr(), nInLength, nOutLength);
 
     return nInLength == nOutLength;
 }

Modified: openoffice/branches/l10n40/main/vcl/unx/generic/printergfx/psputil.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/unx/generic/printergfx/psputil.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/unx/generic/printergfx/psputil.hxx (original)
+++ openoffice/branches/l10n40/main/vcl/unx/generic/printergfx/psputil.hxx Sun Dec  1 11:40:24 2013
@@ -45,6 +45,7 @@ sal_Int32   getAlignedHexValueOf (sal_In
 sal_Int32   getValueOf    (sal_Int32 nValue, sal_Char* pBuffer);
 sal_Int32   appendStr     (const sal_Char* pSrc, sal_Char* pDst);
 sal_Int32   appendStr     (const sal_Char* pSrc, sal_Char* pDst, sal_Int32 nBytes);
+inline sal_Int32 appendStr( const ::rtl::OString& rSrc, sal_Char* pDst) { return appendStr( rSrc.getStr(), pDst);}
 
 sal_Bool    WritePS (osl::File* pFile, const sal_Char* pString);
 sal_Bool    WritePS (osl::File* pFile, const sal_Char* pString, sal_uInt64 nInLength);

Modified: openoffice/branches/l10n40/main/vcl/unx/gtk/a11y/atkaction.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/unx/gtk/a11y/atkaction.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/unx/gtk/a11y/atkaction.cxx (original)
+++ openoffice/branches/l10n40/main/vcl/unx/gtk/a11y/atkaction.cxx Sun Dec  1 11:40:24 2013
@@ -49,7 +49,7 @@ getAsConst( const rtl::OString& rString 
     static int nIdx = 0;
     nIdx = (nIdx + 1) % nMax;
     aUgly[nIdx] = rString;
-    return aUgly[ nIdx ];
+    return aUgly[ nIdx ].getStr();
 }
 
 static accessibility::XAccessibleAction*

Modified: openoffice/branches/l10n40/main/vcl/unx/gtk/a11y/atkimage.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/unx/gtk/a11y/atkimage.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/unx/gtk/a11y/atkimage.cxx (original)
+++ openoffice/branches/l10n40/main/vcl/unx/gtk/a11y/atkimage.cxx Sun Dec  1 11:40:24 2013
@@ -41,7 +41,7 @@ getAsConst( rtl::OUString rString )
     static int nIdx = 0;
     nIdx = (nIdx + 1) % nMax;
     aUgly[nIdx] = rtl::OUStringToOString( rString, RTL_TEXTENCODING_UTF8 );
-    return aUgly[ nIdx ];
+    return aUgly[ nIdx ].getStr();
 }
 
 static accessibility::XAccessibleImage*

Modified: openoffice/branches/l10n40/main/vcl/unx/gtk/a11y/atktable.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/unx/gtk/a11y/atktable.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/unx/gtk/a11y/atktable.cxx (original)
+++ openoffice/branches/l10n40/main/vcl/unx/gtk/a11y/atktable.cxx Sun Dec  1 11:40:24 2013
@@ -58,7 +58,7 @@ getAsConst( rtl::OUString rString )
     static int nIdx = 0;
     nIdx = (nIdx + 1) % nMax;
     aUgly[nIdx] = rtl::OUStringToOString( rString, RTL_TEXTENCODING_UTF8 );
-    return aUgly[ nIdx ];
+    return aUgly[ nIdx ].getStr();
 }
 
 /*****************************************************************************/

Modified: openoffice/branches/l10n40/main/vcl/unx/gtk/a11y/atkwrapper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/unx/gtk/a11y/atkwrapper.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/unx/gtk/a11y/atkwrapper.cxx (original)
+++ openoffice/branches/l10n40/main/vcl/unx/gtk/a11y/atkwrapper.cxx Sun Dec  1 11:40:24 2013
@@ -784,7 +784,7 @@ ensureTypeFor( uno::XInterface *pAccessi
 //                 pAccessible, aTypeTable[i].name, bTypes[i] );
     }
 
-    GType nType = g_type_from_name( aTypeName );
+    GType nType = g_type_from_name( aTypeName.getStr() );
     if( nType == G_TYPE_INVALID )
     {
         GTypeInfo aTypeInfo = {
@@ -794,7 +794,7 @@ ensureTypeFor( uno::XInterface *pAccessi
             0, NULL, NULL
         } ;
         nType = g_type_register_static( ATK_TYPE_OBJECT_WRAPPER,
-                                        aTypeName, &aTypeInfo, (GTypeFlags)0 ) ;
+                                        aTypeName.getStr(), &aTypeInfo, (GTypeFlags)0 ) ;
 
         for( int j = 0; j < aTypeTableSize; j++ )
             if( bTypes[j] )

Modified: openoffice/branches/l10n40/main/vcl/unx/gtk/a11y/atkwrapper.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/unx/gtk/a11y/atkwrapper.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/unx/gtk/a11y/atkwrapper.hxx (original)
+++ openoffice/branches/l10n40/main/vcl/unx/gtk/a11y/atkwrapper.hxx Sun Dec  1 11:40:24 2013
@@ -113,7 +113,7 @@ static inline gchar *
 OUStringToGChar(const rtl::OUString& rString )
 {
     rtl::OString aUtf8 = rtl::OUStringToOString( rString, RTL_TEXTENCODING_UTF8 );
-    return g_strdup( aUtf8 );
+    return g_strdup( aUtf8.getStr() );
 }
 
 #define OUStringToConstGChar( string ) rtl::OUStringToOString( string, RTL_TEXTENCODING_UTF8 ).getStr() 

Modified: openoffice/branches/l10n40/main/vcl/unx/gtk/app/gtkdata.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/unx/gtk/app/gtkdata.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/unx/gtk/app/gtkdata.cxx (original)
+++ openoffice/branches/l10n40/main/vcl/unx/gtk/app/gtkdata.cxx Sun Dec  1 11:40:24 2013
@@ -638,7 +638,7 @@ void GtkXLib::Init()
     if( aAppName.getLength() > 0 )
     {
         rtl::OString aPrgName = rtl::OUStringToOString(aAppName, aEnc);
-        g_set_prgname(aPrgName);
+        g_set_prgname( aPrgName.getStr());
     }
     
     // init gtk/gdk

Modified: openoffice/branches/l10n40/main/vcl/unx/gtk/app/gtkinst.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/unx/gtk/app/gtkinst.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/unx/gtk/app/gtkinst.cxx (original)
+++ openoffice/branches/l10n40/main/vcl/unx/gtk/app/gtkinst.cxx Sun Dec  1 11:40:24 2013
@@ -231,7 +231,7 @@ void GtkInstance::AddToRecentDocumentLis
     }
 #if GTK_CHECK_VERSION(2,10,0)
     GtkRecentManager *manager = gtk_recent_manager_get_default ();
-    gtk_recent_manager_add_item (manager, sGtkURL);
+    gtk_recent_manager_add_item( manager, sGtkURL.getStr());
     (void)rMimeType;
 #else
     static getDefaultFnc sym_gtk_recent_manager_get_default =

Modified: openoffice/branches/l10n40/main/vcl/unx/gtk/window/gtkframe.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/unx/gtk/window/gtkframe.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/unx/gtk/window/gtkframe.cxx (original)
+++ openoffice/branches/l10n40/main/vcl/unx/gtk/window/gtkframe.cxx Sun Dec  1 11:40:24 2013
@@ -984,7 +984,7 @@ void GtkSalFrame::SetExtendedFrameStyle(
         }
         else
             gtk_window_set_wmclass( GTK_WINDOW(m_pWindow),
-                                    X11SalData::getFrameResName( m_nExtStyle ),
+                                    X11SalData::getFrameResName( m_nExtStyle).getStr(),
                                     X11SalData::getFrameClassName() );
     }
 }
@@ -3785,7 +3785,7 @@ gboolean GtkSalFrame::IMHandler::signalI
 		if (!sAllText.getLength())
             return sal_False;
 	rtl::OString sUTF = rtl::OUStringToOString(sAllText, RTL_TEXTENCODING_UTF8);
-	rtl::OUString sCursorText(sAllText, nPosition);
+	rtl::OUString sCursorText( sAllText.getStr(), nPosition);
 	gtk_im_context_set_surrounding(pContext, sUTF.getStr(), sUTF.getLength(), 
 		rtl::OUStringToOString(sCursorText, RTL_TEXTENCODING_UTF8).getLength());
 	return sal_True;

Modified: openoffice/branches/l10n40/main/vcl/unx/headless/svptext.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/unx/headless/svptext.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/unx/headless/svptext.cxx (original)
+++ openoffice/branches/l10n40/main/vcl/unx/headless/svptext.cxx Sun Dec  1 11:40:24 2013
@@ -189,7 +189,7 @@ void PspKernInfo::Initialize() const
         return;
 
     // feed psprint's kerning list into a lookup-friendly container
-    maUnicodeKernPairs.resize( rKernPairs.size() );
+    maUnicodeKernPairs.rehash( rKernPairs.size() );
     PspKernPairs::const_iterator it = rKernPairs.begin();
     for(; it != rKernPairs.end(); ++it )
     {

Modified: openoffice/branches/l10n40/main/vcl/win/source/window/salframe.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vcl/win/source/window/salframe.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vcl/win/source/window/salframe.cxx (original)
+++ openoffice/branches/l10n40/main/vcl/win/source/window/salframe.cxx Sun Dec  1 11:40:24 2013
@@ -92,7 +92,6 @@
 using ::std::max;
 #endif
 
-//IAccessibility2 Implementation 2009-----
 #ifdef WNT
 #include <oleacc.h>
 #include <com/sun/star/accessibility/XMSAAService.hpp>
@@ -101,7 +100,6 @@ using ::std::max;
 #endif
 #include <win/g_msaasvc.h>
 #endif
-//-----IAccessibility2 Implementation 2009
 #include <com/sun/star/uno/Exception.hdl>
 
 #include <time.h>
@@ -163,12 +161,10 @@ sal_Bool WinSalFrame::mbInReparent = FAL
 #define Uni_SupplementaryPlanesStart    0x10000
 
 // =======================================================================
-//IAccessibility2 Implementation 2009-----
 #ifdef WNT
 using namespace ::com::sun::star::accessibility;
 XMSAAService* g_acc_manager1 = NULL;
 #endif
-//-----IAccessibility2 Implementation 2009
 static void UpdateFrameGeometry( HWND hWnd, WinSalFrame* pFrame );
 static void SetMaximizedFrameGeometry( HWND hWnd, WinSalFrame* pFrame, RECT* pParentRect = NULL );
 
@@ -6194,7 +6190,6 @@ LRESULT CALLBACK SalFrameWndProc( HWND h
             ImplHandleIMENotify( hWnd, wParam );
             break;
 
-//IAccessibility2 implementation 2009-----
 #ifdef WNT
 		case WM_GETOBJECT:
 			{
@@ -6247,7 +6242,6 @@ LRESULT CALLBACK SalFrameWndProc( HWND h
 				break;
 			}
 #endif			
-//-----IAccessibility2 implementation 2009
 
         case WM_APPCOMMAND:
             if( ImplHandleAppCommand( hWnd, lParam ) )
@@ -6469,7 +6463,6 @@ sal_Bool ImplWriteLastError( DWORD lastE
 
 // -----------------------------------------------------------------------
 
-//IAccessibility2 implementation 2009-----
 #ifdef WNT
 bool IsWNTInitAccessBridge()
 {
@@ -6490,4 +6483,3 @@ bool WNTEnableAccessInterface(bool bEnab
 	return bPreVal;
 }
 #endif
-//-----IAccessibility2 implementation 2009

Modified: openoffice/branches/l10n40/main/vos/source/module.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/vos/source/module.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/vos/source/module.cxx (original)
+++ openoffice/branches/l10n40/main/vos/source/module.cxx Sun Dec  1 11:40:24 2013
@@ -39,7 +39,7 @@ OModule::OModule()
 						
 OModule::OModule(const rtl::OUString& ustrModuleName, sal_Int32 nRtldMode) : m_Module(0)
 {
-    if (ustrModuleName)
+    if( !ustrModuleName.isEmpty())
         load(ustrModuleName, nRtldMode);
 }
 
@@ -51,7 +51,7 @@ OModule::~OModule()
 
 sal_Bool OModule::load(const rtl::OUString& ustrModuleName, sal_Int32 nRtldMode)
 {
-    VOS_ASSERT(ustrModuleName);
+    VOS_ASSERT( !ustrModuleName.isEmpty());
     
     unload();
     
@@ -76,7 +76,7 @@ sal_Bool OModule::isLoaded()
 
 void *OModule::getSymbol(const rtl::OUString& strSymbolName)
 {
-    VOS_ASSERT(strSymbolName);
+    VOS_ASSERT( !strSymbolName.isEmpty());
     VOS_ASSERT(m_Module);
 	return ( osl_getSymbol( m_Module, strSymbolName.pData ) );
 }

Modified: openoffice/branches/l10n40/main/winaccessibility/inc/AccContainerEventListener.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/winaccessibility/inc/AccContainerEventListener.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/winaccessibility/inc/AccContainerEventListener.hxx (original)
+++ openoffice/branches/l10n40/main/winaccessibility/inc/AccContainerEventListener.hxx Sun Dec  1 11:40:24 2013
@@ -89,10 +89,8 @@ public:
 
     virtual void handleSectionChangedEvent (const Any &oldValue, const Any &newValue);
     virtual void handleColumnChangedEvent (const Any &oldValue, const Any &newValue);
-	//IAccessibility2 Implementation 2009-----
 	//for name changed event
     virtual void SAL_CALL handleNameChangedEvent(Any name);
-	//-----IAccessibility2 Implementation 2009
 };
 
 #endif

Modified: openoffice/branches/l10n40/main/winaccessibility/source/service/AccComponentEventListener.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/winaccessibility/source/service/AccComponentEventListener.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/winaccessibility/source/service/AccComponentEventListener.cxx (original)
+++ openoffice/branches/l10n40/main/winaccessibility/source/service/AccComponentEventListener.cxx Sun Dec  1 11:40:24 2013
@@ -191,8 +191,8 @@ void AccComponentEventListener::setCompo
             pAgent->UpdateState(pAccessible);
             pAgent->DecreaseState( pAccessible, AccessibleStateType::DEFUNC);
             // 8. label should have no FOCUSABLE state state, Firefox has READONLY state, we can also have.
-			if( getRole() != AccessibleRole::LABEL
-				&& getRole() != AccessibleRole::SCROLL_BAR) //IAccessibility2 Implementation 2009
+            if( getRole() != AccessibleRole::LABEL
+            && getRole() != AccessibleRole::SCROLL_BAR)
                 pAgent->IncreaseState( pAccessible, AccessibleStateType::FOCUSABLE);
         }
         else

Modified: openoffice/branches/l10n40/main/winaccessibility/source/service/AccContainerEventListener.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/winaccessibility/source/service/AccContainerEventListener.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/winaccessibility/source/service/AccContainerEventListener.cxx (original)
+++ openoffice/branches/l10n40/main/winaccessibility/source/service/AccContainerEventListener.cxx Sun Dec  1 11:40:24 2013
@@ -548,7 +548,6 @@ void AccContainerEventListener::handleCo
     pAgent->NotifyAccEvent(UM_EVENT_COLUMN_CHANGED, pAccessible);
 }
 
-//IAccessibility2 Implementation 2009-----
 void  AccContainerEventListener::handleNameChangedEvent( Any name )
 {
 	if (getRole() == AccessibleRole::COMBO_BOX)
@@ -570,4 +569,3 @@ void  AccContainerEventListener::handleN
 	}
 	AccEventListener::handleNameChangedEvent(name);
 }
-//-----IAccessibility2 Implementation 2009

Modified: openoffice/branches/l10n40/main/winaccessibility/source/service/AccObject.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/winaccessibility/source/service/AccObject.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/winaccessibility/source/service/AccObject.cxx (original)
+++ openoffice/branches/l10n40/main/winaccessibility/source/service/AccObject.cxx Sun Dec  1 11:40:24 2013
@@ -182,13 +182,11 @@ void  AccObject::UpdateName( )
 
     if( ( TEXT_FRAME == m_accRole   ) && ( m_pParentObj !=NULL )&& ( SCROLL_PANE == m_pParentObj -> m_accRole ) )
         m_pIMAcc->Put_XAccName( m_pParentObj->m_xAccContextRef->getAccessibleName().getStr() );
-	//IAccessibility2 Implementation 2009-----
     if ( PARAGRAPH == m_accRole)
     {
     	::rtl::OUString emptyStr = ::rtl::OUString::createFromAscii("");
     	m_pIMAcc->Put_XAccName(emptyStr.getStr());
     }
-	//-----IAccessibility2 Implementation 2009
     else
         m_pIMAcc->Put_XAccName(m_xAccContextRef->getAccessibleName().getStr());
 
@@ -314,7 +312,6 @@ void  AccObject::SetValue( Any pAny )
         m_pIMAcc->Put_XAccValue( val.getStr() );
         break;
     case TREE_ITEM:
-	//IAccessibility2 Implementation 2009-----
     //case CHECK_BOX:	//Commented by Li Xing to disable the value for general checkbox
     case COMBO_BOX:
     case TABLE_CELL:
@@ -326,7 +323,6 @@ void  AccObject::SetValue( Any pAny )
 	case CHECK_BOX:
 		if( ( m_pParentObj !=NULL ) && (TREE == m_pParentObj->m_accRole || TREE_ITEM == m_pParentObj->m_accRole ))
 	        m_pIMAcc->Put_XAccValue( GetMAccessibleValueFromAny(pAny).getStr() );
-	//-----IAccessibility2 Implementation 2009
 		break;
     default:
         break;

Modified: openoffice/branches/l10n40/main/writerfilter/source/dmapper/PropertyMap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/writerfilter/source/dmapper/PropertyMap.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/writerfilter/source/dmapper/PropertyMap.cxx (original)
+++ openoffice/branches/l10n40/main/writerfilter/source/dmapper/PropertyMap.cxx Sun Dec  1 11:40:24 2013
@@ -363,7 +363,7 @@ void  SectionPropertyMap::SetPageStyleNa
     for( sal_Int32 nStyle = 0; nStyle < rPageStyleNames.getLength(); ++nStyle)
     {
         if( pStyleNames[nStyle].getLength() > nDefaultLength &&
-                !rtl_ustr_compare_WithLength( sDefaultStyle, nDefaultLength, pStyleNames[nStyle], nDefaultLength))
+                !rtl_ustr_compare_WithLength( sDefaultStyle.getStr(), nDefaultLength, pStyleNames[nStyle].getStr(), nDefaultLength))
         {
             sal_Int32 nIndex = pStyleNames[nStyle].copy( nDefaultLength ).toInt32();
             if( nIndex > nMaxIndex)

Modified: openoffice/branches/l10n40/main/xmloff/source/core/DocumentSettingsContext.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/xmloff/source/core/DocumentSettingsContext.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/xmloff/source/core/DocumentSettingsContext.cxx (original)
+++ openoffice/branches/l10n40/main/xmloff/source/core/DocumentSettingsContext.cxx Sun Dec  1 11:40:24 2013
@@ -600,7 +600,7 @@ void XMLConfigItemContext::Characters( c
 		if( sTrimmedChars.getLength() )
 		{
 			rtl::OUString sChars;
-			if( msValue )
+			if( !msValue.isEmpty() )
 			{
 				sChars = msValue;
 				sChars += sTrimmedChars;

Modified: openoffice/branches/l10n40/main/xmloff/source/core/XMLBase64ImportContext.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/xmloff/source/core/XMLBase64ImportContext.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/xmloff/source/core/XMLBase64ImportContext.cxx (original)
+++ openoffice/branches/l10n40/main/xmloff/source/core/XMLBase64ImportContext.cxx Sun Dec  1 11:40:24 2013
@@ -65,7 +65,7 @@ void XMLBase64ImportContext::Characters(
 	if( sTrimmedChars.getLength() )
 	{
 		OUString sChars;
-		if( sBase64CharsLeft )
+		if( !sBase64CharsLeft.isEmpty() )
 		{
 			sChars = sBase64CharsLeft;
 			sChars += sTrimmedChars;

Modified: openoffice/branches/l10n40/main/xmloff/source/draw/ximpstyl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/xmloff/source/draw/ximpstyl.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/xmloff/source/draw/ximpstyl.cxx (original)
+++ openoffice/branches/l10n40/main/xmloff/source/draw/ximpstyl.cxx Sun Dec  1 11:40:24 2013
@@ -1306,7 +1306,7 @@ void SdXMLStylesContext::EndElement()
 //
 void SdXMLStylesContext::SetMasterPageStyles(SdXMLMasterPageContext& rMaster) const
 {
-	UniString sPrefix(rMaster.GetDisplayName(), (sal_uInt16)rMaster.GetDisplayName().getLength());
+	UniString sPrefix( rMaster.GetDisplayName());
 	sPrefix += sal_Unicode('-');
 
 	if(GetSdImport().GetLocalDocStyleFamilies().is() && GetSdImport().GetLocalDocStyleFamilies()->hasByName(rMaster.GetDisplayName())) try

Modified: openoffice/branches/l10n40/main/xmloff/source/text/XMLTextFrameContext.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/xmloff/source/text/XMLTextFrameContext.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/xmloff/source/text/XMLTextFrameContext.cxx (original)
+++ openoffice/branches/l10n40/main/xmloff/source/text/XMLTextFrameContext.cxx Sun Dec  1 11:40:24 2013
@@ -1247,7 +1247,7 @@ void XMLTextFrameContext_Impl::Character
 			if( bOwnBase64Stream && xBase64Stream.is() )
 			{
 				OUString sChars;
-				if( sBase64CharsLeft )
+				if( !sBase64CharsLeft.isEmpty() )
 				{
 					sChars = sBase64CharsLeft;
 					sChars += sTrimmedChars;

Modified: openoffice/branches/l10n40/main/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx (original)
+++ openoffice/branches/l10n40/main/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx Sun Dec  1 11:40:24 2013
@@ -62,7 +62,7 @@ cssu::Reference< cssxc::XXMLSecurityCont
 	//Initialize the crypto engine
 	if( sCertDB.getLength() > 0 ) 
 	{
-		rtl::OString sCertDir(sCertDB, sCertDB.getLength(), RTL_TEXTENCODING_ASCII_US);
+		rtl::OString sCertDir( OUStringToOString( sCertDB, RTL_TEXTENCODING_ASCII_US));
 		n_pCertStore = sCertDir.getStr();
 		n_hStoreHandle = CertOpenSystemStore( NULL, n_pCertStore ) ;
 		if( n_hStoreHandle == NULL ) 



Mime
View raw message