You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ja...@apache.org on 2013/11/20 01:50:01 UTC

svn commit: r1543679 [3/32] - in /openoffice/branches/capstone2013: ./ main/ main/accessibility/inc/accessibility/extended/ main/accessibility/inc/accessibility/helper/ main/accessibility/inc/accessibility/standard/ main/accessibility/source/extended/ ...

Modified: openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessiblebox.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessiblebox.cxx?rev=1543679&r1=1543678&r2=1543679&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessiblebox.cxx (original)
+++ openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessiblebox.cxx Wed Nov 20 00:49:46 2013
@@ -116,11 +116,98 @@ void VCLXAccessibleBox::ProcessWindowEve
 {
 	switch ( rVclWindowEvent.GetId() )
 	{
+		case VCLEVENT_LISTBOX_SELECT:
+		case VCLEVENT_LISTBOX_FOCUSITEMCHANGED:
+
+		{
+	            // Forward the call to the list child.
+	            VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get());
+	            if ( pList == NULL )
+			{
+				getAccessibleChild ( m_bHasTextChild ? 1 : 0 );
+				pList = static_cast<VCLXAccessibleList*>(m_xList.get());
+			}
+			if ( pList != NULL )
+			{
+				pList->ProcessWindowEvent (rVclWindowEvent, m_bIsDropDownBox);
+				if(m_bIsDropDownBox)
+				{
+					NotifyAccessibleEvent(AccessibleEventId::VALUE_CHANGED, Any(), Any());
+					Any aOldValue;
+					Any aNewValue;
+					aOldValue <<= AccessibleStateType::INDETERMINATE;
+					NotifyAccessibleEvent(AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue);
+
+				}
+			}
+			break;
+		}	
 		case VCLEVENT_DROPDOWN_OPEN:
+		{
+	             VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get());
+	             if ( pList == NULL )
+			{
+				getAccessibleChild ( m_bHasTextChild ? 1 : 0 );
+				pList = static_cast<VCLXAccessibleList*>(m_xList.get());
+			}
+			if ( pList != NULL )
+			{
+				pList->ProcessWindowEvent (rVclWindowEvent);
+				pList->HandleDropOpen();
+			}
+			break;
+		}
 		case VCLEVENT_DROPDOWN_CLOSE:
+		{
+	             VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get());
+	             if ( pList == NULL )
+			{
+				getAccessibleChild ( m_bHasTextChild ? 1 : 0 );
+				pList = static_cast<VCLXAccessibleList*>(m_xList.get());
+			}
+			if ( pList != NULL )
+			{
+				pList->ProcessWindowEvent (rVclWindowEvent);
+			}
+			Window* pWindow = GetWindow();
+			if( pWindow && (pWindow->HasFocus() || pWindow->HasChildPathFocus()) )
+			{
+				Any aOldValue, aNewValue;
+				aNewValue <<= AccessibleStateType::FOCUSED;
+				NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );	
+			}
+			break;
+		}
+		case VCLEVENT_COMBOBOX_SELECT:
+		{
+	             VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get());
+	             if (pList != NULL)
+	             {
+		                Reference<XAccessibleText> xText (m_xText->getAccessibleContext(), UNO_QUERY);
+		                if ( xText.is() )
+				{
+					::rtl::OUString sText = xText->getSelectedText();
+					if ( !sText.getLength() )
+						sText = xText->getText();
+		                    pList->UpdateSelection_Acc (sText, m_bIsDropDownBox);
+					//if(m_bIsDropDownBox && !pList->IsInDropDown())
+					if (m_bIsDropDownBox || ( !m_bIsDropDownBox && m_aBoxType==COMBOBOX))
+						NotifyAccessibleEvent(AccessibleEventId::VALUE_CHANGED, Any(), Any());
+
+						Any aOldValue;
+						Any aNewValue;
+						aOldValue <<= AccessibleStateType::INDETERMINATE;
+						NotifyAccessibleEvent(AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue);
+
+				}
+	            	}			
+			break;
+		}
+		//case VCLEVENT_DROPDOWN_OPEN:
+		//case VCLEVENT_DROPDOWN_CLOSE:
 		case VCLEVENT_LISTBOX_DOUBLECLICK:
 		case VCLEVENT_LISTBOX_SCROLLED:
-		case VCLEVENT_LISTBOX_SELECT:
+		//case VCLEVENT_LISTBOX_SELECT:
         case VCLEVENT_LISTBOX_ITEMADDED:
         case VCLEVENT_LISTBOX_ITEMREMOVED:
         case VCLEVENT_COMBOBOX_ITEMADDED:
@@ -139,7 +226,7 @@ void VCLXAccessibleBox::ProcessWindowEve
             break;
         }
 
-		case VCLEVENT_COMBOBOX_SELECT:
+		//case VCLEVENT_COMBOBOX_SELECT:
         case VCLEVENT_COMBOBOX_DESELECT:
         {
             // Selection is handled by VCLXAccessibleList which operates on
@@ -163,6 +250,7 @@ void VCLXAccessibleBox::ProcessWindowEve
 
 		case VCLEVENT_EDIT_MODIFY:
         case VCLEVENT_EDIT_SELECTIONCHANGED:
+	 // case VCLEVENT_EDIT_CARETCHANGED:
             // Modify/Selection events are handled by the combo box instead of
             // directly by the edit field (Why?).  Therefore, delegate this
             // call to the edit field.
@@ -177,7 +265,30 @@ void VCLXAccessibleBox::ProcessWindowEve
                 }
             }
             break;
-
+		/*
+		// MT: Not sending VCLEVENT_LISTBOX_STATEUPDATE, see comment in ListBox::SelectEntryPos
+		case VCLEVENT_LISTBOX_STATEUPDATE:
+		{
+			// Need to update the INDETERMINATE state sometimes
+			if (m_bIsDropDownBox && m_aBoxType==LISTBOX)
+			{
+				sal_Int32 nSelectedEntryCount = 0;
+				ListBox* pListBox = static_cast< ListBox* >( GetWindow() );
+				if (pListBox != NULL && pListBox->GetEntryCount() > 0)
+				{
+	        		nSelectedEntryCount = pListBox->GetSelectEntryCount();
+					Any aOldValue;
+					Any aNewValue;
+					if ( nSelectedEntryCount == 0)
+						aNewValue <<= AccessibleStateType::INDETERMINATE;
+					else
+						aOldValue <<= AccessibleStateType::INDETERMINATE;
+					NotifyAccessibleEvent(AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue);
+				}
+			}
+			break;
+		}
+		*/
 		default:
 			VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent );
 	}
@@ -256,7 +367,11 @@ Reference<XAccessible> SAL_CALL VCLXAcce
                 {
                     ComboBox* pComboBox = static_cast<ComboBox*>(GetWindow());
                     if (pComboBox!=NULL && pComboBox->GetSubEdit()!=NULL)
+					//Set the edit's acc name the same as parent
+					{
+						pComboBox->GetSubEdit()->SetAccessibleName(getAccessibleName());
                         m_xText = pComboBox->GetSubEdit()->GetAccessible();
+					}
                 }
                 else if (m_bIsDropDownBox)
                     m_xText = new VCLXAccessibleTextField (GetVCLXWindow(),this);
@@ -275,7 +390,11 @@ sal_Int16 SAL_CALL VCLXAccessibleBox::ge
     // Return the role <const>COMBO_BOX</const> for both VCL combo boxes and
     // VCL list boxes in DropDown-Mode else <const>PANEL</const>.
 	// This way the Java bridge has not to handle both independently.
-    return m_bIsDropDownBox ? AccessibleRole::COMBO_BOX : AccessibleRole::PANEL;
+    //return m_bIsDropDownBox ? AccessibleRole::COMBO_BOX : AccessibleRole::PANEL;
+	if (m_bIsDropDownBox || (!m_bIsDropDownBox && m_aBoxType == COMBOBOX ))
+		return AccessibleRole::COMBO_BOX;
+	else
+		return AccessibleRole::PANEL;
 }
 
 sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleIndexInParent (void)
@@ -296,7 +415,7 @@ sal_Int32 SAL_CALL VCLXAccessibleBox::ge
 
     // There is one action for drop down boxes (toggle popup) and none for
     // the other boxes.
-	return m_bIsDropDownBox ? 1 : 0;
+	return m_bIsDropDownBox ? 0 : 1;
 }
 
 sal_Bool SAL_CALL VCLXAccessibleBox::doAccessibleAction (sal_Int32 nIndex)
@@ -343,7 +462,11 @@ sal_Bool SAL_CALL VCLXAccessibleBox::doA
 	::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
     if (nIndex<0 || nIndex>=getAccessibleActionCount())
         throw ::com::sun::star::lang::IndexOutOfBoundsException();
-	return TK_RES_STRING( RID_STR_ACC_ACTION_TOGGLEPOPUP);
+	//Solution:When combo_box,it should not has action information.
+    //return TK_RES_STRING( RID_STR_ACC_ACTION_TOGGLEPOPUP);
+	if (m_aBoxType == LISTBOX)
+		return ::rtl::OUString();
+	return m_bIsDropDownBox?::rtl::OUString():TK_RES_STRING( RID_STR_ACC_ACTION_TOGGLEPOPUP);
 }
 
 Reference< XAccessibleKeyBinding > VCLXAccessibleBox::getAccessibleActionKeyBinding( sal_Int32 nIndex )
@@ -367,3 +490,102 @@ void SAL_CALL VCLXAccessibleBox::disposi
 	VCLXAccessibleComponent::disposing();
 }
 
+// =====  XAccessibleValue  ===============================================
+Any VCLXAccessibleBox::getCurrentValue( )
+    throw( RuntimeException )
+{
+	vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+	::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+
+	Any aAny;
+	if( m_xList.is() && m_xText.is())
+	{
+		// VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get());
+		Reference<XAccessibleText> xText (m_xText->getAccessibleContext(), UNO_QUERY);
+		if ( xText.is() )
+		{
+			::rtl::OUString sText = xText->getText();
+			aAny <<= sText;
+		}
+	}
+	if (m_aBoxType == LISTBOX && m_bIsDropDownBox  && m_xList.is() )
+	{
+
+		VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get());
+		if(pList->IsInDropDown())
+		{
+			if(pList->getSelectedAccessibleChildCount()>0)
+			{
+				Reference<XAccessibleContext> xName (pList->getSelectedAccessibleChild((sal_Int32)(0)), UNO_QUERY);
+				if(xName.is())
+				{
+					aAny <<= xName->getAccessibleName();
+				}
+			}
+		}
+	}
+	 
+    return aAny;
+}
+
+sal_Bool VCLXAccessibleBox::setCurrentValue( const Any& aNumber ) 
+    throw( RuntimeException )
+{
+	vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+	::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+	
+    ::rtl::OUString  fValue;
+    sal_Bool bValid = (aNumber >>= fValue);
+    if( bValid )
+    {
+
+    }
+    return bValid;
+
+}
+
+Any VCLXAccessibleBox::getMaximumValue( ) 
+    throw( RuntimeException )
+{
+    Any aAny;
+    return aAny;
+}
+
+Any VCLXAccessibleBox::getMinimumValue(  ) 
+    throw( RuntimeException )
+{
+    Any aAny;
+    return aAny;
+}
+
+// Set the INDETERMINATE state when there is no selected item for combobox
+void VCLXAccessibleBox::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
+{
+	VCLXAccessibleComponent::FillAccessibleStateSet(rStateSet);
+	if (m_aBoxType == COMBOBOX )
+	{
+		::rtl::OUString sText;
+		sal_Int32 nEntryCount = 0;
+		ComboBox* pComboBox = static_cast<ComboBox*>(GetWindow());
+		if (pComboBox != NULL)
+		{
+			Edit* pSubEdit = pComboBox->GetSubEdit();
+			if ( pSubEdit)
+				sText = pSubEdit->GetText();
+			nEntryCount = pComboBox->GetEntryCount();
+		}
+		if (sText.getLength() == 0 && nEntryCount >0)
+			rStateSet.AddState(AccessibleStateType::INDETERMINATE);
+	}
+	else if (m_aBoxType == LISTBOX && m_bIsDropDownBox == true)
+	{
+		sal_Int32 nSelectedEntryCount = 0;
+		ListBox* pListBox = static_cast< ListBox* >( GetWindow() );
+		if (pListBox != NULL && pListBox->GetEntryCount() > 0)
+		{
+	        	nSelectedEntryCount = pListBox->GetSelectEntryCount();
+			if ( nSelectedEntryCount == 0)
+				rStateSet.AddState(AccessibleStateType::INDETERMINATE);
+		}
+	}
+}

