Commits

Anonymous committed e5c8f2c

accfixes3: #i117573# Fixed some compilation problems.

Comments (0)

Files changed (6)

accessibility/source/extended/accessiblelistboxentry.cxx

 			SvLBoxEntry* pEntry = pBox->GetEntryFromPath( m_aEntryPath );
 			if ( pEntry )
 			{	
-				sal_Int32 nValue, nValueMin, nValueMax;
-				aNumber >>= nValue;
-				getMinimumValue() >>= nValueMin;
-				getMaximumValue() >>= nValueMax;
+				sal_Int32 nValue (0);
+				sal_Int32 nValueMin (0);
+				sal_Int32 nValueMax (0);
+                if ((aNumber >>= nValue)
+                    && (getMinimumValue() >>= nValueMin)
+                    && (getMaximumValue() >>= nValueMax))
+                {
+                    if ( nValue < nValueMin )
+                        nValue = nValueMin;
+                    else if ( nValue > nValueMax )
+                        nValue = nValueMax;
 
-				if ( nValue < nValueMin )
-					nValue = nValueMin;
-				else if ( nValue > nValueMax )
-					nValue = nValueMax;
-
-				pBox->SetCheckButtonState(pEntry,  (SvButtonState) nValue );
-				bReturn = sal_True;
+                    pBox->SetCheckButtonState(pEntry,  (SvButtonState) nValue );
+                    bReturn = sal_True;
+                }
+                else
+                    bReturn = sal_False;
 			}
 		}
 			

editeng/source/accessibility/AccessibleEditableTextPara.cxx

 			// Char color
 			if (rRes.Name.compareTo(::rtl::OUString::createFromAscii("CharColor"))==0)
 			{
-				uno::Any &anyChar = rRes.Value;
-				sal_uInt16 crChar = (sal_uInt16)(anyChar.pReserved);					
-				if (COL_AUTO == crChar )
+				sal_uInt32 crChar = 0;
+                if ((rRes.Value >>= crChar)
+                    && COL_AUTO == crChar )
 				{
 					uno::Reference< ::com::sun::star::accessibility::XAccessibleComponent > xComponent;
 					if (mxParent.is())
 						if (xContext->getAccessibleRole() == AccessibleRole::SHAPE 
 							|| xContext->getAccessibleRole() == AccessibleRole::TABLE_CELL)
 						{
-							anyChar <<= COL_BLACK;
+							rRes.Value <<= COL_BLACK;
 						}
 						else
 						{
 							Color cr(xComponent->getBackground());
 							crChar = cr.IsDark() ? COL_WHITE : COL_BLACK;
-							anyChar <<= crChar;
+							rRes.Value <<= crChar;
 						}
 					}
 				}
 			}
 			// Underline
 			if(rRes.Name.compareTo(::rtl::OUString::createFromAscii("CharUnderline"))==0)
-			{	
+			{
+                (void)nIndex;
 				/*
 				// MT: Implement XAccessibleTextMarkup, mark with TextMarkupType::SPELLCHECK. This way done in SW.
 				if (IsCurrentEditorEnableAutoSpell( mxParent ))
 			// Underline color && Mis-spell
 			if(rRes.Name.compareTo(::rtl::OUString::createFromAscii("CharUnderlineColor"))==0)
 			{	
-				uno::Any &anyCharUnderLine = rRes.Value;
-				sal_uInt16 crCharUnderLine = (sal_uInt16)(anyCharUnderLine.pReserved);					
-				if (COL_AUTO == crCharUnderLine )
+				sal_uInt32 crCharUnderLine (0);
+                if ((rRes.Value >>= crCharUnderLine)
+                     && COL_AUTO == crCharUnderLine )
 				{
 					uno::Reference< ::com::sun::star::accessibility::XAccessibleComponent > xComponent;
 					if (mxParent.is())
 						if (xContext->getAccessibleRole() == AccessibleRole::SHAPE 
 							|| xContext->getAccessibleRole() == AccessibleRole::TABLE_CELL)
 						{
-							anyCharUnderLine <<= COL_BLACK;
+							rRes.Value <<= COL_BLACK;
 						}
 						else
 						{
 							Color cr(xComponent->getBackground());
 							crCharUnderLine = cr.IsDark() ? COL_WHITE : COL_BLACK;
-							anyCharUnderLine <<= crCharUnderLine;
+							rRes.Value <<= crCharUnderLine;
 						}
 					}
 				}
 			if(rRes.Name.compareTo(::rtl::OUString::createFromAscii("NumberingRules"))==0)
 			{
 				SfxItemSet aAttribs = rCacheTF.GetParaAttribs( static_cast< sal_uInt16 >(GetParagraphIndex()) );
-				sal_Bool bVis = ((const SfxUInt16Item&)aAttribs.Get( EE_PARA_BULLETSTATE )).GetValue() ? TRUE : FALSE;
+				sal_Bool bVis = ((const SfxUInt16Item&)aAttribs.Get( EE_PARA_BULLETSTATE )).GetValue() ? sal_True : sal_False;
 				if(bVis)
 				{
 					rRes.Value <<= (sal_Int16)-1;

offapi/com/sun/star/accessibility/makefile.mk

     AccessibleContext.idl                           \
     AccessibleEventId.idl                           \
     AccessibleEventObject.idl                       \
-    AccessibleFlowContext.idl                       \
     AccessibleRelation.idl                          \
     AccessibleRelationType.idl                      \
     AccessibleRole.idl                              \

sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx

 		SdrObject* pObj2 = GetSdrObjectFromXShape(xshape2);		
 		if(pObj1 && pObj2)
 			return pObj1->GetOrdNum() < pObj2->GetOrdNum();
-		else
-			return 0;
+        // No else here because of gcc compiler bug 23441 which is
+        // triggered on MacOsX gcc 4.0.1.
+        return false;
 	}
 };
 //-----IAccessibility2 Implementation 2009

svtools/inc/svtools/svlbox.hxx

 	void		SetFlags( sal_uInt16 nFlags ) { nEntryFlags = nFlags; }
 
     sal_Bool	IsMarked() const { return bIsMarked ; }
-    void		SetMarked( sal_Bool IsMarked ) { bIsMarked = IsMarked ; }
+    void		SetMarked( sal_Bool _IsMarked ) { bIsMarked = _IsMarked ; }
 };
 
 // *********************************************************************

svx/source/accessibility/AccessibleShape.cxx

         SdrObject* pObj2 = GetSdrObjectFromXShape(xshape2);		
         if(pObj1 && pObj2)
             return pObj1->GetOrdNum() < pObj2->GetOrdNum();
-        else
-            return 0;
+        // No else here because of gcc compiler bug 23441 which is
+        // triggered on MacOsX gcc 4.0.1.
+        return false;
     }
 };
 //end of group position
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.