Modified: openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessiblebutton.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessiblebutton.cxx?rev=1543679&r1=1543678&r2=1543679&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessiblebutton.cxx (original)
+++ openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessiblebutton.cxx Wed Nov 20 00:49:46 2013
@@ -103,6 +103,16 @@ void VCLXAccessibleButton::FillAccessibl
 
 		if ( pButton->IsPressed() )
             rStateSet.AddState( AccessibleStateType::PRESSED );
+
+        // IA2 CWS: If the button has a poppup menu,it should has the state EXPANDABLE
+        if( pButton->GetType() == WINDOW_MENUBUTTON )
+        {
+        	rStateSet.AddState( AccessibleStateType::EXPANDABLE );	
+        }
+		if( pButton->GetStyle() & WB_DEFBUTTON )
+		{
+			rStateSet.AddState( AccessibleStateType::DEFAULT );	
+		}
 	}
 }
 
@@ -145,6 +155,13 @@ Sequence< ::rtl::OUString > VCLXAccessib
 	OExternalLockGuard aGuard( this );
 
 	::rtl::OUString aName( VCLXAccessibleTextComponent::getAccessibleName() );
+
+	// IA2 CWS: Removed special handling for browse/more buttons. 
+	//          Comment was "the '...' or '<<' or '>>' should be kepted per the requirements from AT"
+	// MT: We did introduce this special handling by intention. 
+	//     As the original text is still what you get via XAccessibleText,
+	//     I think for the accessible name the stuff below is correct.
+
 	sal_Int32 nLength = aName.getLength();
 
 	if ( nLength >= 3 && aName.matchAsciiL( RTL_CONSTASCII_STRINGPARAM("..."), nLength - 3 ) )

Modified: openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessiblecheckbox.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessiblecheckbox.cxx?rev=1543679&r1=1543678&r2=1543679&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessiblecheckbox.cxx (original)
+++ openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessiblecheckbox.cxx Wed Nov 20 00:49:46 2013
@@ -238,7 +238,13 @@ sal_Bool VCLXAccessibleCheckBox::doAcces
 	if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
         throw IndexOutOfBoundsException();
 
-	return ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_CLICK ) );
+	//IAccessibility2 Implementation 2009-----
+	//	return ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_CLICK ) );
+	//-----IAccessibility2 Implementation 2009
+	if(IsChecked())
+		return ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_UNCHECK ) );
+	else
+		return ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_CHECK ) );
 }
 
 // -----------------------------------------------------------------------------

Modified: openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessiblelist.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessiblelist.cxx?rev=1543679&r1=1543678&r2=1543679&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessiblelist.cxx (original)
+++ openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessiblelist.cxx Wed Nov 20 00:49:46 2013
@@ -36,6 +36,12 @@
 #include <vcl/lstbox.hxx>
 #include <toolkit/helper/convert.hxx>
 
+#ifndef _UTL_ACCESSIBLERELATIONSETHELPER_HXX_
+#include <unotools/accessiblerelationsethelper.hxx>
+#endif
+#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLERELATIONTYPE_HPP_
+#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
+#endif
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -65,6 +71,7 @@ VCLXAccessibleList::VCLXAccessibleList (
 	  m_nLastSelectedPos		( LISTBOX_ENTRY_NOTFOUND ),
 	  m_bDisableProcessEvent	( false ),
 	  m_bVisible				( true ),
+	m_nCurSelectedPos		( LISTBOX_ENTRY_NOTFOUND ),
       m_xParent                 ( _xParent )
 {
     // Because combo boxes and list boxes have the no common interface for
@@ -89,6 +96,7 @@ VCLXAccessibleList::VCLXAccessibleList (
         }
     }
     UpdateVisibleLineCount();
+	m_nCurSelectedPos=m_pListBoxHelper->GetSelectEntryPos();
 
 	sal_uInt16 nCount = static_cast<sal_uInt16>(getAccessibleChildCount());
 	m_aAccessibleChildren.reserve(nCount);
@@ -188,6 +196,218 @@ void VCLXAccessibleList::notifyVisibleSt
 	}
 }
 // -----------------------------------------------------------------------------
+void VCLXAccessibleList::UpdateSelection_Acc (::rtl::OUString sTextOfSelectedItem, bool b_IsDropDownList)
+{
+    if ( m_aBoxType == COMBOBOX )
+    {
+        ComboBox* pBox = static_cast<ComboBox*>(GetWindow());
+        if ( pBox != NULL )
+        {
+		// Find the index of the selected item inside the VCL control...
+		sal_uInt16 nIndex = pBox->GetEntryPos (XubString(sTextOfSelectedItem));
+		// ...and then find the associated accessibility object.
+		if ( nIndex == LISTBOX_ENTRY_NOTFOUND )
+			nIndex = 0;
+		UpdateSelection_Impl_Acc(b_IsDropDownList);
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+void VCLXAccessibleList::UpdateSelection_Impl_Acc(bool b_IsDropDownList)
+{
+	uno::Any aOldValue, aNewValue;
+	VCLXAccessibleListItem* pCurItem =NULL;
+	
+	{
+		vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+		::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+	    	Reference< XAccessible > xNewAcc;
+		if ( m_pListBoxHelper )
+		{
+			sal_uInt16 i=0;
+			m_nCurSelectedPos = LISTBOX_ENTRY_NOTFOUND;
+			for ( ListItems::iterator aIter = m_aAccessibleChildren.begin();
+				  aIter != m_aAccessibleChildren.end(); ++aIter,++i)
+			{
+				Reference< XAccessible > xHold = *aIter;
+				if ( xHold.is() )
+				{
+					VCLXAccessibleListItem* pItem = static_cast< VCLXAccessibleListItem* >( xHold.get() );
+					// Retrieve the item's index from the list entry.
+					sal_Bool bNowSelected = m_pListBoxHelper->IsEntryPosSelected (i);
+					if (bNowSelected)
+						m_nCurSelectedPos = i;
+						
+					if ( bNowSelected && !pItem->IsSelected() )
+					{
+						xNewAcc = *aIter;
+						aNewValue <<= xNewAcc;
+
+						pCurItem = pItem;
+
+					}
+					else if ( pItem->IsSelected() )
+						m_nLastSelectedPos = i;
+
+					pItem->SetSelected( bNowSelected );
+				}
+				else
+				{ // it could happen that a child was not created before
+					checkEntrySelected(i,aNewValue,xNewAcc);
+				}
+			}
+			sal_uInt16 nCount = m_pListBoxHelper->GetEntryCount();
+			if ( i < nCount ) // here we have to check the if any other listbox entry is selected
+			{
+				for (; i < nCount && !checkEntrySelected(i,aNewValue,xNewAcc) ;++i )
+					;
+			}
+			if ( xNewAcc.is() && GetWindow()->HasFocus() )
+			{
+				if ( m_nLastSelectedPos != LISTBOX_ENTRY_NOTFOUND )
+					aOldValue <<= getAccessibleChild( (sal_Int32)m_nLastSelectedPos );
+				aNewValue <<= xNewAcc;
+			}
+		}
+	}
+	if (m_aBoxType == COMBOBOX && b_IsDropDownList)
+	{
+		//VCLXAccessibleDropDownComboBox
+		//when in list is dropped down, xText = NULL
+		if (m_pListBoxHelper->IsInDropDown())
+		{
+			if ( aNewValue.hasValue() || aOldValue.hasValue() )
+			{
+				NotifyAccessibleEvent(
+					AccessibleEventId::ACTIVE_DESCENDANT_CHANGED,
+					aOldValue,
+					aNewValue );
+
+				NotifyListItem(aNewValue);
+
+			}
+		}
+	}
+	else if (m_aBoxType == COMBOBOX && !b_IsDropDownList)
+	{
+		//VCLXAccessibleComboBox
+		NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, uno::Any(), uno::Any() );
+	}
+	else if (m_aBoxType == LISTBOX && b_IsDropDownList)
+	{
+		//VCLXAccessibleDropdownListBox
+		//when in list is dropped down, xText = NULL
+		if (m_pListBoxHelper->IsInDropDown())
+		{
+			if ( aNewValue.hasValue() || aOldValue.hasValue() )
+			{
+				NotifyAccessibleEvent(
+					AccessibleEventId::ACTIVE_DESCENDANT_CHANGED,
+					aOldValue,
+					aNewValue );
+				
+				NotifyListItem(aNewValue);
+			}
+		}
+	}
+	else if (m_aBoxType == LISTBOX && !b_IsDropDownList)
+	{
+		//VCLXAccessibleListBox, xText = NULL. 
+
+
+		if ( aNewValue.hasValue())
+		{
+			NotifyListItem(aNewValue);		
+		}
+	}
+}
+void VCLXAccessibleList::NotifyListItem(::com::sun::star::uno::Any& val)
+{
+	Reference< XAccessible > xCurItem;
+	val >>= xCurItem;
+	if (xCurItem.is())
+	{
+		VCLXAccessibleListItem* pCurItem = static_cast< VCLXAccessibleListItem* >(xCurItem.get());
+		if (pCurItem)
+		{
+			pCurItem->NotifyAccessibleEvent(AccessibleEventId::SELECTION_CHANGED,Any(),Any());
+		}
+	}				
+}
+
+
+void VCLXAccessibleList::UpdateFocus_Impl_Acc (sal_uInt16 nPos ,bool b_IsDropDownList)
+{	
+	if (!(m_aBoxType == LISTBOX && !b_IsDropDownList))
+	{
+		return ;
+	}
+    Reference<XAccessible> xChild= CreateChild(nPos);
+	if ( !xChild.is() )
+	{
+		return ;
+	}
+	m_nCurSelectedPos = nPos;
+	uno::Any aOldValue, aNewValue;
+	aNewValue <<= xChild;
+	
+	NotifyAccessibleEvent(
+			AccessibleEventId::ACTIVE_DESCENDANT_CHANGED,
+			aOldValue,
+			aNewValue );
+}
+
+// -----------------------------------------------------------------------------
+void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent,  bool b_IsDropDownList)
+{
+	switch ( rVclWindowEvent.GetId() )
+      {
+		case VCLEVENT_LISTBOX_SELECT:
+			if ( !m_bDisableProcessEvent )
+				UpdateSelection_Impl_Acc(b_IsDropDownList);
+			break;
+		case VCLEVENT_LISTBOX_FOCUSITEMCHANGED:
+			if ( !m_bDisableProcessEvent )
+				UpdateFocus_Impl_Acc((sal_uInt16)reinterpret_cast<sal_uIntPtr>(rVclWindowEvent.GetData()),b_IsDropDownList);
+			break;
+		case VCLEVENT_WINDOW_GETFOCUS:
+			break;
+		case VCLEVENT_CONTROL_GETFOCUS:
+			{
+				VCLXAccessibleComponent::ProcessWindowEvent (rVclWindowEvent);
+				if (m_aBoxType == COMBOBOX && b_IsDropDownList)
+				{
+					//VCLXAccessibleDropDownComboBox				
+				}
+				else if (m_aBoxType == LISTBOX && b_IsDropDownList)
+				{
+				}
+				else if ( m_aBoxType == LISTBOX && !b_IsDropDownList)
+				{
+					if ( m_pListBoxHelper )
+					{
+						uno::Any	aOldValue, 
+									aNewValue;
+						sal_uInt16 nPos = m_nCurSelectedPos; //m_pListBoxHelper->GetSelectEntryPos();
+
+						if ( nPos == LISTBOX_ENTRY_NOTFOUND )
+							nPos = m_pListBoxHelper->GetTopEntry();
+						if ( nPos != LISTBOX_ENTRY_NOTFOUND )
+							aNewValue <<= CreateChild(nPos);
+						NotifyAccessibleEvent(	AccessibleEventId::ACTIVE_DESCENDANT_CHANGED,
+												aOldValue,
+												aNewValue );
+					}
+				}
+			}
+			break;
+		default:
+			break;
+	}	
+
+}
+// -----------------------------------------------------------------------------
 void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent)
 {
     // Create a reference to this object to prevent an early release of the
@@ -206,11 +426,13 @@ void VCLXAccessibleList::ProcessWindowEv
 		case VCLEVENT_COMBOBOX_SCROLLED:
 			UpdateEntryRange_Impl();
 			break;
-
+		// IAccessible2 implementation, 2009
+		/*
 		case VCLEVENT_LISTBOX_SELECT:
 			if ( !m_bDisableProcessEvent )
 				UpdateSelection_Impl();
 			break;
+		*/
 		// The selection events VCLEVENT_COMBOBOX_SELECT and
 		// VCLEVENT_COMBOBOX_DESELECT are not handled here because here we
 		// have no access to the edit field.  Its text is necessary to
@@ -236,20 +458,29 @@ void VCLXAccessibleList::ProcessWindowEv
                 rVclWindowEvent.GetData()));
             break;
 		case VCLEVENT_CONTROL_GETFOCUS:
-            VCLXAccessibleComponent::ProcessWindowEvent (rVclWindowEvent);
-			if ( m_pListBoxHelper )
 			{
-				uno::Any	aOldValue, 
-							aNewValue;
-				sal_uInt16 nPos = m_pListBoxHelper->GetSelectEntryPos();
-				if ( nPos == LISTBOX_ENTRY_NOTFOUND )
-					nPos = m_pListBoxHelper->GetTopEntry();
-				if ( nPos != LISTBOX_ENTRY_NOTFOUND )
-					aNewValue <<= CreateChild(nPos);
-
-				NotifyAccessibleEvent(	AccessibleEventId::ACTIVE_DESCENDANT_CHANGED,
-										aOldValue,
-										aNewValue );
+	            VCLXAccessibleComponent::ProcessWindowEvent (rVclWindowEvent);
+				// Added by IBM Symphony Acc team to handle the list item focus when List control get focus
+				sal_Bool b_IsDropDownList = sal_True;
+				if (m_pListBoxHelper)
+					b_IsDropDownList = ((m_pListBoxHelper->GetStyle() & WB_DROPDOWN ) == WB_DROPDOWN);
+				if ( m_aBoxType == LISTBOX && !b_IsDropDownList )
+				{
+					if ( m_pListBoxHelper )
+					{
+						uno::Any	aOldValue, 
+									aNewValue;
+						sal_uInt16 nPos = m_nCurSelectedPos; 
+
+						if ( nPos == LISTBOX_ENTRY_NOTFOUND )
+							nPos = m_pListBoxHelper->GetTopEntry();
+						if ( nPos != LISTBOX_ENTRY_NOTFOUND )
+							aNewValue <<= CreateChild(nPos);
+						NotifyAccessibleEvent(	AccessibleEventId::ACTIVE_DESCENDANT_CHANGED,
+												aOldValue,
+												aNewValue );
+					}
+				}
 			}
 			break;
 
@@ -257,6 +488,24 @@ void VCLXAccessibleList::ProcessWindowEv
             VCLXAccessibleComponent::ProcessWindowEvent (rVclWindowEvent);
     }
 }
+
+ void VCLXAccessibleList::FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet )
+{
+	ListBox* pBox = static_cast<ListBox*>(GetWindow());
+	if( m_aBoxType == LISTBOX  )
+	{
+		if (m_pListBoxHelper && (m_pListBoxHelper->GetStyle() & WB_DROPDOWN ) != WB_DROPDOWN)
+		{
+			uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1);
+			aSequence[0] = pBox->GetAccessible();
+			rRelationSet.AddRelation( com::sun::star::accessibility::AccessibleRelation( com::sun::star::accessibility::AccessibleRelationType::MEMBER_OF, aSequence ) );
+		}
+	}
+	else
+	{
+		VCLXAccessibleComponent::FillAccessibleRelationSet(rRelationSet);	
+	}
+}
 // -----------------------------------------------------------------------------
 
 /** To find out which item is currently selected and to update the SELECTED
@@ -315,9 +564,12 @@ Reference<XAccessible> VCLXAccessibleLis
 		// check if position is empty and can be used else we have to adjust all entries behind this
 		if ( xChild.is() )
 		{
+			// IAccessible2 implementation, 2009
+			/*	
 			ListItems::iterator aIter = m_aAccessibleChildren.begin() + nPos;
             ::std::mem_fun_t<bool, VCLXAccessibleListItem> aTemp(&VCLXAccessibleListItem::IncrementIndexInParent);
 			adjustEntriesIndexInParent(	aIter, aTemp);
+			*/
 		}
 		else
 		{
@@ -332,6 +584,9 @@ Reference<XAccessible> VCLXAccessibleLis
 		sal_Bool bNowSelected = sal_False;
 		if ( m_pListBoxHelper )
 			bNowSelected = m_pListBoxHelper->IsEntryPosSelected ((sal_uInt16)i);
+		// IAccessible2 implementation 2009
+		if (bNowSelected)
+			m_nCurSelectedPos = sal_uInt16(i);
         VCLXAccessibleListItem* pItem = static_cast< VCLXAccessibleListItem* >(xChild.get());
         pItem->SetSelected( bNowSelected );
 
@@ -350,6 +605,8 @@ Reference<XAccessible> VCLXAccessibleLis
 
 void VCLXAccessibleList::HandleChangedItemList (bool bItemInserted, sal_Int32 nIndex)
 {
+	// IAccessible2 implementation 2009
+	/*
     if ( !bItemInserted )
 	{
 		if ( nIndex == -1 ) // special handling here
@@ -368,7 +625,8 @@ void VCLXAccessibleList::HandleChangedIt
 	}
 	else
 		getAccessibleChild(nIndex);
-
+	*/	
+	clearItems();	
     NotifyAccessibleEvent (
         AccessibleEventId::INVALIDATE_ALL_CHILDREN,
         Any(), Any());
@@ -415,7 +673,7 @@ Reference<XAccessible> SAL_CALL VCLXAcce
 
     Reference< XAccessible > xChild;
     // search for the child
-	if ( static_cast<sal_uInt16>(i) >= m_aAccessibleChildren.size() )
+	if ( i >= static_cast<sal_Int32>(m_aAccessibleChildren.size()) )
 		xChild = CreateChild (i);
 	else
 	{
@@ -600,6 +858,7 @@ void VCLXAccessibleList::UpdateSelection
 		if ( m_pListBoxHelper )
 		{
 			sal_uInt16 i=0;
+			m_nCurSelectedPos = LISTBOX_ENTRY_NOTFOUND;
 			for ( ListItems::iterator aIter = m_aAccessibleChildren.begin();
 				  aIter != m_aAccessibleChildren.end(); ++aIter,++i)
 			{
@@ -609,6 +868,8 @@ void VCLXAccessibleList::UpdateSelection
 					VCLXAccessibleListItem* pItem = static_cast< VCLXAccessibleListItem* >( xHold.get() );
 					// Retrieve the item's index from the list entry.
 					sal_Bool bNowSelected = m_pListBoxHelper->IsEntryPosSelected (i);
+					if (bNowSelected)
+						m_nCurSelectedPos = i;
 
 					if ( bNowSelected && !pItem->IsSelected() )
 					{
@@ -639,14 +900,19 @@ void VCLXAccessibleList::UpdateSelection
 			}
 		}
 	}
-
-    if ( aNewValue.hasValue() || aOldValue.hasValue() )
-		NotifyAccessibleEvent(
-            AccessibleEventId::ACTIVE_DESCENDANT_CHANGED,
-            aOldValue,
-            aNewValue );
-
-	NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() );
+	if (!m_pListBoxHelper->IsInDropDown())
+	{
+	}
+	else
+	{
+		if ( aNewValue.hasValue() || aOldValue.hasValue() )
+			NotifyAccessibleEvent(
+				AccessibleEventId::ACTIVE_DESCENDANT_CHANGED,
+				aOldValue,
+				aNewValue );
+		//the SELECTION_CHANGED is not necessary
+		//NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() );
+	}
 }
 
 // -----------------------------------------------------------------------------
@@ -808,10 +1074,12 @@ awt::Rectangle VCLXAccessibleList::implG
 			if ( pBox )
 			{
 				Size aSize = pBox->GetSubEdit()->GetSizePixel();
-				aBounds.X += aSize.Height();
-				aBounds.Y += aSize.Width();
+				// IAccessible2 implementation, 2009
+				//aBounds.X += aSize.Height();
+				//aBounds.Y += aSize.Width();
+				aBounds.Y += aSize.Height();
 				aBounds.Height -= aSize.Height();
-				aBounds.Width  -= aSize.Width();
+				//aBounds.Width  -= aSize.Width();
 			}
 		}
 	}
@@ -839,12 +1107,33 @@ awt::Point VCLXAccessibleList::getLocati
 			ComboBox* pBox = static_cast<ComboBox*>(GetWindow());
 			if ( pBox )
 			{
-				aPos.X += pBox->GetSubEdit()->GetSizePixel().Height();
-				aPos.Y += pBox->GetSubEdit()->GetSizePixel().Width();
+				//aPos.X += pBox->GetSubEdit()->GetSizePixel().Height();
+				//aPos.Y += pBox->GetSubEdit()->GetSizePixel().Width();
+				aPos.Y += pBox->GetSubEdit()->GetSizePixel().Height();
 			}
 		}
 	}
 	return aPos;
 }
 // -----------------------------------------------------------------------------
-
+sal_Bool	VCLXAccessibleList::IsInDropDown() 
+{
+	return m_pListBoxHelper->IsInDropDown();
+}
+// -----------------------------------------------------------------------------
+void VCLXAccessibleList::HandleDropOpen()
+{
+	if ( !m_bDisableProcessEvent )
+		UpdateSelection_Impl();
+	if (m_nCurSelectedPos != LISTBOX_ENTRY_NOTFOUND &&
+		m_nLastSelectedPos != LISTBOX_ENTRY_NOTFOUND)
+	{
+		Reference< XAccessible > xChild = getAccessibleChild(m_nCurSelectedPos);
+		if(xChild.is())
+		{
+			uno::Any aNewValue;
+			aNewValue <<= xChild;
+			NotifyAccessibleEvent(AccessibleEventId::ACTIVE_DESCENDANT_CHANGED,	uno::Any(), aNewValue );
+		}
+	}
+}

Modified: openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessiblelistitem.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessiblelistitem.cxx?rev=1543679&r1=1543678&r2=1543679&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessiblelistitem.cxx (original)
+++ openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessiblelistitem.cxx Wed Nov 20 00:49:46 2013
@@ -317,9 +317,15 @@ Reference< XAccessibleStateSet > SAL_CAL
 	if ( !rBHelper.bDisposed && !rBHelper.bInDispose )
 	{
         pStateSetHelper->AddState( AccessibleStateType::TRANSIENT );
-        pStateSetHelper->AddState( AccessibleStateType::SELECTABLE );
-        pStateSetHelper->AddState( AccessibleStateType::ENABLED );
-        pStateSetHelper->AddState( AccessibleStateType::SENSITIVE );
+
+		// IAccessible2 implementation, 2009
+		if(m_pListBoxHelper->IsEnabled())	
+		{
+	    	pStateSetHelper->AddState( AccessibleStateType::SELECTABLE );
+	    	pStateSetHelper->AddState( AccessibleStateType::ENABLED );
+	    	pStateSetHelper->AddState( AccessibleStateType::SENSITIVE );
+		}
+
         if ( m_bSelected )
 			pStateSetHelper->AddState( AccessibleStateType::SELECTED );
 		if ( m_bVisible )

Modified: openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessiblemenu.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessiblemenu.cxx?rev=1543679&r1=1543678&r2=1543679&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessiblemenu.cxx (original)
+++ openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessiblemenu.cxx Wed Nov 20 00:49:46 2013
@@ -249,3 +249,14 @@ void VCLXAccessibleMenu::deselectAccessi
 }
 
 // -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleMenu::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+	OExternalLockGuard aGuard( this );
+
+	if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+        throw IndexOutOfBoundsException();
+
+	return ::rtl::OUString(  );
+}
+

Modified: openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessiblemenuitem.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessiblemenuitem.cxx?rev=1543679&r1=1543678&r2=1543679&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessiblemenuitem.cxx (original)
+++ openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessiblemenuitem.cxx Wed Nov 20 00:49:46 2013
@@ -191,8 +191,19 @@ Sequence< ::rtl::OUString > VCLXAccessib
 sal_Int16 VCLXAccessibleMenuItem::getAccessibleRole(  ) throw (RuntimeException)
 {
 	OExternalLockGuard aGuard( this );
-
-	return AccessibleRole::MENU_ITEM;
+	// IA2 CWS. MT: We had the aditional roles in UAA for ever, but never used them anywhere.
+	// Looks reasonable, but need to verify in Orca and VoiceOver.
+	sal_Int16 nRole = AccessibleRole::MENU_ITEM;
+	if ( m_pParent )
+	{
+		sal_uInt16 nItemId = m_pParent->GetItemId( m_nItemPos );
+		MenuItemBits nItemBits = m_pParent->GetItemBits(nItemId);
+		if(  nItemBits & MIB_RADIOCHECK)
+			nRole = AccessibleRole::RADIO_MENU_ITEM;
+		else if( nItemBits & MIB_CHECKABLE)
+			nRole = AccessibleRole::CHECK_MENU_ITEM;
+	}
+	return nRole;
 }
 
 // -----------------------------------------------------------------------------
@@ -454,8 +465,9 @@ sal_Bool VCLXAccessibleMenuItem::doAcces
 
 	if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
         throw IndexOutOfBoundsException();
-
-	return ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_CLICK ) );
+	//IAccessibility2 Impplementaton 2009-----
+	return ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_SELECT ) );
+	//-----IAccessibility2 Impplementaton 2009
 }
 
 // -----------------------------------------------------------------------------

Modified: openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessibleradiobutton.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessibleradiobutton.cxx?rev=1543679&r1=1543678&r2=1543679&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessibleradiobutton.cxx (original)
+++ openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessibleradiobutton.cxx Wed Nov 20 00:49:46 2013
@@ -197,8 +197,7 @@ sal_Bool VCLXAccessibleRadioButton::doAc
 
 	if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
         throw IndexOutOfBoundsException();
-
-	return ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_CLICK ) );
+	return ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_SELECT ) );
 }
 
 // -----------------------------------------------------------------------------

Modified: openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessiblescrollbar.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessiblescrollbar.cxx?rev=1543679&r1=1543678&r2=1543679&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessiblescrollbar.cxx (original)
+++ openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessiblescrollbar.cxx Wed Nov 20 00:49:46 2013
@@ -88,7 +88,8 @@ void VCLXAccessibleScrollBar::FillAccess
 	VCLXScrollBar* pVCLXScrollBar = static_cast< VCLXScrollBar* >( GetVCLXWindow() );
 	if ( pVCLXScrollBar )
 	{
-        rStateSet.AddState( AccessibleStateType::FOCUSABLE );
+		// IA2 CWS: scroll bar should not have FOCUSABLE state.
+        // rStateSet.AddState( AccessibleStateType::FOCUSABLE );
 		if ( pVCLXScrollBar->getOrientation() == ScrollBarOrientation::HORIZONTAL )
             rStateSet.AddState( AccessibleStateType::HORIZONTAL );
 		else if ( pVCLXScrollBar->getOrientation() == ScrollBarOrientation::VERTICAL )
@@ -274,3 +275,21 @@ Any VCLXAccessibleScrollBar::getMinimumV
 }
 
 // -----------------------------------------------------------------------------
+
+// IAccessible2 implementation, 2009
+::rtl::OUString VCLXAccessibleScrollBar::getAccessibleName(  ) throw (uno::RuntimeException)
+{
+	OExternalLockGuard aGuard( this );
+
+	::rtl::OUString aName;
+	VCLXScrollBar* pVCLXScrollBar = static_cast< VCLXScrollBar* >( GetVCLXWindow() );
+	if ( pVCLXScrollBar )
+	{
+		if ( pVCLXScrollBar->getOrientation() == ScrollBarOrientation::HORIZONTAL )
+            aName = TK_RES_STRING( RID_STR_ACC_SCROLLBAR_NAME_HORIZONTAL );
+		else if ( pVCLXScrollBar->getOrientation() == ScrollBarOrientation::VERTICAL )
+            aName = TK_RES_STRING( RID_STR_ACC_SCROLLBAR_NAME_VERTICAL );
+	}
+	return aName;
+}
+

Modified: openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessibletabcontrol.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessibletabcontrol.cxx?rev=1543679&r1=1543678&r2=1543679&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessibletabcontrol.cxx (original)
+++ openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessibletabcontrol.cxx Wed Nov 20 00:49:46 2013
@@ -81,7 +81,8 @@ void VCLXAccessibleTabControl::UpdateFoc
 
 void VCLXAccessibleTabControl::UpdateSelected( sal_Int32 i, bool bSelected )
 {
-	NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() );
+	// IAccessible2 implementation, 2009
+	//NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() );
 
 	if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() )
 	{

Modified: openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessibletextcomponent.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessibletextcomponent.cxx?rev=1543679&r1=1543678&r2=1543679&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessibletextcomponent.cxx (original)
+++ openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessibletextcomponent.cxx Wed Nov 20 00:49:46 2013
@@ -189,10 +189,62 @@ Sequence< PropertyValue > VCLXAccessible
 
     if ( GetWindow() )
     {
-        Font aFont = GetWindow()->GetControlFont();
-        sal_Int32 nBackColor = GetWindow()->GetControlBackground().GetColor();
-        sal_Int32 nColor = GetWindow()->GetControlForeground().GetColor();
-        ::std::auto_ptr< CharacterAttributesHelper > pHelper( new CharacterAttributesHelper( aFont, nBackColor, nColor ) );
+		Font aFont = GetWindow()->GetControlFont();
+
+		sal_Int32 nBackColor = GetWindow()->GetControlBackground().GetColor();
+		sal_Int32 nColor = GetWindow()->GetControlForeground().GetColor();
+
+		// MT: Code with default font was introduced with the IA2 CWS, but I am not convinced that this is the correct font...
+		// Decide what to do when we have a concrete issue.
+		/*
+		Font aDefaultVCLFont;
+		OutputDevice* pDev = Application::GetDefaultDevice();
+		if ( pDev )
+		{	
+			aDefaultVCLFont = pDev->GetSettings().GetStyleSettings().GetAppFont();
+			if ( !aFont.GetName().Len() )
+			{
+				String aDefaultName = aDefaultVCLFont.GetName();
+				aFont.SetName( aDefaultName );
+			}
+			if ( !aFont.GetHeight() )
+			{
+				aFont.SetHeight( aDefaultVCLFont.GetHeight() );
+			}
+			if ( aFont.GetWeight() == WEIGHT_DONTKNOW )
+			{
+				aFont.SetWeight( aDefaultVCLFont.GetWeight() );
+			}
+
+			//if nColor is -1, it may indicate that the default color black is using.
+			if ( nColor == -1)
+			{
+				nColor = aDefaultVCLFont.GetColor().GetColor();
+			}
+		}
+		*/
+
+		// MT: Adjustment stuff was introduced with the IA2 CWS, but adjustment is not a character attribute...
+		// In case we reintroduce it, use adjustment as extra parameter for the CharacterAttributesHelper...
+		/*
+		WinBits aBits = GetWindow()->GetStyle();
+		sal_Int16 nAdjust = -1;
+		if ( aBits & WB_LEFT )
+		{
+			nAdjust = style::ParagraphAdjust_LEFT;
+		}
+		else if ( aBits & WB_RIGHT )
+		{
+			nAdjust = style::ParagraphAdjust_RIGHT;
+		}
+		else if ( aBits & WB_CENTER )
+		{
+			nAdjust = style::ParagraphAdjust_CENTER;
+		}
+		*/
+
+		::std::auto_ptr< CharacterAttributesHelper > pHelper( new CharacterAttributesHelper( aFont, nBackColor, nColor ) );
+		
 		aValues = pHelper->GetCharacterAttributes( aRequestedAttributes );
     }
 

Modified: openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessibletoolbox.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessibletoolbox.cxx?rev=1543679&r1=1543678&r2=1543679&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessibletoolbox.cxx (original)
+++ openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessibletoolbox.cxx Wed Nov 20 00:49:46 2013
@@ -208,7 +208,7 @@ VCLXAccessibleToolBoxItem* VCLXAccessibl
 	{
 		ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.find( _nPos );
 		// returns only toolbox buttons, not windows
-		if ( aIter != m_aAccessibleChildren.end()  && !aIter->second.is())
+		if ( aIter != m_aAccessibleChildren.end()  && aIter->second.is())
 			pItem =	static_cast< VCLXAccessibleToolBoxItem* >( aIter->second.get() );
 	}
 
@@ -284,11 +284,14 @@ void VCLXAccessibleToolBox::ReleaseFocus
 	}
 }
 // -----------------------------------------------------------------------------
-void VCLXAccessibleToolBox::UpdateChecked_Impl( sal_Int32  )
+void VCLXAccessibleToolBox::UpdateChecked_Impl( sal_Int32 _nPos )
 {
     ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
     if ( pToolBox )
 	{
+		sal_uInt16 nFocusId = pToolBox->GetItemId( (sal_uInt16)_nPos );
+		VCLXAccessibleToolBoxItem* pFocusItem = NULL;
+
 	    for ( ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.begin();
 			  aIter != m_aAccessibleChildren.end(); ++aIter )
 		{
@@ -297,7 +300,12 @@ void VCLXAccessibleToolBox::UpdateChecke
                 VCLXAccessibleToolBoxItem* pItem =
                     static_cast< VCLXAccessibleToolBoxItem* >( aIter->second.get() );
                 pItem->SetChecked( pToolBox->IsItemChecked( nItemId ) );
+                if ( nItemId == nFocusId )
+                    pFocusItem = pItem;
         }
+		//Solution:If the position is not a child item,the focus should not be called
+		if ( pFocusItem && (sal_uInt16)_nPos != TOOLBOX_ITEM_NOTFOUND )
+			pFocusItem->SetFocus( sal_True );
 	}
 }
 // -----------------------------------------------------------------------------
@@ -535,23 +543,41 @@ void VCLXAccessibleToolBox::ProcessWindo
 	// to prevent an early release of the toolbox (VCLEVENT_OBJECT_DYING)
 	Reference< XAccessibleContext > xTemp = this;
 
+	ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() ); 
 	switch ( rVclWindowEvent.GetId() )
 	{
 		case VCLEVENT_TOOLBOX_CLICK:
+		case VCLEVENT_TOOLBOX_SELECT: 
         {
 			if ( rVclWindowEvent.GetData() )
             {
                 UpdateChecked_Impl( (sal_Int32)(sal_IntPtr)rVclWindowEvent.GetData() );
                 UpdateIndeterminate_Impl( (sal_Int32)(sal_IntPtr)rVclWindowEvent.GetData() );
             }
+			else if( pToolBox->GetItemPos(pToolBox->GetCurItemId()) != TOOLBOX_ITEM_NOTFOUND )
+			{
+				UpdateChecked_Impl( pToolBox->GetItemPos(pToolBox->GetCurItemId()) );
+		                UpdateIndeterminate_Impl( pToolBox->GetItemPos(pToolBox->GetCurItemId()) );
+			}
 			break;
         }
 		case VCLEVENT_TOOLBOX_DOUBLECLICK:
 		case VCLEVENT_TOOLBOX_ACTIVATE:
 		case VCLEVENT_TOOLBOX_DEACTIVATE:
-    	case VCLEVENT_TOOLBOX_SELECT:
+    	//case VCLEVENT_TOOLBOX_SELECT:
 			break;
-
+		// IA2 CWS. MT: Still using VCLEVENT_TOOLBOX_CLICK, see comment in vcl/source/window/toolbox2.cxx
+		/*
+		case VCLEVENT_TOOLBOX_ITEMUPDATED:
+		{
+	    	if ( rVclWindowEvent.GetData() )
+	        {
+				UpdateChecked_Impl( TOOLBOX_ITEM_NOTFOUND );
+	            UpdateIndeterminate_Impl( (sal_Int32)rVclWindowEvent.GetData() );
+	        }	
+		break;
+		}
+		*/
 		case VCLEVENT_TOOLBOX_HIGHLIGHT:
 			UpdateFocus_Impl();
 			break;

Modified: openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessibletoolboxitem.cxx?rev=1543679&r1=1543678&r2=1543679&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessibletoolboxitem.cxx (original)
+++ openoffice/branches/capstone2013/main/accessibility/source/standard/vclxaccessibletoolboxitem.cxx Wed Nov 20 00:49:46 2013
@@ -97,6 +97,10 @@ VCLXAccessibleToolBoxItem::VCLXAccessibl
 			else if (( ( nBits & TIB_CHECKABLE ) == TIB_CHECKABLE ) ||
                 ( ( nBits & TIB_AUTOCHECK ) == TIB_AUTOCHECK ) )
 				m_nRole	= AccessibleRole::TOGGLE_BUTTON;
+			else if ( (nBits & TIB_DROPDOWN) == TIB_DROPDOWN )
+			{
+				m_nRole	= AccessibleRole::BUTTON_DROPDOWN;
+			}
 			else if ( m_pToolBox->GetItemWindow( m_nItemId ) )
 				m_nRole	= AccessibleRole::PANEL;
 			break;
@@ -144,6 +148,18 @@ VCLXAccessibleToolBoxItem::~VCLXAccessib
 //				sRet += String( RTL_CONSTASCII_USTRINGPARAM( " " ) );
 //			sRet += sWinText;
 //		}
+		if (  sRet.getLength() == 0 )
+		{
+			Window* pItemWindow = m_pToolBox->GetItemWindow( m_nItemId );
+			if ( m_nRole == AccessibleRole::PANEL && pItemWindow && pItemWindow->GetAccessible().is() &&
+				 pItemWindow->GetAccessible()->getAccessibleContext().is() )
+			{
+				::rtl::OUString sWinText = pItemWindow->GetAccessible()->getAccessibleContext()->getAccessibleName();
+				 if ( sWinText.getLength() > 0 ) 
+					sRet = sWinText;
+			}
+		}
+
 	}
 	return sRet;
 }
@@ -165,6 +181,8 @@ void VCLXAccessibleToolBoxItem::SetFocus
 // -----------------------------------------------------------------------------
 void VCLXAccessibleToolBoxItem::SetChecked( sal_Bool _bCheck )
 {
+	if( m_nRole	== AccessibleRole::PANEL)
+		return;
 	if ( m_bIsChecked != _bCheck )
 	{
 		Any aOldValue;
@@ -370,11 +388,19 @@ sal_Int16 SAL_CALL VCLXAccessibleToolBox
 {
 	OExternalLockGuard aGuard( this );
 
-	::rtl::OUString sDescription;
-	if ( m_pToolBox )
+	
+	if(m_nRole	== AccessibleRole::PANEL && getAccessibleChildCount() > 0 )
+	{
+		return ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_PANEL_DESCRIPTION ) );
+	}
+	else
+	{
+		::rtl::OUString sDescription;
+		if ( m_pToolBox )
 		sDescription = m_pToolBox->GetHelpText( m_nItemId );
 
-	return sDescription;
+		return sDescription;
+	}
 }
 // -----------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleName(  ) throw (RuntimeException)
@@ -404,11 +430,11 @@ Reference< XAccessibleStateSet > SAL_CAL
 	if ( m_pToolBox && !rBHelper.bDisposed && !rBHelper.bInDispose )
 	{
         pStateSetHelper->AddState( AccessibleStateType::FOCUSABLE );
-		if ( m_bIsChecked )
+		if ( m_bIsChecked && m_nRole != AccessibleRole::PANEL ) 
 	        pStateSetHelper->AddState( AccessibleStateType::CHECKED );
         if ( m_bIndeterminate )
 	        pStateSetHelper->AddState( AccessibleStateType::INDETERMINATE );
-		if ( m_pToolBox->IsItemEnabled( m_nItemId ) )
+		if ( m_pToolBox->IsEnabled() && m_pToolBox->IsItemEnabled( m_nItemId ) ) 
         {
             pStateSetHelper->AddState( AccessibleStateType::ENABLED );
             pStateSetHelper->AddState( AccessibleStateType::SENSITIVE );
@@ -674,6 +700,8 @@ Any VCLXAccessibleToolBoxItem::getCurren
 	if ( m_pToolBox )
 		aValue <<= (sal_Int32)m_pToolBox->IsItemChecked( m_nItemId );
 
+	if( m_nRole == AccessibleRole::PANEL )
+		aValue <<= (sal_Int32)0;
 	return aValue;
 }
 // -----------------------------------------------------------------------------

Modified: openoffice/branches/capstone2013/main/autodoc/source/exes/adc_uni/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/autodoc/source/exes/adc_uni/makefile.mk?rev=1543679&r1=1543678&r2=1543679&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/autodoc/source/exes/adc_uni/makefile.mk (original)
+++ openoffice/branches/capstone2013/main/autodoc/source/exes/adc_uni/makefile.mk Wed Nov 20 00:49:46 2013
@@ -72,11 +72,11 @@ APP1OBJS=   $(OBJ)$/main.obj
 APP1RPATH=SDK
 
 .IF "$(GUI)"=="WNT"
-APP1STDLIBS= $(LIBSTLPORT) $(COSVLIB) $(UDMLIB)
+APP1STDLIBS= $(COSVLIB) $(UDMLIB)
 .ELSE
 .IF "$(OS)"=="MACOSX"
 # See <http://porting.openoffice.org/servlets/ReadMsg?list=mac&msgNo=6911>:
-APP1STDLIBS= $(LIBSTLPORT) -Wl,-all_load -ludm -lcosv
+APP1STDLIBS= -Wl,-all_load -ludm -lcosv
 .ELSE
 APP1STDLIBS= -lcosv -ludm
 .ENDIF

Modified: openoffice/branches/capstone2013/main/basebmp/test/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/basebmp/test/makefile.mk?rev=1543679&r1=1543678&r2=1543679&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/basebmp/test/makefile.mk (original)
+++ openoffice/branches/capstone2013/main/basebmp/test/makefile.mk Wed Nov 20 00:49:46 2013
@@ -63,13 +63,6 @@ CDEFS+=-xalias_level=compatible
 .ENDIF
 .ENDIF
 
-#building with stlport, but cppunit was not built with stlport
-.IF "$(USE_SYSTEM_STL)"!="YES"
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGSCXX+=-DADAPT_EXT_STL
-.ENDIF
-.ENDIF
-
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 # --- Common ----------------------------------------------------------

Modified: openoffice/branches/capstone2013/main/basegfx/inc/basegfx/color/bcolor.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/basegfx/inc/basegfx/color/bcolor.hxx?rev=1543679&r1=1543678&r2=1543679&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/basegfx/inc/basegfx/color/bcolor.hxx (original)
+++ openoffice/branches/capstone2013/main/basegfx/inc/basegfx/color/bcolor.hxx Wed Nov 20 00:49:46 2013
@@ -192,20 +192,22 @@ namespace basegfx
 			return (fRetval > fDistB ? fRetval : fDistB);
 		}
 
-		// clamp color to [0.0..1.0] values in all three intensity components
-		void clamp()
-		{
+        // clamp color to [0.0..1.0] values in all three intensity components
+        BColor& clamp()
+        {
             mfX = basegfx::clamp(mfX, 0.0, 1.0);
             mfY = basegfx::clamp(mfY, 0.0, 1.0);
             mfZ = basegfx::clamp(mfZ, 0.0, 1.0);
-		}
+            return *this; 
+        }
 
-		void invert()
-		{
+        BColor& invert()
+        {
             mfX = 1.0 - mfX;
             mfY = 1.0 - mfY;
             mfZ = 1.0 - mfZ;
-		}
+            return *this; 
+        }
 
 		static const BColor& getEmptyBColor()
 		{

Modified: openoffice/branches/capstone2013/main/basegfx/inc/basegfx/color/bcolormodifier.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/basegfx/inc/basegfx/color/bcolormodifier.hxx?rev=1543679&r1=1543678&r2=1543679&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/basegfx/inc/basegfx/color/bcolormodifier.hxx (original)
+++ openoffice/branches/capstone2013/main/basegfx/inc/basegfx/color/bcolormodifier.hxx Wed Nov 20 00:49:46 2013
@@ -19,122 +19,407 @@
  * 
  *************************************************************/
 
-
-
 #ifndef _BGFX_COLOR_BCOLORMODIFIER_HXX
 #define _BGFX_COLOR_BCOLORMODIFIER_HXX
 
 #include <basegfx/color/bcolor.hxx>
+#include <boost/utility.hpp>
+#include <boost/shared_ptr.hpp>
 #include <vector>
 
 //////////////////////////////////////////////////////////////////////////////
 
 namespace basegfx
 {
-	/**	Descriptor for type of color modification
-	*/
-	enum BColorModifyMode
-	{
-		BCOLORMODIFYMODE_REPLACE,		        // replace all color with local color
-		BCOLORMODIFYMODE_INTERPOLATE,	        // interpolate color between given and local with local value
-		BCOLORMODIFYMODE_GRAY,			        // convert color to gray
-		BCOLORMODIFYMODE_BLACKANDWHITE,	        // convert color to B&W, local value is treshhold
-        BCOLORMODIFYMODE_INVERT,                // invert color
-        BCOLORMODIFYMODE_LUMINANCE_TO_ALPHA     // convert color to alpha value (used for Svg Mask)
-	};
-
-	/**	Class to hold a color, value and mode for a color modification. Color modification is
-		done calling the getModifiedColor() method
-	*/
-	class BColorModifier
-	{
-	protected:
-		::basegfx::BColor							maBColor;
-		double										mfValue;
-		BColorModifyMode							meMode;
-
-	public:
-		BColorModifier(
-			const ::basegfx::BColor& rBColor, 
-			double fValue = 0.5, 
-			BColorModifyMode eMode = BCOLORMODIFYMODE_REPLACE)
-		:	maBColor(rBColor),
-			mfValue(fValue),
-			meMode(eMode)
-		{}
-
-		// compare operator(s)
-		bool operator==(const BColorModifier& rCompare) const
-		{
-			return (maBColor == rCompare.maBColor && mfValue == rCompare.mfValue && meMode == rCompare.meMode);
-		}
-
-		bool operator!=(const BColorModifier& rCompare) const 
-		{ 
-			return !(operator==(rCompare)); 
-		}
-
-		// data access
-		const ::basegfx::BColor& getBColor() const { return maBColor; }
-		double getValue() const { return mfValue; }
-		BColorModifyMode getMode() const { return meMode; }
-
-		// compute modified color
-		::basegfx::BColor getModifiedColor(const ::basegfx::BColor& aSourceColor) const;
-	};
-
-	/**	Class to hold a stack of BColorModifiers and to get the modified color with
-		applying all existing entry changes
-	*/
-	class BColorModifierStack
-	{
-	protected:
-		::std::vector< BColorModifier >				maBColorModifiers;
-
-	public:
-		sal_uInt32 count() const
-		{
-			return maBColorModifiers.size();
-		}
-
-		const BColorModifier& getBColorModifier(sal_uInt32 nIndex) const
-		{
-			OSL_ENSURE(nIndex < count(), "BColorModifierStack: Access out of range (!)");
-			return maBColorModifiers[nIndex];
-		}
-
-		::basegfx::BColor getModifiedColor(const ::basegfx::BColor& rSource) const
-		{
-			if(count())
-			{
-				::basegfx::BColor aRetval(rSource);
-				::std::vector< BColorModifier >::const_iterator aEnd(maBColorModifiers.end());
-
-				while(aEnd != maBColorModifiers.begin())
-				{
-					aRetval = (--aEnd)->getModifiedColor(aRetval);
-				}
-
-				return aRetval;
-			}
-			else
-			{
-				return rSource;
-			}
-		}
-
-		void push(const BColorModifier& rNew) 
-		{ 
-			maBColorModifiers.push_back(rNew); 
-		}
-
-		void pop() 
-		{ 
-			maBColorModifiers.pop_back(); 
-		}
-	};
+    /** base class to define color modifications
+
+        The basic idea is to have instances of color modifiers where each
+        of these can be asked to get a modified version of a color. This
+        can be as easy as to return a fixed color, but may also do any
+        other computation based on the given source color and the local
+        algorythm to apply.
+
+        This base implementation defines the abstract base class. Every 
+        derivation offers another color blending effect, when needed with 
+        parameters for that blending defined as members.
+
+        As long as aw080 is not applied, an operator== is needed to implement
+        the operator== of the primitive based on this instances.
+
+        For the exact definitions of the color blending applied refer to the
+        implementation of the method getModifiedColor
+
+        BColorModifier is not copyable (no copy constructor, no assigment
+        operator); local values cannot be changed after construction. The
+        instances are cheap and the idea is to create them on demand. To
+        be able to reuse these as much as possible, a define for a
+        ::boost::shared_ptr named BColorModifierSharedPtr exists below.
+        All usages should handle instances of BColorModifier encapsulated
+        into these shared pointers.
+    */
+    class BColorModifier : private boost::noncopyable
+    {
+    private:
+    protected:
+        // noone is allowed to incarnate the abstract base class
+        // except derivations
+        BColorModifier() {}
+
+    public:
+        // noone should directly destroy it; all incarnations should be 
+        // handled in a boost::shared_ptr of type BColorModifierSharedPtr
+        virtual ~BColorModifier();
+
+        // compare operator
+        virtual bool operator==(const BColorModifier& rCompare) const = 0;
+        bool operator!=(const BColorModifier& rCompare) const 
+        { 
+            return !(operator==(rCompare)); 
+        }
+
+        // compute modified color
+        virtual ::basegfx::BColor getModifiedColor(const ::basegfx::BColor& aSourceColor) const = 0;
+    };
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    /** convert color to gray
+
+        returns a color where red green and blue are replaced with the
+        luminance value calculated based on the source color by using
+        the following weights: r * 0.30, g * 0.59, b * 0.11
+    */
+    class BColorModifier_gray : public BColorModifier
+    {
+    private:
+    protected:
+    public:
+        BColorModifier_gray() 
+        :   BColorModifier()
+        {
+        }
+
+        virtual ~BColorModifier_gray();
+
+        // compare operator
+        virtual bool operator==(const BColorModifier& rCompare) const;
+
+        // compute modified color
+        virtual ::basegfx::BColor getModifiedColor(const ::basegfx::BColor& aSourceColor) const;
+    };
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    /** invert color
+
+        returns a color where red green and blue are inverted using 1.0 - n
+    */
+    class BColorModifier_invert : public BColorModifier
+    {
+    private:
+    protected:
+    public:
+        BColorModifier_invert() 
+        :   BColorModifier()
+        {
+        }
+
+        virtual ~BColorModifier_invert();
+
+        // compare operator
+        virtual bool operator==(const BColorModifier& rCompare) const;
+
+        // compute modified color
+        virtual ::basegfx::BColor getModifiedColor(const ::basegfx::BColor& aSourceColor) const;
+    };
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    /** convert to alpha based on luminance
+
+        returns a color where red green and blue are first weighted and added
+        to build a luminance value which is then inverted and used for red,
+        green and blue. The weights are  r * 0.2125 + g * 0.7154 + b * 0.0721.
+        This derivation is used for the svg importer and does exactly what SVG
+        defines for this needed case.
+    */
+    class BColorModifier_luminance_to_alpha : public BColorModifier
+    {
+    private:
+    protected:
+    public:
+        BColorModifier_luminance_to_alpha() 
+        :   BColorModifier()
+        {
+        }
+
+        virtual ~BColorModifier_luminance_to_alpha();
+
+        // compare operator
+        virtual bool operator==(const BColorModifier& rCompare) const;
+
+        // compute modified color
+        virtual ::basegfx::BColor getModifiedColor(const ::basegfx::BColor& aSourceColor) const;
+    };
 } // end of namespace basegfx
 
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    /** replace color
+
+        does not use the source color at all, but always returns the
+        given color, replacing everything. Useful e.g. for unified shadow 
+        creation
+    */
+    class BColorModifier_replace : public BColorModifier
+    {
+    private:
+        ::basegfx::BColor           maBColor;
+
+    protected:
+    public:
+        BColorModifier_replace(const ::basegfx::BColor& rBColor) 
+        :   BColorModifier(),
+            maBColor(rBColor)
+        {
+        }
+
+        virtual ~BColorModifier_replace();
+
+        // data access
+        const ::basegfx::BColor& getBColor() const { return maBColor; }
+
+        // compare operator
+        virtual bool operator==(const BColorModifier& rCompare) const;
+
+        // compute modified color
+        virtual ::basegfx::BColor getModifiedColor(const ::basegfx::BColor& aSourceColor) const;
+    };
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    /** interpolate color
+
+        returns an interpolated color mixed by the given value (f) in the range
+        [0.0 .. 1.0] and the given color (col) as follows: 
+
+        col * (1 - f) + aSourceColor * f
+    */
+    class BColorModifier_interpolate : public BColorModifier
+    {
+    private:
+        ::basegfx::BColor           maBColor;
+        double                      mfValue;
+
+    protected:
+    public:
+        BColorModifier_interpolate(const ::basegfx::BColor& rBColor, double fValue) 
+        :   BColorModifier(),
+            maBColor(rBColor),
+            mfValue(fValue)
+        {
+        }
+
+        virtual ~BColorModifier_interpolate();
+
+        // data access
+        const ::basegfx::BColor& getBColor() const { return maBColor; }
+        double getValue() const { return mfValue; }
+
+        // compare operator
+        virtual bool operator==(const BColorModifier& rCompare) const;
+
+        // compute modified color
+        virtual ::basegfx::BColor getModifiedColor(const ::basegfx::BColor& aSourceColor) const;
+    };
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    /** convert color to black and white
+
+        returns black when the luminance of the given color is less than
+        the given treshhold value in the range [0.0 .. 1.0], else white
+    */
+    class BColorModifier_black_and_white : public BColorModifier
+    {
+    private:
+        double                      mfValue;
+
+    protected:
+    public:
+        BColorModifier_black_and_white(double fValue) 
+        :   BColorModifier(),
+            mfValue(fValue)
+        {
+        }
+
+        virtual ~BColorModifier_black_and_white();
+
+        // data access
+        double getValue() const { return mfValue; }
+
+        // compare operator
+        virtual bool operator==(const BColorModifier& rCompare) const;
+
+        // compute modified color
+        virtual ::basegfx::BColor getModifiedColor(const ::basegfx::BColor& aSourceColor) const;
+    };
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    /** gamma correction
+
+        Input is a gamma correction value in the range ]0.0 .. 10.0]; the
+        color values get correted using
+
+        col(r,g,b) = clamp(pow(col(r,g,b), 1.0 / gamma), 0.0, 1.0)
+    */
+    class BColorModifier_gamma : public BColorModifier
+    {
+    private:
+        double                      mfValue;
+        double                      mfInvValue;
+
+        /// bitfield
+        bool                        mbUseIt : 1;
+
+    protected:
+    public:
+        BColorModifier_gamma(double fValue);
+
+        virtual ~BColorModifier_gamma();
+
+        // data access
+        double getValue() const { return mfValue; }
+
+        // compare operator
+        virtual bool operator==(const BColorModifier& rCompare) const;
+
+        // compute modified color
+        virtual ::basegfx::BColor getModifiedColor(const ::basegfx::BColor& aSourceColor) const;
+    };
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    /** Red, Green, Blue, Luminance and Contrast correction
+
+        Input are percent values from [-1.0 .. 1-0] which correspond to -100% to 100%
+        correction of Red, Green, Blue, Luminance or Contrast. 0.0 means no change of
+        the corresponding channel. All these are combined (but can be used single) to
+        - be able to cover a bigger change range utilizing the cmobination
+        - allow execution by a small, common, precalculated table
+    */
+    class BColorModifier_RGBLuminanceContrast : public BColorModifier
+    {
+    private:
+        double                      mfRed;
+        double                      mfGreen;
+        double                      mfBlue;
+        double                      mfLuminance;
+        double                      mfContrast;
+
+        double                      mfContrastOff;
+        double                      mfRedOff;
+        double                      mfGreenOff;
+        double                      mfBlueOff;
+
+        /// bitfield
+        bool                        mbUseIt : 1;
+
+    protected:
+    public:
+        BColorModifier_RGBLuminanceContrast(double fRed, double fGreen, double fBlue, double fLuminance, double fContrast);
+
+        virtual ~BColorModifier_RGBLuminanceContrast();
+
+        // data access
+        double getRed() const { return mfRed; }
+        double getGreen() const { return mfGreen; }
+        double getBlue() const { return mfBlue; }
+        double getLuminance() const { return mfLuminance; }
+        double getContrast() const { return mfContrast; }
+
+        // compare operator
+        virtual bool operator==(const BColorModifier& rCompare) const;
+
+        // compute modified color
+        virtual ::basegfx::BColor getModifiedColor(const ::basegfx::BColor& aSourceColor) const;
+    };
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    /// typedef to allow working with shared instances of BColorModifier
+    /// for the whole mechanism
+    typedef ::boost::shared_ptr< BColorModifier > BColorModifierSharedPtr;
+
+    /** Class to hold a stack of BColorModifierSharedPtrs and to get the modified color with
+        applying all existing entry changes as defined in the stack. Instances of BColorModifier
+        can be pushed and popped to change the stack.
+
+        All references to BColorModifier members use shared pointers, thus instances of
+        BColorModifierStack can be copied by the default mechanisms if needed.
+    */
+    class BColorModifierStack
+    {
+    protected:
+        ::std::vector< BColorModifierSharedPtr >        maBColorModifiers;
+
+    public:
+        sal_uInt32 count() const
+        {
+            return maBColorModifiers.size();
+        }
+
+        const BColorModifierSharedPtr& getBColorModifier(sal_uInt32 nIndex) const
+        {
+            OSL_ENSURE(nIndex < count(), "BColorModifierStack: Access out of range (!)");
+            return maBColorModifiers[nIndex];
+        }
+
+        // get the color in it's modified form by applying all existing BColorModifiers,
+        // from back to front (the newest first)
+        ::basegfx::BColor getModifiedColor(const ::basegfx::BColor& rSource) const;
+
+        void push(const BColorModifierSharedPtr& rNew) 
+        { 
+            maBColorModifiers.push_back(rNew); 
+        }
+
+        void pop() 
+        { 
+            maBColorModifiers.pop_back(); 
+        }
+    };
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
 #endif // _BGFX_COLOR_BCOLORMODIFIER_HXX
 
 //////////////////////////////////////////////////////////////////////////////

Modified: openoffice/branches/capstone2013/main/basegfx/source/color/bcolormodifier.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/basegfx/source/color/bcolormodifier.cxx?rev=1543679&r1=1543678&r2=1543679&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/basegfx/source/color/bcolormodifier.cxx (original)
+++ openoffice/branches/capstone2013/main/basegfx/source/color/bcolormodifier.cxx Wed Nov 20 00:49:46 2013
@@ -19,8 +19,6 @@
  * 
  *************************************************************/
 
-
-
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_basegfx.hxx"
 
@@ -30,47 +28,315 @@
 
 namespace basegfx
 {
-	::basegfx::BColor BColorModifier::getModifiedColor(const ::basegfx::BColor& aSourceColor) const
-	{
-		switch(meMode)
-		{
-			case BCOLORMODIFYMODE_INTERPOLATE :
-			{
-				return interpolate(maBColor, aSourceColor, mfValue);
-			}
-			case BCOLORMODIFYMODE_GRAY :
-			{
-				const double fLuminance(aSourceColor.luminance());
-				return ::basegfx::BColor(fLuminance, fLuminance, fLuminance);
-			}
-			case BCOLORMODIFYMODE_BLACKANDWHITE :
-			{
-				const double fLuminance(aSourceColor.luminance());
-
-				if(fLuminance < mfValue)
-				{
-					return ::basegfx::BColor::getEmptyBColor();
-				}
-				else
-				{
-					return ::basegfx::BColor(1.0, 1.0, 1.0);
-				}
-			}
-            case BCOLORMODIFYMODE_INVERT :
+    BColorModifier::~BColorModifier()
+    {
+    }
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    BColorModifier_gray::~BColorModifier_gray()
+    {
+    }
+
+    bool BColorModifier_gray::operator==(const BColorModifier& rCompare) const
+    {
+        return 0 != dynamic_cast< const BColorModifier_gray* >(&rCompare);
+    }
+
+    ::basegfx::BColor BColorModifier_gray::getModifiedColor(const ::basegfx::BColor& aSourceColor) const
+    {
+        const double fLuminance(aSourceColor.luminance());
+
+        return ::basegfx::BColor(fLuminance, fLuminance, fLuminance);
+    }
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    BColorModifier_invert::~BColorModifier_invert()
+    {
+    }
+
+    bool BColorModifier_invert::operator==(const BColorModifier& rCompare) const
+    {
+        return 0 != dynamic_cast< const BColorModifier_invert* >(&rCompare);
+    }
+
+    ::basegfx::BColor BColorModifier_invert::getModifiedColor(const ::basegfx::BColor& aSourceColor) const
+    {
+        return ::basegfx::BColor(1.0 - aSourceColor.getRed(), 1.0 - aSourceColor.getGreen(), 1.0 - aSourceColor.getBlue());
+    }
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    BColorModifier_luminance_to_alpha::~BColorModifier_luminance_to_alpha()
+    {
+    }
+
+    bool BColorModifier_luminance_to_alpha::operator==(const BColorModifier& rCompare) const
+    {
+        return 0 != dynamic_cast< const BColorModifier_luminance_to_alpha* >(&rCompare);
+    }
+
+    ::basegfx::BColor BColorModifier_luminance_to_alpha::getModifiedColor(const ::basegfx::BColor& aSourceColor) const
+    {
+        const double fAlpha(1.0 - ((aSourceColor.getRed() * 0.2125) + (aSourceColor.getGreen() * 0.7154) + (aSourceColor.getBlue() * 0.0721)));
+
+        return ::basegfx::BColor(fAlpha, fAlpha, fAlpha);
+    }
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    BColorModifier_replace::~BColorModifier_replace()
+    {
+    }
+
+    bool BColorModifier_replace::operator==(const BColorModifier& rCompare) const
+    {
+        const BColorModifier_replace* pCompare = dynamic_cast< const BColorModifier_replace* >(&rCompare);
+
+        if(!pCompare)
+        {
+            return false;
+        }
+
+        return getBColor() == pCompare->getBColor();
+    }
+
+    ::basegfx::BColor BColorModifier_replace::getModifiedColor(const ::basegfx::BColor& /*aSourceColor*/) const
+    {
+        return maBColor;
+    }
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    BColorModifier_interpolate::~BColorModifier_interpolate()
+    {
+    }
+
+    bool BColorModifier_interpolate::operator==(const BColorModifier& rCompare) const
+    {
+        const BColorModifier_interpolate* pCompare = dynamic_cast< const BColorModifier_interpolate* >(&rCompare);
+
+        if(!pCompare)
+        {
+            return false;
+        }
+
+        return getBColor() == pCompare->getBColor() && getValue() == pCompare->getValue();
+    }
+
+    ::basegfx::BColor BColorModifier_interpolate::getModifiedColor(const ::basegfx::BColor& aSourceColor) const
+    {
+        return interpolate(maBColor, aSourceColor, mfValue);
+    }
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    BColorModifier_black_and_white::~BColorModifier_black_and_white()
+    {
+    }
+
+    bool BColorModifier_black_and_white::operator==(const BColorModifier& rCompare) const
+    {
+        const BColorModifier_black_and_white* pCompare = dynamic_cast< const BColorModifier_black_and_white* >(&rCompare);
+
+        if(!pCompare)
+        {
+            return false;
+        }
+
+        return getValue() == pCompare->getValue();
+    }
+
+    ::basegfx::BColor BColorModifier_black_and_white::getModifiedColor(const ::basegfx::BColor& aSourceColor) const
+    {
+        const double fLuminance(aSourceColor.luminance());
+        
+        if(fLuminance < mfValue)
+        {
+            return ::basegfx::BColor::getEmptyBColor();
+        }
+        else
+        {
+            return ::basegfx::BColor(1.0, 1.0, 1.0);
+        }
+    }
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    BColorModifier_gamma::BColorModifier_gamma(double fValue) 
+    :   BColorModifier(),
+        mfValue(fValue),
+        mfInvValue(fValue),
+        mbUseIt(!basegfx::fTools::equal(fValue, 1.0) && basegfx::fTools::more(fValue, 0.0) && basegfx::fTools::lessOrEqual(fValue, 10.0))
+    {
+        if(mbUseIt)
+        {
+            mfInvValue = 1.0 / mfValue;
+        }
+    }
+
+    BColorModifier_gamma::~BColorModifier_gamma()
+    {
+    }
+
+    bool BColorModifier_gamma::operator==(const BColorModifier& rCompare) const
+    {
+        const BColorModifier_gamma* pCompare = dynamic_cast< const BColorModifier_gamma* >(&rCompare);
+
+        if(!pCompare)
+        {
+            return false;
+        }
+
+        // getValue is sufficient, mfInvValue and mbUseIt are only helper values
+        return getValue() == pCompare->getValue();
+    }
+
+    ::basegfx::BColor BColorModifier_gamma::getModifiedColor(const ::basegfx::BColor& aSourceColor) const
+    {
+        if(mbUseIt)
+        {
+            ::basegfx::BColor aRetval(
+                pow(aSourceColor.getRed(), mfInvValue),
+                pow(aSourceColor.getGreen(), mfInvValue),
+                pow(aSourceColor.getBlue(), mfInvValue));
+
+            aRetval.clamp();
+            return aRetval;
+        }
+        else
+        {
+            return aSourceColor;
+        }
+    }
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    BColorModifier_RGBLuminanceContrast::BColorModifier_RGBLuminanceContrast(double fRed, double fGreen, double fBlue, double fLuminance, double fContrast) 
+    :   BColorModifier(),
+        mfRed(basegfx::clamp(fRed, -1.0, 1.0)),
+        mfGreen(basegfx::clamp(fGreen, -1.0, 1.0)),
+        mfBlue(basegfx::clamp(fBlue, -1.0, 1.0)),
+        mfLuminance(basegfx::clamp(fLuminance, -1.0, 1.0)),
+        mfContrast(basegfx::clamp(fContrast, -1.0, 1.0)),
+        mfContrastOff(1.0),
+        mfRedOff(0.0),
+        mfGreenOff(0.0),
+        mfBlueOff(0.0),
+        mbUseIt(false)
+    {
+        if(!basegfx::fTools::equalZero(mfRed)
+            || !basegfx::fTools::equalZero(mfGreen)
+            || !basegfx::fTools::equalZero(mfBlue)
+            || !basegfx::fTools::equalZero(mfLuminance)
+            || !basegfx::fTools::equalZero(mfContrast))
+        {
+            // calculate slope
+            if(mfContrast >= 0.0)
             {
-                return ::basegfx::BColor(1.0 - aSourceColor.getRed(), 1.0 - aSourceColor.getGreen(), 1.0 - aSourceColor.getBlue());
+                mfContrastOff = 128.0 / (128.0 - (mfContrast * 127.0));
             }
-            case BCOLORMODIFYMODE_LUMINANCE_TO_ALPHA:
+            else
             {
-                const double fAlpha(1.0 - ((aSourceColor.getRed() * 0.2125) + (aSourceColor.getGreen() * 0.7154) + (aSourceColor.getBlue() * 0.0721)));
-                return ::basegfx::BColor(fAlpha, fAlpha, fAlpha);
+                mfContrastOff = ( 128.0 + (mfContrast * 127.0)) / 128.0;
             }
-			default : // BCOLORMODIFYMODE_REPLACE
-			{
-				return maBColor;
-			}
-		}
-	}
+
+            // calculate unified contrast offset
+            const double fPreparedContrastOff((128.0 - mfContrastOff * 128.0) / 255.0);
+            const double fCombinedOffset(mfLuminance + fPreparedContrastOff);
+
+            // set full offsets
+            mfRedOff = mfRed + fCombinedOffset;
+            mfGreenOff = mfGreen + fCombinedOffset;
+            mfBlueOff = mfBlue + fCombinedOffset;
+
+            mbUseIt = true;
+        }
+    }
+
+    BColorModifier_RGBLuminanceContrast::~BColorModifier_RGBLuminanceContrast()
+    {
+    }
+
+    bool BColorModifier_RGBLuminanceContrast::operator==(const BColorModifier& rCompare) const
+    {
+        const BColorModifier_RGBLuminanceContrast* pCompare = dynamic_cast< const BColorModifier_RGBLuminanceContrast* >(&rCompare);
+
+        if(!pCompare)
+        {
+            return false;
+        }
+
+        // no need to compare other values, these are just helpers
+        return getRed() == pCompare->getRed()
+            && getGreen() == pCompare->getGreen()
+            && getBlue() == pCompare->getBlue()
+            && getLuminance() == pCompare->getLuminance()
+            && getContrast() == pCompare->getContrast();
+    }
+
+    ::basegfx::BColor BColorModifier_RGBLuminanceContrast::getModifiedColor(const ::basegfx::BColor& aSourceColor) const
+    {
+        if(mbUseIt)
+        {
+            return basegfx::BColor(
+                basegfx::clamp(aSourceColor.getRed() * mfContrastOff + mfRedOff, 0.0, 1.0),
+                basegfx::clamp(aSourceColor.getGreen() * mfContrastOff + mfGreenOff, 0.0, 1.0),
+                basegfx::clamp(aSourceColor.getBlue() * mfContrastOff + mfBlueOff, 0.0, 1.0));
+        }
+        else
+        {
+            return aSourceColor;
+        }
+    }
+} // end of namespace basegfx
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+    ::basegfx::BColor BColorModifierStack::getModifiedColor(const ::basegfx::BColor& rSource) const
+    {
+        if(maBColorModifiers.empty())
+        {
+            return rSource;
+        }
+
+        ::basegfx::BColor aRetval(rSource);
+
+        for(sal_uInt32 a(maBColorModifiers.size()); a;)
+        {
+            a--;
+            aRetval = maBColorModifiers[a]->getModifiedColor(aRetval);
+        }
+
+        return aRetval;
+    }
 } // end of namespace basegfx
 
 //////////////////////////////////////////////////////////////////////////////

Modified: openoffice/branches/capstone2013/main/basegfx/source/workbench/Makefile
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/basegfx/source/workbench/Makefile?rev=1543679&r1=1543678&r2=1543679&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/basegfx/source/workbench/Makefile (original)
+++ openoffice/branches/capstone2013/main/basegfx/source/workbench/Makefile Wed Nov 20 00:49:46 2013
@@ -63,7 +63,7 @@
 #test : bezierclip.cxx convexhull.cxx
 #	g++ -Wall -g \
 #	-I. -I. -I../inc -I./inc -I./unx/inc -I./unxlngi4/inc -I. -I/develop4/update/SRX644/unxlngi4/inc.m4/stl -I/develop4/update/SRX644/unxlngi4/inc.m4/external -I/develop4/update/SRX644/unxlngi4/inc.m4 -I/develop4/update/SRX644/src.m4/solenv/unxlngi4/inc  -I/net/grande/develop6/update/dev/gcc_3.0.1_linux_libc2.11_turbolinux/include -I/develop4/update/SRX644/src.m4/solenv/inc -I/develop4/update/SRX644/unxlngi4/inc.m4/stl -I/net/grande.germany/develop6/update/dev/gcc_3.0.1_linux_libc2.11_turbolinux/redhat60/usr/include -I/net/grande.germany/develop6/update/dev/gcc_3.0.1_linux_libc2.11_turbolinux/redhat60/usr/include/X11 -I/develop4/update/SRX644/src.m4/res -I/net/grande/develop6/update/dev/Linux_JDK_1.4.0/include -I/net/grande/develop6/update/dev/Linux_JDK_1.4.0/include/linux -I. -I./res -I. \
-#	-include preinclude.h -D_USE_NAMESPACE -DGLIBC=2 -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 -D_STLP_DEBUG \
+#	-include preinclude.h -D_USE_NAMESPACE -DGLIBC=2 -D_USE_NAMESPACE=1 -D_STLP_DEBUG \
 #	bezierclip.cxx convexhull.cxx -o bezierclip
 
 prog : bezierclip.cxx convexhull.cxx

Modified: openoffice/branches/capstone2013/main/basegfx/test/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/basegfx/test/makefile.mk?rev=1543679&r1=1543678&r2=1543679&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/basegfx/test/makefile.mk (original)
+++ openoffice/branches/capstone2013/main/basegfx/test/makefile.mk Wed Nov 20 00:49:46 2013
@@ -37,14 +37,7 @@ ENABLE_EXCEPTIONS=TRUE
 @all:
 	@echo "cppunit disabled. nothing do do."
 
-.ELSE # "$(WITH_CPPUNIT)" != "YES"
-
-#building with stlport, but cppunit was not built with stlport
-.IF "$(USE_SYSTEM_STL)"!="YES"
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGSCXX+=-DADAPT_EXT_STL
-.ENDIF
-.ENDIF
+.ELSE
 
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 

Modified: openoffice/branches/capstone2013/main/chart2/source/controller/accessibility/AccessibleBase.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/chart2/source/controller/accessibility/AccessibleBase.cxx?rev=1543679&r1=1543678&r2=1543679&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/chart2/source/controller/accessibility/AccessibleBase.cxx (original)
+++ openoffice/branches/capstone2013/main/chart2/source/controller/accessibility/AccessibleBase.cxx Wed Nov 20 00:49:46 2013
@@ -651,7 +651,9 @@ sal_Int32 SAL_CALL AccessibleBase::getAc
 sal_Int16 SAL_CALL AccessibleBase::getAccessibleRole()
     throw (RuntimeException)
 {
-    return AccessibleRole::LIST_ITEM; // #i73747# role SHAPE seems more appropriate, but is not read
+	//IAccessibility2 Implementation 2009-----
+    return AccessibleRole::SHAPE/*LIST_ITEM*/; // #i73747# role SHAPE seems more appropriate, but is not read
+	//-----IAccessibility2 Implementation 2009
 }
 
 Reference< XAccessibleRelationSet > SAL_CALL AccessibleBase::getAccessibleRelationSet()

Modified: openoffice/branches/capstone2013/main/chart2/source/controller/dialogs/tp_DataSource.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/chart2/source/controller/dialogs/tp_DataSource.cxx?rev=1543679&r1=1543678&r2=1543679&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/chart2/source/controller/dialogs/tp_DataSource.cxx (original)
+++ openoffice/branches/capstone2013/main/chart2/source/controller/dialogs/tp_DataSource.cxx Wed Nov 20 00:49:46 2013
@@ -69,10 +69,13 @@ const OUString lcl_aLabelRole( RTL_CONST
 String lcl_GetRoleLBEntry(
     const OUString & rRole, const OUString & rRange )
 {
-    String aEntry( rRole );
-    aEntry += '\t';
-    aEntry += String(
-        ::chart::DialogModel::ConvertRoleFromInternalToUI( rRole ));
+//IAccessibility2 Implementation 2009-----
+    //String aEntry( rRole );
+    //aEntry += '\t';
+    //aEntry += String(
+    //    ::chart::DialogModel::ConvertRoleFromInternalToUI( rRole ));
+    String aEntry(::chart::DialogModel::ConvertRoleFromInternalToUI( rRole ));
+	//-----IAccessibility2 Implementation 2009
     aEntry += '\t';
     aEntry += String( rRange );
 
@@ -139,10 +142,12 @@ OUString lcl_GetSequenceNameForLabel( ::
     return aResult;
 }
 
+//IAccessibility2 Implementation 2009-----
 static long lcl_pRoleListBoxTabs[] =
-	{	3,        // Number of Tabs
-		0, 0, 75
+	{	2,        // Number of Tabs
+		0, 75
 	};
+//-----IAccessibility2 Implementation 2009
 
 void lcl_ShowChooserButton(
     ::chart::RangeSelectionButton & rChooserButton,

Modified: openoffice/branches/capstone2013/main/configmgr/source/partial.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/configmgr/source/partial.hxx?rev=1543679&r1=1543678&r2=1543679&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/configmgr/source/partial.hxx (original)
+++ openoffice/branches/capstone2013/main/configmgr/source/partial.hxx Wed Nov 20 00:49:46 2013
@@ -50,7 +50,7 @@ public:
 
 private:
     struct Node {
-        typedef boost::unordered_map< rtl::OUString, Node > Children;
+        typedef boost::unordered_map< rtl::OUString, Node, rtl::OUStringHash > Children;
 
         Node(): startInclude(false) {}
         void clear() { startInclude=false; children.clear(); }