openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1546124 [30/33] - in /openoffice/branches/alg/aw080: ./ main/ main/accessibility/inc/accessibility/extended/ main/accessibility/inc/accessibility/helper/ main/accessibility/inc/accessibility/standard/ main/accessibility/source/extended/ ma...
Date Wed, 27 Nov 2013 17:25:54 GMT
Modified: openoffice/branches/alg/aw080/main/sw/source/ui/docvw/edtwin2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/ui/docvw/edtwin2.cxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sw/source/ui/docvw/edtwin2.cxx (original)
+++ openoffice/branches/alg/aw080/main/sw/source/ui/docvw/edtwin2.cxx Wed Nov 27 17:25:40 2013
@@ -135,276 +135,250 @@ void SwEditWin::RequestHelp(const HelpEv
 									SwContentAtPos::SW_REFMARK |
                                     SwContentAtPos::SW_SMARTTAG |
 #ifdef DBG_UTIL
-									SwContentAtPos::SW_TABLEBOXVALUE |
-						( bBalloon ? SwContentAtPos::SW_CURR_ATTRS : 0) |
+                                    SwContentAtPos::SW_TABLEBOXVALUE |
+                                    ( bBalloon ? SwContentAtPos::SW_CURR_ATTRS : 0) |
 #endif
-									SwContentAtPos::SW_TABLEBOXFML );
+                                    SwContentAtPos::SW_TABLEBOXFML );
 
-		if( rSh.GetContentAtPos( aPos, aCntntAtPos, sal_False, &aFldRect ) )
-		{
-             switch( aCntntAtPos.eCntntAtPos )
-			{
-			case SwContentAtPos::SW_TABLEBOXFML:
-				sTxt.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "= " ));
-				sTxt += ((SwTblBoxFormula*)aCntntAtPos.aFnd.pAttr)->GetFormula();
-				break;
-#ifdef DBG_UTIL
-			case SwContentAtPos::SW_TABLEBOXVALUE:
-			{
-                sTxt = UniString(
-                            ByteString::CreateFromDouble(
-                                ((SwTblBoxValue*)aCntntAtPos.aFnd.pAttr)->GetValue()  )
-                            , gsl_getSystemTextEncoding());
-			}
-			break;
-			case SwContentAtPos::SW_CURR_ATTRS:
-				sTxt = aCntntAtPos.sStr;
-				break;
-#endif
-
-			case SwContentAtPos::SW_INETATTR:
+        if( rSh.GetContentAtPos( aPos, aCntntAtPos, sal_False, &aFldRect ) )
+        {
+            switch( aCntntAtPos.eCntntAtPos )
             {
-				sTxt = ((SfxStringItem*)aCntntAtPos.aFnd.pAttr)->GetValue();
-				sTxt = URIHelper::removePassword( sTxt,
-										INetURLObject::WAS_ENCODED,
-			   							INetURLObject::DECODE_UNAMBIGUOUS);
-                //#i63832# remove the link target type
-                xub_StrLen nFound = sTxt.Search(cMarkSeperator);
-                if( nFound != STRING_NOTFOUND && (++nFound) < sTxt.Len() )
+            case SwContentAtPos::SW_TABLEBOXFML:
+                sTxt.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "= " ));
+                sTxt += ((SwTblBoxFormula*)aCntntAtPos.aFnd.pAttr)->GetFormula();
+                break;
+#ifdef DBG_UTIL
+            case SwContentAtPos::SW_TABLEBOXVALUE:
                 {
-                    String sSuffix( sTxt.Copy(nFound) );
-                    if( sSuffix.EqualsAscii( pMarkToTable ) ||
-                        sSuffix.EqualsAscii( pMarkToFrame ) ||
-                        sSuffix.EqualsAscii( pMarkToRegion ) ||
-                        sSuffix.EqualsAscii( pMarkToOutline ) ||
-                        sSuffix.EqualsAscii( pMarkToText ) ||
-                        sSuffix.EqualsAscii( pMarkToGraphic ) ||
-                        sSuffix.EqualsAscii( pMarkToOLE ))
-                    sTxt = sTxt.Copy( 0, nFound - 1);
+                    sTxt = UniString(
+                        ByteString::CreateFromDouble(
+                        ((SwTblBoxValue*)aCntntAtPos.aFnd.pAttr)->GetValue()  )
+                        , gsl_getSystemTextEncoding());
                 }
-                // --> OD 2009-08-18 #i104300#
-                // special handling if target is a cross-reference bookmark
+                break;
+            case SwContentAtPos::SW_CURR_ATTRS:
+                sTxt = aCntntAtPos.sStr;
+                break;
+#endif
+
+            case SwContentAtPos::SW_INETATTR:
                 {
-                    String sTmpSearchStr = sTxt.Copy( 1, sTxt.Len() );
-                    IDocumentMarkAccess* const pMarkAccess =
-                                                rSh.getIDocumentMarkAccess();
-                    IDocumentMarkAccess::const_iterator_t ppBkmk =
-                                    pMarkAccess->findBookmark( sTmpSearchStr );
-                    if ( ppBkmk != pMarkAccess->getBookmarksEnd() &&
-                         IDocumentMarkAccess::GetType( *(ppBkmk->get()) )
-                            == IDocumentMarkAccess::CROSSREF_HEADING_BOOKMARK )
+                    sTxt = ((SfxStringItem*)aCntntAtPos.aFnd.pAttr)->GetValue();
+                    sTxt = URIHelper::removePassword( sTxt,
+                        INetURLObject::WAS_ENCODED,
+                        INetURLObject::DECODE_UNAMBIGUOUS);
+                    //#i63832# remove the link target type
+                    xub_StrLen nFound = sTxt.Search(cMarkSeperator);
+                    if( nFound != STRING_NOTFOUND && (++nFound) < sTxt.Len() )
                     {
-                        SwTxtNode* pTxtNode = ppBkmk->get()->GetMarkStart().nNode.GetNode().GetTxtNode();
-                        if ( pTxtNode )
+                        String sSuffix( sTxt.Copy(nFound) );
+                        if( sSuffix.EqualsAscii( pMarkToTable ) ||
+                            sSuffix.EqualsAscii( pMarkToFrame ) ||
+                            sSuffix.EqualsAscii( pMarkToRegion ) ||
+                            sSuffix.EqualsAscii( pMarkToOutline ) ||
+                            sSuffix.EqualsAscii( pMarkToText ) ||
+                            sSuffix.EqualsAscii( pMarkToGraphic ) ||
+                            sSuffix.EqualsAscii( pMarkToOLE ))
+                            sTxt = sTxt.Copy( 0, nFound - 1);
+                    }
+                    // special handling if target is a cross-reference bookmark
+                    {
+                        String sTmpSearchStr = sTxt.Copy( 1, sTxt.Len() );
+                        IDocumentMarkAccess* const pMarkAccess = rSh.getIDocumentMarkAccess();
+                        IDocumentMarkAccess::const_iterator_t ppBkmk = pMarkAccess->findBookmark( sTmpSearchStr );
+                        if ( ppBkmk != pMarkAccess->getBookmarksEnd()
+                             && IDocumentMarkAccess::GetType( *(ppBkmk->get()) ) == IDocumentMarkAccess::CROSSREF_HEADING_BOOKMARK )
                         {
-                            sTxt = pTxtNode->GetExpandTxt( 0, pTxtNode->Len(), true, true );
-
-                            if( sTxt.Len() )
+                            SwTxtNode* pTxtNode = ppBkmk->get()->GetMarkStart().nNode.GetNode().GetTxtNode();
+                            if ( pTxtNode )
                             {
-                                sTxt.EraseAllChars( 0xad );
-                                for( sal_Unicode* p = sTxt.GetBufferAccess(); *p; ++p )
+                                sTxt = pTxtNode->GetExpandTxt( 0, pTxtNode->Len(), true, true );
+
+                                if( sTxt.Len() )
                                 {
-                                    if( *p < 0x20 )
-                                        *p = 0x20;
-                                    else if(*p == 0x2011)
-                                        *p = '-';
+                                    sTxt.EraseAllChars( 0xad );
+                                    for( sal_Unicode* p = sTxt.GetBufferAccess(); *p; ++p )
+                                    {
+                                        if( *p < 0x20 )
+                                            *p = 0x20;
+                                        else if(*p == 0x2011)
+                                            *p = '-';
+                                    }
                                 }
                             }
                         }
                     }
-                }
-                // <--
-                // --> OD 2007-07-26 #i80029#
-                sal_Bool bExecHyperlinks = rView.GetDocShell()->IsReadOnly();
-                if ( !bExecHyperlinks )
-                {
-                    SvtSecurityOptions aSecOpts;
-                    bExecHyperlinks = !aSecOpts.IsOptionSet( SvtSecurityOptions::E_CTRLCLICK_HYPERLINK );
 
+                    sal_Bool bExecHyperlinks = rView.GetDocShell()->IsReadOnly();
                     if ( !bExecHyperlinks )
                     {
-                        sTxt.InsertAscii( ": ", 0 );
-                        sTxt.Insert( ViewShell::GetShellRes()->aHyperlinkClick, 0 );
+                        SvtSecurityOptions aSecOpts;
+                        bExecHyperlinks = !aSecOpts.IsOptionSet( SvtSecurityOptions::E_CTRLCLICK_HYPERLINK );
+
+                        if ( !bExecHyperlinks )
+                        {
+                            sTxt.InsertAscii( ": ", 0 );
+                            sTxt.Insert( ViewShell::GetShellRes()->aHyperlinkClick, 0 );
+                        }
                     }
+                    break;
                 }
-                // <--
-				break;
-            }
-			case SwContentAtPos::SW_SMARTTAG:
-            {
-				sTxt = SW_RESSTR(STR_SMARTTAG_CLICK);
+            case SwContentAtPos::SW_SMARTTAG:
+                {
+                    sTxt = SW_RESSTR(STR_SMARTTAG_CLICK);
 
-                KeyCode aCode( KEY_SPACE );
-                KeyCode aModifiedCode( KEY_SPACE, KEY_MOD1 );
-                String aModStr( aModifiedCode.GetName() );
-                aModStr.SearchAndReplace( aCode.GetName(), String() );
-                aModStr.SearchAndReplaceAllAscii( "+", String() );
-                sTxt.SearchAndReplaceAllAscii( "%s", aModStr );
-            }
-            break;
+                    KeyCode aCode( KEY_SPACE );
+                    KeyCode aModifiedCode( KEY_SPACE, KEY_MOD1 );
+                    String aModStr( aModifiedCode.GetName() );
+                    aModStr.SearchAndReplace( aCode.GetName(), String() );
+                    aModStr.SearchAndReplaceAllAscii( "+", String() );
+                    sTxt.SearchAndReplaceAllAscii( "%s", aModStr );
+                }
+                break;
 
-			case SwContentAtPos::SW_FTN:
-				if( aCntntAtPos.pFndTxtAttr && aCntntAtPos.aFnd.pAttr )
-				{
+            case SwContentAtPos::SW_FTN:
+                if( aCntntAtPos.pFndTxtAttr && aCntntAtPos.aFnd.pAttr )
+                {
                     const SwFmtFtn* pFtn = (SwFmtFtn*)aCntntAtPos.aFnd.pAttr;
-					pFtn->GetFtnText( sTxt );
-					sTxt.Insert( SW_RESSTR( pFtn->IsEndNote()
-									? STR_ENDNOTE : STR_FTNNOTE ), 0 );
+                    pFtn->GetFtnText( sTxt );
+                    sTxt.Insert( SW_RESSTR( pFtn->IsEndNote()
+                        ? STR_ENDNOTE : STR_FTNNOTE ), 0 );
                     if( aCntntAtPos.IsInRTLText() )
                         nStyle |= QUICKHELP_BIDI_RTL;
                 }
-				break;
+                break;
 
-			case SwContentAtPos::SW_REDLINE:
-				lcl_GetRedlineHelp( *aCntntAtPos.aFnd.pRedl, sTxt, bBalloon );
-				break;
-
-			case SwContentAtPos::SW_TOXMARK:
-				sTxt = aCntntAtPos.sStr;
-				if( sTxt.Len() && aCntntAtPos.pFndTxtAttr )
-				{
-					const SwTOXType* pTType = aCntntAtPos.pFndTxtAttr->
-										GetTOXMark().GetTOXType();
-					if( pTType && pTType->GetTypeName().Len() )
-					{
-						sTxt.InsertAscii( ": ", 0 );
-						sTxt.Insert( pTType->GetTypeName(), 0 );
-					}
-				}
-				break;
-			case SwContentAtPos::SW_REFMARK:
-				if(aCntntAtPos.aFnd.pAttr)
-				{
-					sTxt = SW_RES(STR_CONTENT_TYPE_SINGLE_REFERENCE);
-					sTxt.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": "));
-					sTxt += ((const SwFmtRefMark*)aCntntAtPos.aFnd.pAttr)->GetRefName();
-				}
-			break;
+            case SwContentAtPos::SW_REDLINE:
+                lcl_GetRedlineHelp( *aCntntAtPos.aFnd.pRedl, sTxt, bBalloon );
+                break;
+
+            case SwContentAtPos::SW_TOXMARK:
+                sTxt = aCntntAtPos.sStr;
+                if( sTxt.Len() && aCntntAtPos.pFndTxtAttr )
+                {
+                    const SwTOXType* pTType = aCntntAtPos.pFndTxtAttr->
+                        GetTOXMark().GetTOXType();
+                    if( pTType && pTType->GetTypeName().Len() )
+                    {
+                        sTxt.InsertAscii( ": ", 0 );
+                        sTxt.Insert( pTType->GetTypeName(), 0 );
+                    }
+                }
+                break;
 
-			default:
-				{
-					SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig();
-					if(!pModOpt->IsHideFieldTips())
-					{
-						const SwField* pFld = aCntntAtPos.aFnd.pFld;
-						switch( pFld->Which() )
-						{
-						case RES_SETEXPFLD:
-						case RES_TABLEFLD:
-						case RES_GETEXPFLD:
-						{
-							sal_uInt16 nOldSubType = pFld->GetSubType();
-							((SwField*)pFld)->SetSubType(nsSwExtendedSubType::SUB_CMD);
-                            sTxt = pFld->ExpandField(true);
-							((SwField*)pFld)->SetSubType(nOldSubType);
-						}
-						break;
-
-						case RES_POSTITFLD:
-							{
-								/*
-								SwPostItMgr* pMgr = rView.GetPostItMgr();
-								if (pMgr->ShowNotes())
-								{
-									SwFmtFld* pSwFmtFld = 0;
-									if (pMgr->ShowPreview(pFld,pSwFmtFld))
-									{
-										SwPostIt* pPostIt = new SwPostIt(static_cast<Window*>(this),0,pSwFmtFld,pMgr,PB_Preview);
-										pPostIt->InitControls();
-										pPostIt->SetReadonly(true);
-										pMgr->SetColors(pPostIt,static_cast<SwPostItField*>(pSwFmtFld->GetFld()));
-										pPostIt->SetVirtualPosSize(rEvt.GetMousePosPixel(),Size(180,70));
-										pPostIt->ShowNote();
-										SetPointerPosPixel(pPostIt->GetPosPixel() + Point(20,20));
-									}
-									return;
-								}
-								*/
-								break;
-							}
-						case RES_INPUTFLD:	// BubbleHelp, da der Hinweis ggf ziemlich lang sein kann
-							bBalloon = sal_True;
-							/* no break */
-						case RES_JUMPEDITFLD:
-							sTxt = pFld->GetPar2();
-							break;
+            case SwContentAtPos::SW_REFMARK:
+                if(aCntntAtPos.aFnd.pAttr)
+                {
+                    sTxt = SW_RES(STR_CONTENT_TYPE_SINGLE_REFERENCE);
+                    sTxt.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": "));
+                    sTxt += ((const SwFmtRefMark*)aCntntAtPos.aFnd.pAttr)->GetRefName();
+                }
+                break;
 
-						case RES_DBFLD:
+            default:
+                {
+                    SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig();
+                    if(!pModOpt->IsHideFieldTips())
+                    {
+                        const SwField* pFld = aCntntAtPos.aFnd.pFld;
+                        switch( pFld->Which() )
+                        {
+                        case RES_SETEXPFLD:
+                        case RES_TABLEFLD:
+                        case RES_GETEXPFLD:
+                            {
+                                sal_uInt16 nOldSubType = pFld->GetSubType();
+                                ((SwField*)pFld)->SetSubType(nsSwExtendedSubType::SUB_CMD);
+                                sTxt = pFld->ExpandField(true);
+                                ((SwField*)pFld)->SetSubType(nOldSubType);
+                            }
+                            break;
+
+                        case RES_POSTITFLD:
+                            {
+                                break;
+                            }
+                        case RES_INPUTFLD:	// BubbleHelp, da der Hinweis ggf ziemlich lang sein kann
+                            bBalloon = sal_True;
+                            /* no break */
+                        case RES_JUMPEDITFLD:
+                            sTxt = pFld->GetPar2();
+                            break;
+
+                        case RES_DBFLD:
                             sTxt = pFld->GetFieldName();
-							break;
+                            break;
 
-						case RES_USERFLD:
-						case RES_HIDDENTXTFLD:
-							sTxt = pFld->GetPar1();
-							break;
+                        case RES_USERFLD:
+                        case RES_HIDDENTXTFLD:
+                            sTxt = pFld->GetPar1();
+                            break;
 
-						case RES_DOCSTATFLD:
-							break;
+                        case RES_DOCSTATFLD:
+                            break;
 
-						case RES_MACROFLD:
-							sTxt = ((const SwMacroField*)pFld)->GetMacro();
-							break;
+                        case RES_MACROFLD:
+                            sTxt = ((const SwMacroField*)pFld)->GetMacro();
+                            break;
 
-						case RES_GETREFFLD:
-                        {
-                            // --> OD 2008-01-09 #i85090#
-                            const SwGetRefField* pRefFld( dynamic_cast<const SwGetRefField*>(pFld) );
-                            ASSERT( pRefFld,
-                                    "<SwEditWin::RequestHelp(..)> - unexpected type of <pFld>" );
-                            if ( pRefFld )
+                        case RES_GETREFFLD:
                             {
-                                if ( pRefFld->IsRefToHeadingCrossRefBookmark() ||
-                                     pRefFld->IsRefToNumItemCrossRefBookmark() )
+                                const SwGetRefField* pRefFld( dynamic_cast<const SwGetRefField*>(pFld) );
+                                ASSERT( pRefFld,
+                                    "<SwEditWin::RequestHelp(..)> - unexpected type of <pFld>" );
+                                if ( pRefFld )
                                 {
-                                    sTxt = pRefFld->GetExpandedTxtOfReferencedTxtNode();
-                                    if ( sTxt.Len() > 80  )
+                                    if ( pRefFld->IsRefToHeadingCrossRefBookmark() ||
+                                        pRefFld->IsRefToNumItemCrossRefBookmark() )
                                     {
-                                        sTxt.Erase( 80 );
-                                        sTxt += '.';
-                                        sTxt += '.';
-                                        sTxt += '.';
+                                        sTxt = pRefFld->GetExpandedTxtOfReferencedTxtNode();
+                                        if ( sTxt.Len() > 80  )
+                                        {
+                                            sTxt.Erase( 80 );
+                                            sTxt += '.';
+                                            sTxt += '.';
+                                            sTxt += '.';
+                                        }
+                                    }
+                                    else
+                                    {
+                                        sTxt = ((SwGetRefField*)pFld)->GetSetRefName();
                                     }
-                                }
-                                else
-                                {
-                                    sTxt = ((SwGetRefField*)pFld)->GetSetRefName();
                                 }
                             }
-                            // <--
+                            break;
                         }
-                        break;
-						}
-					}
-
-					if( !sTxt.Len() )
-					{
-						aCntntAtPos.eCntntAtPos = SwContentAtPos::SW_REDLINE;
-						if( rSh.GetContentAtPos( aPos, aCntntAtPos, sal_False, &aFldRect ) )
-							lcl_GetRedlineHelp( *aCntntAtPos.aFnd.pRedl,
-													sTxt, bBalloon );
-					}
+                    }
+
+                    if( !sTxt.Len() )
+                    {
+                        aCntntAtPos.eCntntAtPos = SwContentAtPos::SW_REDLINE;
+                        if( rSh.GetContentAtPos( aPos, aCntntAtPos, sal_False, &aFldRect ) )
+                            lcl_GetRedlineHelp( *aCntntAtPos.aFnd.pRedl, sTxt, bBalloon );
+                    }
                 }
-			}
-			if (sTxt.Len() )
-			{
-				if( bBalloon )
-					Help::ShowBalloon( this, rEvt.GetMousePosPixel(), sTxt );
-				else
-				{
-					// dann zeige die Hilfe mal an:
-					Rectangle aRect( aFldRect.SVRect() );
-					Point aPt( OutputToScreenPixel( LogicToPixel( aRect.TopLeft() )));
-					aRect.Left()   = aPt.X();
-					aRect.Top()    = aPt.Y();
-					aPt = OutputToScreenPixel( LogicToPixel( aRect.BottomRight() ));
-					aRect.Right()  = aPt.X();
-					aRect.Bottom() = aPt.Y();
+            }
+            if (sTxt.Len() )
+            {
+                if( bBalloon )
+                    Help::ShowBalloon( this, rEvt.GetMousePosPixel(), sTxt );
+                else
+                {
+                    // dann zeige die Hilfe mal an:
+                    Rectangle aRect( aFldRect.SVRect() );
+                    Point aPt( OutputToScreenPixel( LogicToPixel( aRect.TopLeft() )));
+                    aRect.Left()   = aPt.X();
+                    aRect.Top()    = aPt.Y();
+                    aPt = OutputToScreenPixel( LogicToPixel( aRect.BottomRight() ));
+                    aRect.Right()  = aPt.X();
+                    aRect.Bottom() = aPt.Y();
                     Help::ShowQuickHelp( this, aRect, sTxt, nStyle );
-				}
-			}
+                }
+            }
 
-			bWeiter = sal_False;
-		}
+            bWeiter = sal_False;
+        }
         if( bWeiter )
         {
             sal_uInt8 nTabCols = rSh.WhichMouseTabCol(aPos);
@@ -419,7 +393,6 @@ void SwEditWin::RequestHelp(const HelpEv
                 case SW_TABROW_VERT:
                     nTabRes = STR_TABLE_ROW_ADJUST;
                     break;
-                // --> FME 2004-07-30 #i32329# Enhanced table selection
                 case SW_TABSEL_HORI:
                 case SW_TABSEL_HORI_RTL:
                 case SW_TABSEL_VERT:
@@ -434,7 +407,6 @@ void SwEditWin::RequestHelp(const HelpEv
                 case SW_TABCOLSEL_VERT:
                     nTabRes = STR_TABLE_SELECT_COL;
                     break;
-                // <--
             }
             if(nTabRes)
             {

Modified: openoffice/branches/alg/aw080/main/sw/source/ui/docvw/edtwin3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/ui/docvw/edtwin3.cxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sw/source/ui/docvw/edtwin3.cxx (original)
+++ openoffice/branches/alg/aw080/main/sw/source/ui/docvw/edtwin3.cxx Wed Nov 27 17:25:40 2013
@@ -142,6 +142,34 @@ sal_Bool SwEditWin::RulerMarginDrag( con
     return !rRuler.StartDocDrag( rMEvt, RULER_TYPE_INDENT);
 }
 // <--
+//IAccessibility2 Impplementaton 2009-----
+void AccessibilityScrollMDI(ViewShell* pVwSh, const SwRect& rRect , sal_uInt16 nRangeX, sal_uInt16 nRangeY, sal_Bool isLeftTop)
+{
+	SfxViewShell *pSfxVwSh = pVwSh->GetSfxViewShell();
+	SwView* pView = dynamic_cast< SwView* >(pSfxVwSh);
+
+	if(pView)
+	{
+		Size aSz( rRect.Left(), rRect.Top());
+		aSz = pView->GetEditWin().PixelToLogic( aSz );
+
+		Point aTopLeft( aSz.Width(), aSz.Height() );
+		Point aPoint;
+		Rectangle aRect(aTopLeft,aPoint);
+
+		sal_Bool bIsCrsrAtTop = pView->IsCrsrAtTop();
+		sal_Bool bIsCrsrAtCenter = pView->IsCrsrAtCenter();
+		if(isLeftTop)
+			pView->SetCrsrAtTop(sal_True);
+
+		pView->Scroll( aRect, nRangeX, nRangeY );
+
+		if(isLeftTop)
+			pView->SetCrsrAtTop(bIsCrsrAtTop, bIsCrsrAtCenter);
+	}
+
+}
+//-----IAccessibility2 Impplementaton 2009
 
 LAYOUT_NS Dialog* GetSearchDialog()
 {

Modified: openoffice/branches/alg/aw080/main/sw/source/ui/envelp/envfmt.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/ui/envelp/envfmt.cxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sw/source/ui/envelp/envfmt.cxx (original)
+++ openoffice/branches/alg/aw080/main/sw/source/ui/envelp/envfmt.cxx Wed Nov 27 17:25:40 2013
@@ -300,7 +300,6 @@ IMPL_LINK( SwEnvFmtPage, EditHdl, MenuBu
                     pCollSet->Put( aTmpBrush );
 				}
 				aOutputSet.ClearItem( RES_BACKGROUND );
-				//pColl->SetAttr( aTmpSet );
                 pCollSet->Put(aOutputSet);
 			}
 			delete pDlg;
@@ -354,7 +353,6 @@ IMPL_LINK( SwEnvFmtPage, EditHdl, MenuBu
 				}
 				if( pOutputSet->Count() )
 				{
-					//pColl->SetAttr( *pOutputSet );
                     pCollSet->Put(*pOutputSet);
 				}
 			}

Modified: openoffice/branches/alg/aw080/main/sw/source/ui/fldui/fldedt.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/ui/fldui/fldedt.cxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sw/source/ui/fldui/fldedt.cxx (original)
+++ openoffice/branches/alg/aw080/main/sw/source/ui/fldui/fldedt.cxx Wed Nov 27 17:25:40 2013
@@ -33,45 +33,24 @@
 #include <sfx2/app.hxx>
 #include <svx/optgenrl.hxx>
 #include <docufld.hxx>
-#ifndef _VIEW_HXX
+#include <expfld.hxx>
 #include <view.hxx>
-#endif
 #include <dbfld.hxx>
 #include <wrtsh.hxx>
-#ifndef _FLDDB_HXX
 #include <flddb.hxx>
-#endif
-#ifndef _FLDDINF_HXX
 #include <flddinf.hxx>
-#endif
-#ifndef _FLDVAR_HXX
 #include <fldvar.hxx>
-#endif
-#ifndef _FLDDOK_HXX
 #include <flddok.hxx>
-#endif
-#ifndef _FLDFUNC_HXX
 #include <fldfunc.hxx>
-#endif
-#ifndef _FLDREF_HXX
 #include <fldref.hxx>
-#endif
 #include <fldedt.hxx>
 #include <crsskip.hxx>
 
 
-#ifndef _CMDID_H
 #include <cmdid.h>
-#endif
-#ifndef _HELPID_H
 #include <helpid.h>
-#endif
-#ifndef _GLOBALS_HRC
 #include <globals.hrc>
-#endif
-#ifndef _FLDUI_HRC
 #include <fldui.hrc>
-#endif
 #include "swabstdlg.hxx"
 #include "dialog.hrc"
 
@@ -103,10 +82,21 @@ SwFldEditDlg::SwFldEditDlg(SwView& rVw) 
 
 	pSh->SetCareWin(this);
 
-    /* #108536# Only create selection if there is none
-        already. Normalize PaM instead of swapping. */
+    if ( pSh->CrsrInsideInputFld() )
+    {
+        // move cursor to start of Input Field
+        SwInputField* pInputFld = dynamic_cast<SwInputField*>(pCurFld);
+        if ( pInputFld != NULL
+             && pInputFld->GetFmtFld() != NULL )
+        {
+            pSh->GotoField( *(pInputFld->GetFmtFld()) );
+        }
+    }
+
     if ( ! pSh->HasSelection() )
+    {
         pSh->Right(CRSR_SKIP_CHARS, sal_True, 1, sal_False );
+    }
 
 	pSh->NormalizePam();
 

Modified: openoffice/branches/alg/aw080/main/sw/source/ui/fldui/fldmgr.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/ui/fldui/fldmgr.cxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sw/source/ui/fldui/fldmgr.cxx (original)
+++ openoffice/branches/alg/aw080/main/sw/source/ui/fldui/fldmgr.cxx Wed Nov 27 17:25:40 2013
@@ -343,7 +343,7 @@ SwField* SwFldMgr::GetCurFld()
 {
 	SwWrtShell *pSh = pWrtShell ? pWrtShell : ::lcl_GetShell();
 	if ( pSh )
-		pCurFld = pSh->GetCurFld();
+		pCurFld = pSh->GetCurFld( true );
 	else
 		pCurFld = NULL;
 
@@ -818,10 +818,12 @@ sal_Bool SwFldMgr::GoNextPrev( sal_Bool 
 	if (pTyp && pTyp->Which() == RES_DBFLD)
 	{
 		// Fuer Feldbefehl-bearbeiten (alle DB-Felder anspringen)
-		return pSh->MoveFldType( 0, bNext, USHRT_MAX, RES_DBFLD );
+		return pSh->MoveFldType( 0, (bNext ? true : false), RES_DBFLD );
 	}
 
-	return pTyp && pSh ? pSh->MoveFldType( pTyp, bNext ) : sal_False;
+    return (pTyp && pSh)
+           ? pSh->MoveFldType( pTyp, (bNext ? true : false) )
+           : sal_False;
 }
 
 /*--------------------------------------------------------------------
@@ -1008,7 +1010,7 @@ sal_Bool SwFldMgr::InsertFld(  const SwI
 		{
             if( rData.sPar1.Len() > 0 && CanInsertRefMark( rData.sPar1 ) )
 			{
-                pCurShell->SetAttr( SwFmtRefMark( rData.sPar1 ) );
+                pCurShell->SetAttrItem( SwFmtRefMark( rData.sPar1 ) );
 				return sal_True;
 			}
 			return sal_False;
@@ -1236,13 +1238,13 @@ sal_Bool SwFldMgr::InsertFld(  const SwI
 			}
 			else
 			{
-				SwInputFieldType* pTyp =
+                SwInputFieldType* pTyp =
                     (SwInputFieldType*)pCurShell->GetFldType(0, RES_INPUTFLD);
 
-				SwInputField* pInpFld =
-                    new SwInputField(pTyp, rData.sPar1, rData.sPar2, nSubType|nsSwExtendedSubType::SUB_INVISIBLE, nFormatId);
-				pFld = pInpFld;
-			}
+                SwInputField* pInpFld =
+                    new SwInputField( pTyp, rData.sPar1, rData.sPar2, nSubType|nsSwExtendedSubType::SUB_INVISIBLE, nFormatId);
+                pFld = pInpFld;
+            }
 
 			// Dialog starten
 			//

Modified: openoffice/branches/alg/aw080/main/sw/source/ui/frmdlg/column.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/ui/frmdlg/column.cxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sw/source/ui/frmdlg/column.cxx (original)
+++ openoffice/branches/alg/aw080/main/sw/source/ui/frmdlg/column.cxx Wed Nov 27 17:25:40 2013
@@ -517,8 +517,35 @@ SwColumnPage::SwColumnPage(Window *pPare
 							| WB_ITEMBORDER
 							| WB_DOUBLEBORDER );
 
+//IAccessibility2 Impplementaton 2009-----
     for( i = 0; i < 5; i++)
-		aDefaultVS.InsertItem( i + 1, i );
+		//Solution:Set accessible name one be one
+		//aDefaultVS.InsertItem( i + 1, i );
+		{
+			String aItemText;
+			switch( i )
+			{
+				case 0:
+					aItemText =  SW_RESSTR( STR_COLUMN_VALUESET_ITEM0 ) ;
+					break;
+				case 1:
+					aItemText =  SW_RESSTR( STR_COLUMN_VALUESET_ITEM1 ) ;
+					break;
+				case 2:
+					aItemText =  SW_RESSTR( STR_COLUMN_VALUESET_ITEM2 ) ;
+					break;
+				case 3:
+					aItemText =  SW_RESSTR( STR_COLUMN_VALUESET_ITEM3 );
+					break;
+				case 4:
+					aItemText =  SW_RESSTR( STR_COLUMN_VALUESET_ITEM4 );
+					break;
+				default:
+					break;	
+			}
+			aDefaultVS.InsertItem( i + 1,  aItemText, i );
+		}
+//-----IAccessibility2 Impplementaton 2009
 
 	aDefaultVS.SetSelectHdl(LINK(this, SwColumnPage, SetDefaultsHdl));
 
@@ -968,7 +995,14 @@ IMPL_LINK( SwColumnPage, ColModify, Nume
 	// #i17816# changing the displayed types within the ValueSet
 	//from two columns to two columns with different settings doesn't invalidate the
 	// example windows in ::ColModify()
-    if(!pNF ||(pColMgr->GetCount() != nCols))
+//IAccessibility2 Impplementaton 2009-----
+// the pColMgr->GetCount()'s return is some how bugged,
+// it will return 0 when actual count is 1, so fix it.
+    //if(!pNF ||(pColMgr->GetCount() != nCols))
+	int nTemp = pColMgr->GetCount();
+	if(nTemp == 0) nTemp = 1;
+    if( nTemp != nCols )
+//-----IAccessibility2 Impplementaton 2009
     {
         if(pNF)
             aDefaultVS.SetNoSelection();

Modified: openoffice/branches/alg/aw080/main/sw/source/ui/frmdlg/column.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/ui/frmdlg/column.hrc?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sw/source/ui/frmdlg/column.hrc (original)
+++ openoffice/branches/alg/aw080/main/sw/source/ui/frmdlg/column.hrc Wed Nov 27 17:25:40 2013
@@ -75,8 +75,15 @@
 #define FT_TEXTDIRECTION        60
 #define LB_TEXTDIRECTION        61
 #define FL_VERT                 62
+//IAccessibility2 Impplementaton 2009-----
+#define STR_PAGESETUP_SPACING		32765
+//-----IAccessibility2 Impplementaton 2009
 #define LISTBOX_SELECTION		0
 #define LISTBOX_SECTION			1
 #define LISTBOX_SECTIONS		2
 #define LISTBOX_PAGE			3
 #define LISTBOX_FRAME			4
+
+//IAccessibility2 Impplementaton 2009-----
+#define STR_COLUMN_WIDTH	63
+//-----IAccessibility2 Impplementaton 2009

Modified: openoffice/branches/alg/aw080/main/sw/source/ui/frmdlg/frmpage.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/ui/frmdlg/frmpage.cxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sw/source/ui/frmdlg/frmpage.cxx (original)
+++ openoffice/branches/alg/aw080/main/sw/source/ui/frmdlg/frmpage.cxx Wed Nov 27 17:25:40 2013
@@ -639,11 +639,15 @@ sal_uLong lcl_GetLBRelationsForStrID( co
 
 namespace
 {
-	void HandleAutoCB( sal_Bool _bChecked, FixedText& _rFT_man, FixedText& _rFT_auto )
+	//IAccessibility2 Implementation 2009-----
+	void HandleAutoCB( sal_Bool _bChecked, FixedText& _rFT_man, FixedText& _rFT_auto, PercentField& _rPF_Edit)
 	{
 		_rFT_man.Show( !_bChecked );
 		_rFT_auto.Show( _bChecked );
+		String accName = _bChecked ? _rFT_auto.GetText() : _rFT_man.GetText();
+		_rPF_Edit.SetAccessibleName(accName);
 	}
+	//-----IAccessibility2 Implementation 2009
 }
 
 
@@ -2091,14 +2095,18 @@ IMPL_LINK_INLINE_END( SwFrmPage, RealSiz
 IMPL_LINK( SwFrmPage, AutoWidthClickHdl, void*, EMPTYARG )
 {
 	if( !IsInGraficMode() )
-		HandleAutoCB( aAutoWidthCB.IsChecked(), aWidthFT, aWidthAutoFT );
+		//IAccessibility2 Implementation 2009-----
+		HandleAutoCB( aAutoWidthCB.IsChecked(), aWidthFT, aWidthAutoFT, aWidthED );
+		//-----IAccessibility2 Implementation 2009
 	return 0;
 }
 
 IMPL_LINK( SwFrmPage, AutoHeightClickHdl, void*, EMPTYARG )
 {
 	if( !IsInGraficMode() )
-		HandleAutoCB( aAutoHeightCB.IsChecked(), aHeightFT, aHeightAutoFT );
+		//IAccessibility2 Implementation 2009-----
+		HandleAutoCB( aAutoHeightCB.IsChecked(), aHeightFT, aHeightAutoFT, aWidthED );
+		//-----IAccessibility2 Implementation 2009
 	return 0;
 }
 
@@ -2247,14 +2255,18 @@ void SwFrmPage::Init(const SfxItemSet& r
 		SwFrmSize eSize = rSize.GetHeightSizeType();
 		sal_Bool bCheck = eSize != ATT_FIX_SIZE;
 		aAutoHeightCB.Check( bCheck );
-		HandleAutoCB( bCheck, aHeightFT, aHeightAutoFT );
+		//IAccessibility2 Implementation 2009-----
+		HandleAutoCB( bCheck, aHeightFT, aHeightAutoFT, aWidthED );
+		//-----IAccessibility2 Implementation 2009
 		if( eSize == ATT_VAR_SIZE )
 			aHeightED.SetValue( aHeightED.GetMin(), FUNIT_NONE );
 
 		eSize = rSize.GetWidthSizeType();
 		bCheck = eSize != ATT_FIX_SIZE;
 		aAutoWidthCB.Check( bCheck );
-		HandleAutoCB( bCheck, aWidthFT, aWidthAutoFT );
+		//IAccessibility2 Implementation 2009-----
+		HandleAutoCB( bCheck, aWidthFT, aWidthAutoFT, aWidthED );
+		//-----IAccessibility2 Implementation 2009
 		if( eSize == ATT_VAR_SIZE )
 			aWidthED.SetValue( aWidthED.GetMin(), FUNIT_NONE );
 

Modified: openoffice/branches/alg/aw080/main/sw/source/ui/inc/conttree.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/ui/inc/conttree.hxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sw/source/ui/inc/conttree.hxx (original)
+++ openoffice/branches/alg/aw080/main/sw/source/ui/inc/conttree.hxx Wed Nov 27 17:25:40 2013
@@ -36,6 +36,10 @@ class SwGlblDocContents;
 class SwGlblDocContent;
 class SfxObjectShell;
 
+//IAccessibility2 Implementation 2009-----
+//Solution:  Include  SdrObject  class
+class SdrObject;
+//-----IAccessibility2 Implementation 2009
 
 #define EDIT_MODE_EDIT			0
 #define EDIT_MODE_UPD_IDX   	1
@@ -89,7 +93,10 @@ class SwContentTree : public SvTreeListB
 	sal_Bool				bIsImageListInitialized : 1;
 
 	static sal_Bool			bIsInDrag;
-
+	//IAccessibility2 Implementation 2009-----
+	sal_Bool                bIsKeySpace;
+	Rectangle 		    oldRectangle;
+	//-----IAccessibility2 Implementation 2009
 	void 				FindActiveTypeAndRemoveUserData();
 
     using SvLBox::ExecuteDrop;
@@ -144,6 +151,11 @@ protected:
 public:
 	SwContentTree(Window* pParent, const ResId& rResId);
 	~SwContentTree();
+	//IAccessibility2 Implementation 2009-----
+	String  		GetEntryAltText( SvLBoxEntry* pEntry ) const;
+	String  		GetEntryLongDescription( SvLBoxEntry* pEntry ) const;
+	SdrObject* 	GetDrawingObjectsByContent(const SwContent *pCnt);
+	//-----IAccessibility2 Implementation 2009
 
 	sal_Bool			ToggleToRoot();
 	sal_Bool 			IsRoot() const {return bIsRoot;}
@@ -196,6 +208,9 @@ public:
 	virtual void    KeyInput(const KeyEvent& rKEvt);
 	
 	virtual sal_Bool	Select( SvLBoxEntry* pEntry, sal_Bool bSelect=sal_True );
+	//IAccessibility2 Implementation 2009-----
+	virtual sal_Int32  GetEntryRealChildsNum( SvLBoxEntry* pEntry ) const;
+	//-----IAccessibility2 Implementation 2009
 };
 
 

Modified: openoffice/branches/alg/aw080/main/sw/source/ui/inc/edtwin.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/ui/inc/edtwin.hxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sw/source/ui/inc/edtwin.hxx (original)
+++ openoffice/branches/alg/aw080/main/sw/source/ui/inc/edtwin.hxx Wed Nov 27 17:25:40 2013
@@ -297,6 +297,9 @@ public:
 
     SwEditWin(Window *pParent, SwView &);
 	virtual ~SwEditWin();
+	//IAccessibility2 Implementation 2009-----
+	virtual void SwitchView();
+	//-----IAccessibility2 Implementation 2009
 };
 
 #endif

Modified: openoffice/branches/alg/aw080/main/sw/source/ui/inc/pview.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/ui/inc/pview.hxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sw/source/ui/inc/pview.hxx (original)
+++ openoffice/branches/alg/aw080/main/sw/source/ui/inc/pview.hxx Wed Nov 27 17:25:40 2013
@@ -164,6 +164,9 @@ public:
     virtual ::com::sun::star::uno::Reference<
         ::com::sun::star::accessibility::XAccessible>
                     CreateAccessible();
+	//IAccessibility2 Implementation 2009-----
+	virtual void SwitchView();
+	//-----IAccessibility2 Implementation 2009
 };
 
 
@@ -175,7 +178,7 @@ class SW_DLLPUBLIC SwPagePreView: public
 {
 	// ViewWindow und Henkel zur Core
 	// aktuelle Dispatcher-Shell
-	SwPagePreViewWin        aViewWin;
+	SwPagePreViewWin*        pViewWin;//IAccessibility2 Implementation 2009
 	//viewdata of the previous SwView and the new crsrposition
 	String 					sSwViewData,
 	//and the new cursor position if the user double click in the PagePreView
@@ -250,11 +253,11 @@ public:
 	SFX_DECL_INTERFACE(SW_PAGEPREVIEW)
 
 	inline Window*          GetFrameWindow() const { return &(GetViewFrame())->GetWindow(); }
-    inline ViewShell*       GetViewShell() const { return aViewWin.GetViewShell(); }
+    inline ViewShell*       GetViewShell() const { return pViewWin->GetViewShell(); }
 	inline const Rectangle& GetVisArea() const { return aVisArea; }
-	inline void             GrabFocusViewWin() { aViewWin.GrabFocus(); }
+	inline void             GrabFocusViewWin() { pViewWin->GrabFocus(); }
 	inline void             RepaintCoreRect( const SwRect& rRect )
-								{ aViewWin.RepaintCoreRect( rRect ); }
+								{ pViewWin->RepaintCoreRect( rRect ); }
 
 	void            DocSzChgd(const Size& rNewSize);
 	const Size&     GetDocSz() const { return aDocSz; }

Modified: openoffice/branches/alg/aw080/main/sw/source/ui/inc/swlbox.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/ui/inc/swlbox.hxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sw/source/ui/inc/swlbox.hxx (original)
+++ openoffice/branches/alg/aw080/main/sw/source/ui/inc/swlbox.hxx Wed Nov 27 17:25:40 2013
@@ -115,6 +115,9 @@ public:
 	void					SetStyle(const sal_uInt16 nSt) 	{ nStyle = nSt; 	}
 
 	String					GetText() const;
+//IAccessibility2 Impplementaton 2009-----
+	void					SetText( const XubString& rStr );
+	void					SetText( const XubString& rStr, const Selection& rNewSelection ) { ComboBox::SetText( rStr, rNewSelection ); };
 };
 
 #endif /* _SWLBOX_HXX */

Modified: openoffice/branches/alg/aw080/main/sw/source/ui/inc/swuicnttab.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/ui/inc/swuicnttab.hxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sw/source/ui/inc/swuicnttab.hxx (original)
+++ openoffice/branches/alg/aw080/main/sw/source/ui/inc/swuicnttab.hxx Wed Nov 27 17:25:40 2013
@@ -286,6 +286,12 @@ class SwTokenWindow : public Window
 	Link			aButtonSelectedHdl;
 	Control*		pActiveCtrl;
 	Link			aModifyHdl;
+//IAccessibility2 Impplementaton 2009-----
+	String 	 	accessibleName;
+	String		sAdditionalAccnameString1;
+	String		sAdditionalAccnameString2;
+	String		sAdditionalAccnameString3;
+//-----IAccessibility2 Impplementaton 2009
 
 	SwTOXEntryTabPage*	m_pParent;
 
@@ -337,6 +343,11 @@ public:
 
 	virtual void		Resize();
     virtual void        GetFocus();
+//IAccessibility2 Impplementaton 2009-----
+	void SetFocus2theAllBtn();
+private:	
+	sal_uInt32 GetControlIndex(FormTokenType eType, const Control* pCurControl) const;
+//-----IAccessibility2 Impplementaton 2009
 };
 /* -----------------------------23.12.99 14:16--------------------------------
 
@@ -482,6 +493,10 @@ public:
 	String 				GetLevelHelp(sal_uInt16 nLevel) const;
 
 	void 				PreTokenButtonRemoved(const SwFormToken& rToken);
+//IAccessibility2 Impplementaton 2009-----
+	void SetFocus2theAllBtn();
+	virtual long Notify( NotifyEvent& rNEvt );
+//-----IAccessibility2 Impplementaton 2009
 };
 /* -----------------05.07.99 13:00-------------------
 

Modified: openoffice/branches/alg/aw080/main/sw/source/ui/inc/view.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/ui/inc/view.hxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sw/source/ui/inc/view.hxx (original)
+++ openoffice/branches/alg/aw080/main/sw/source/ui/inc/view.hxx Wed Nov 27 17:25:40 2013
@@ -200,7 +200,10 @@ class SW_DLLPUBLIC SwView: public SfxVie
 						sNewCrsrPos;
     // to support keyboard the number of the page to go to can be set too
     sal_uInt16              nNewPage;
-
+	//IAccessibility2 Implementation 2009-----
+	sal_uInt16			nOldPageNum;
+	String			nOldSectionName;
+	//-----IAccessibility2 Implementation 2009
 	Point				aTabColFromDocPos;	//Verschieben von Tabellenspalten aus
 											//aus dem Dokument heraus.
     SwTxtNode           * pNumRuleNodeFromDoc; // Moving indent of numrule #i23726#

Modified: openoffice/branches/alg/aw080/main/sw/source/ui/inc/wrtsh.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/ui/inc/wrtsh.hxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sw/source/ui/inc/wrtsh.hxx (original)
+++ openoffice/branches/alg/aw080/main/sw/source/ui/inc/wrtsh.hxx Wed Nov 27 17:25:40 2013
@@ -256,7 +256,7 @@ typedef sal_Bool (SwWrtShell:: *FNSimple
 	sal_Bool	PageCrsr(SwTwips lOffset, sal_Bool bSelect);
 
 	// Felder Update
-	void	UpdateInputFlds( SwInputFieldList* pLst = 0, sal_Bool bOnlyInSel = sal_False );
+	void	UpdateInputFlds( SwInputFieldList* pLst = 0 );
 
 	void	NoEdit(sal_Bool bHideCrsr = sal_True);
 	void	Edit();
@@ -446,9 +446,6 @@ typedef sal_Bool (SwWrtShell:: *FNSimple
 	void NavigatorPaste( const NaviContentBookmark& rBkmk,
 						 const sal_uInt16 nAction );
 
-	// die Core erzeugt eine Selektion, das SttSelect muss gerufen werden
-	virtual void NewCoreSelection();
-
 	virtual void ApplyViewOptions( const SwViewOption &rOpt );
 
 	// autom. Update von Vorlagen

Modified: openoffice/branches/alg/aw080/main/sw/source/ui/index/cnttab.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/ui/index/cnttab.cxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sw/source/ui/index/cnttab.cxx (original)
+++ openoffice/branches/alg/aw080/main/sw/source/ui/index/cnttab.cxx Wed Nov 27 17:25:40 2013
@@ -1860,7 +1860,15 @@ void	SwTOXEdit::KeyInput( const KeyEvent
 			bNextControl = sal_False;
 			bCall = sal_True;
 		}
-
+//IAccessibility2 Impplementaton 2009-----
+		else if ( (aCode.GetCode() == KEY_F3) && aCode.IsShift() && !aCode.IsMod1() && !aCode.IsMod2() )
+		{
+			if ( m_pParent )
+			{
+				m_pParent->SetFocus2theAllBtn();
+			}
+		}
+//-----IAccessibility2 Impplementaton 2009
 		if(bCall && aPrevNextControlLink.IsSet())
 			aPrevNextControlLink.Call(this);
 
@@ -1996,6 +2004,15 @@ void	SwTOXButton::KeyInput( const KeyEve
 		//this is invalid here
 		return;
 	}
+//IAccessibility2 Impplementaton 2009-----
+	else if ( (aCode.GetCode() == KEY_F3) && aCode.IsShift() && !aCode.IsMod1() && !aCode.IsMod2() )
+	{
+		if ( m_pParent )
+		{
+			m_pParent->SetFocus2theAllBtn();
+		}
+	}
+//-----IAccessibility2 Impplementaton 2009
 	if(bCall && aPrevNextControlLink.IsSet())
 			aPrevNextControlLink.Call(this);
 	else
@@ -2644,6 +2661,30 @@ void SwTOXEntryTabPage::PreTokenButtonRe
 	sal_uInt16 nPos = aAuthFieldsLB.InsertEntry(sTemp);
 	aAuthFieldsLB.SetEntryData(nPos, (void*)(nData));
 }
+//IAccessibility2 Impplementaton 2009-----
+void SwTOXEntryTabPage::SetFocus2theAllBtn()
+{
+	aAllLevelsPB.GrabFocus();
+}
+long SwTOXEntryTabPage::Notify( NotifyEvent& rNEvt )
+{
+	if ( rNEvt.GetType() == EVENT_KEYINPUT )
+	{
+		const KeyEvent& rKEvt = *rNEvt.GetKeyEvent();
+		KeyCode aCode = rKEvt.GetKeyCode();
+		if ( (aCode.GetCode() == KEY_F4) && aCode.IsShift() && !aCode.IsMod1() && !aCode.IsMod2() )		
+		{
+			if ( aTokenWIN.GetActiveControl() )
+			{
+				aTokenWIN.GetActiveControl()->GrabFocus();
+			}
+		}
+
+	}
+
+	return SfxTabPage::Notify( rNEvt );
+}
+//-----IAccessibility2 Impplementaton 2009
 /*-- 16.06.99 10:47:35---------------------------------------------------
 
 This function inizializes the default value in the Token
@@ -3137,7 +3178,12 @@ SwTokenWindow::SwTokenWindow(SwTOXEntryT
 			nHelpId = STR_TOKEN_HELP_ENTRY;
 		aButtonHelpTexts[i] = String(ResId(nHelpId, *rResId.GetResMgr()));
 	}
-
+//IAccessibility2 Impplementaton 2009-----
+	accessibleName = String(SW_RES(STR_STRUCTURE));
+	sAdditionalAccnameString1 = String(SW_RES(STR_ADDITIONAL_ACCNAME_STRING1));
+	sAdditionalAccnameString2 = String(SW_RES(STR_ADDITIONAL_ACCNAME_STRING2));
+	sAdditionalAccnameString3 = String(SW_RES(STR_ADDITIONAL_ACCNAME_STRING3));
+//-----IAccessibility2 Impplementaton 2009
 	FreeResource();
 
 	Link aLink(LINK(this, SwTokenWindow, ScrollHdl));
@@ -3295,6 +3341,32 @@ Control*	SwTokenWindow::InsertItem(const
 		pEdit->SetPosPixel(aControlPos);
 		aControlList.Insert(pEdit, aControlList.Count());
 		pEdit->SetText(rText);
+//IAccessibility2 Impplementaton 2009-----
+		sal_uInt32 nIndex = GetControlIndex( TOKEN_TEXT, pEdit );
+		String s1 = String::CreateFromAscii(" (");
+		String s2 = String::CreateFromAscii(")");
+		String s3 = String::CreateFromAscii(", ");
+		String strName(accessibleName);
+		strName += String::CreateFromInt32(nIndex);
+		if ( nIndex == 1 )
+		{
+			/*Press left or right arrow to choose the structure controls*/
+			strName += s1;
+			strName += sAdditionalAccnameString2;
+			strName += s3;
+			/*Press Ctrl+Alt+A to move focus for more operations*/
+			strName += sAdditionalAccnameString1;
+			strName += s3;
+			/*Press Ctrl+Alt+B to move focus back to the current structure control*/
+			strName += sAdditionalAccnameString3;
+			strName += s2;
+			pEdit->SetAccessibleName(strName);
+		}
+		else
+		{
+			pEdit->SetAccessibleName(strName);
+		}
+//-----IAccessibility2 Impplementaton 2009
 	 	Size aEditSize(aControlSize);
 		aEditSize.Width() = pEdit->GetTextWidth(rText) + EDIT_MINWIDTH;
 		pEdit->SetSizePixel(aEditSize);
@@ -3325,6 +3397,17 @@ Control*	SwTokenWindow::InsertItem(const
 						(ToxAuthorityField)rToken.nAuthorityField));
 			pButton->SetText(sTmp.Copy(0, 2));
 		}
+//IAccessibility2 Impplementaton 2009-----
+		String sSpace = String::CreateFromAscii(" ");
+		sal_uInt32 nIndex = GetControlIndex( rToken.eTokenType, pButton );
+		String sAccName = aButtonHelpTexts[rToken.eTokenType];
+		if ( nIndex )
+		{
+			sAccName += sSpace;
+			sAccName += String::CreateFromInt32(nIndex);
+		}
+		pButton->SetAccessibleName( sAccName );
+//-----IAccessibility2 Impplementaton 2009
 		pButton->Show();
 		pRet = pButton;
 	}
@@ -3466,6 +3549,32 @@ void	SwTokenWindow::InsertAtSelection(
 		SwTOXEdit* pEdit = new SwTOXEdit(&aCtrlParentWin, this, aTmpToken);
 		aControlList.Insert(pEdit, nActivePos + 1);
 		pEdit->SetText(sRight);
+//IAccessibility2 Impplementaton 2009-----
+		sal_uInt32 nIndex = GetControlIndex( TOKEN_TEXT, pEdit );
+		String s1 = String::CreateFromAscii(" (");
+		String s2 = String::CreateFromAscii(")");
+		String s3 = String::CreateFromAscii(", ");
+		String strName(accessibleName);
+		strName += String::CreateFromInt32(nIndex);
+		if ( nIndex == 1)
+		{
+			/*Press left or right arrow to choose the structure controls*/
+			strName += s1;
+			strName += sAdditionalAccnameString2;
+			strName += s3;
+			/*Press Ctrl+Alt+A to move focus for more operations*/
+			strName += sAdditionalAccnameString1;
+			strName += s3;
+			/*Press Ctrl+Alt+B to move focus back to the current structure control*/
+			strName += sAdditionalAccnameString3;
+			strName += s2;
+			pEdit->SetAccessibleName(strName);
+		}
+		else
+		{
+			pEdit->SetAccessibleName(strName);
+		}
+//-----IAccessibility2 Impplementaton 2009
 		pEdit->SetSizePixel(aControlSize);
 		pEdit->AdjustSize();
 		pEdit->SetModifyHdl(LINK(this, SwTokenWindow, EditResize ));
@@ -3495,6 +3604,17 @@ void	SwTokenWindow::InsertAtSelection(
 		pButton->SetText(sTmp.Copy(0, 2));
 	}
 
+//IAccessibility2 Impplementaton 2009-----
+	String sSpace = String::CreateFromAscii(" ");
+	sal_uInt32 nIndex = GetControlIndex( rToken.eTokenType, pButton );
+	String sAccName = aButtonHelpTexts[rToken.eTokenType];
+	if ( nIndex )
+	{
+		sAccName += sSpace;
+		sAccName += String::CreateFromInt32(nIndex);
+	}
+	pButton->SetAccessibleName( sAccName );
+//-----IAccessibility2 Impplementaton 2009
     Size aEditSize(GetOutputSizePixel());
 	aEditSize.Width() = pButton->GetTextWidth(rText) + 5;
 	pButton->SetSizePixel(aEditSize);
@@ -3922,6 +4042,41 @@ void SwTokenWindow::GetFocus()
        }
     }
 }
+//IAccessibility2 Impplementaton 2009-----
+void SwTokenWindow::SetFocus2theAllBtn()
+{
+	if (m_pParent)
+	{
+		m_pParent->SetFocus2theAllBtn();
+	}
+}
+sal_uInt32 SwTokenWindow::GetControlIndex(FormTokenType eType, const Control* pCurControl) const
+{
+	//there are only one entry-text button and only one page-number button,
+	//so we need not add index for these two buttons.
+	if ( eType == TOKEN_ENTRY_TEXT || eType == TOKEN_PAGE_NUMS )
+	{
+		return 0;
+	}
+
+	sal_uInt32 nIndex = 0;
+	const Control* pControl = ((SwTokenWindow*)this)->aControlList.First();
+	while(pControl)
+	{
+		const SwFormToken& rNewToken = WINDOW_EDIT == pControl->GetType()
+			? ((SwTOXEdit*)pControl)->GetFormToken()
+			: ((SwTOXButton*)pControl)->GetFormToken();
+
+		if(eType == rNewToken.eTokenType)
+		{
+			nIndex++;
+		}
+		pControl = ((SwTokenWindow*)this)->aControlList.Next();
+	}
+	
+	return nIndex;
+}
+//-----IAccessibility2 Impplementaton 2009
 /* -----------------25.03.99 15:17-------------------
  *
  * --------------------------------------------------*/

Modified: openoffice/branches/alg/aw080/main/sw/source/ui/index/cnttab.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/ui/index/cnttab.hrc?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sw/source/ui/index/cnttab.hrc (original)
+++ openoffice/branches/alg/aw080/main/sw/source/ui/index/cnttab.hrc Wed Nov 27 17:25:40 2013
@@ -169,7 +169,12 @@
 #define STR_TOKEN_HELP_AUTHORITY     (STR_BUTTON_HELP_TEXT_START + 9)
 
 #define STR_CHARSTYLE				(STR_TOKEN_HELP_AUTHORITY + 1)
-
+//IAccessibility2 Impplementaton 2009-----
+#define STR_STRUCTURE	(STR_TOKEN_HELP_AUTHORITY + 2)
+#define STR_ADDITIONAL_ACCNAME_STRING1 (STR_TOKEN_HELP_AUTHORITY + 3)
+#define STR_ADDITIONAL_ACCNAME_STRING2 (STR_TOKEN_HELP_AUTHORITY + 4)
+#define STR_ADDITIONAL_ACCNAME_STRING3 (STR_TOKEN_HELP_AUTHORITY + 5)
+//-----IAccessibility2 Impplementaton 2009
 #define TLB_STYLES				100
 #define FL_STYLES                   101
 #define PB_OK		            102

Modified: openoffice/branches/alg/aw080/main/sw/source/ui/index/cnttab.src
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/ui/index/cnttab.src?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sw/source/ui/index/cnttab.src (original)
+++ openoffice/branches/alg/aw080/main/sw/source/ui/index/cnttab.src Wed Nov 27 17:25:40 2013
@@ -674,6 +674,24 @@ TabPage TP_TOX_ENTRY
 		{
 			Text [ en-US ] = "Character Style: ";
 		};
+//IAccessibility2 Impplementaton 2009-----
+		String STR_STRUCTURE
+		{
+			Text [ en-US ] = "Structure text";
+		};
+		String STR_ADDITIONAL_ACCNAME_STRING1
+		{
+			Text [ en-US ] = "Press Ctrl+Alt+A to move focus for more operations";
+		};
+		String STR_ADDITIONAL_ACCNAME_STRING2
+		{
+			Text [ en-US ] = "Press left or right arrow to choose the structure controls";
+		};
+		String STR_ADDITIONAL_ACCNAME_STRING3
+		{
+			Text [ en-US ] = "Press Ctrl+Alt+B to move focus back to the current structure control";
+		};
+//-----IAccessibility2 Impplementaton 2009
 	};
 	PushButton PB_ALL_LEVELS
 	{

Modified: openoffice/branches/alg/aw080/main/sw/source/ui/lingu/hhcwrp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/ui/lingu/hhcwrp.cxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sw/source/ui/lingu/hhcwrp.cxx (original)
+++ openoffice/branches/alg/aw080/main/sw/source/ui/lingu/hhcwrp.cxx Wed Nov 27 17:25:40 2013
@@ -400,7 +400,7 @@ void SwHHCWrapper::ChangeText_impl( cons
         // was deleted)
         rWrtShell.ResetAttr();
         // apply previously saved attributes to new text
-        rWrtShell.SetAttr( aItemSet );
+        rWrtShell.SetAttrSet( aItemSet );
 	}
 	else
 	{
@@ -512,7 +512,7 @@ void SwHHCWrapper::ReplaceUnit(
         SwPaM *pPaM = rWrtShell.GetCrsr();
         (void)pPaM;
 #endif
-        rWrtShell.SetAttr(*pRuby);
+        rWrtShell.SetAttrItem(*pRuby);
         delete pRuby;
         rWrtShell.EndUndo( UNDO_SETRUBYATTR );
     }
@@ -564,7 +564,7 @@ void SwHHCWrapper::ReplaceUnit(
                 aSet.Put( aFontItem );
             }
 
-			rWrtShell.SetAttr( aSet );
+			rWrtShell.SetAttrSet( aSet );
 
 			rWrtShell.ClearMark();
 		}

Modified: openoffice/branches/alg/aw080/main/sw/source/ui/misc/glossary.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/ui/misc/glossary.hrc?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sw/source/ui/misc/glossary.hrc (original)
+++ openoffice/branches/alg/aw080/main/sw/source/ui/misc/glossary.hrc Wed Nov 27 17:25:40 2013
@@ -84,4 +84,6 @@
 #define   FL_NN              9
 #define   BT_CANCEL			10
 #define   BT_OKNEW			11
-
+//IAccessibility2 Implementation 2009-----
+#define STR_SW_CATEGORY 12
+//-----IAccessibility2 Implementation 2009

Modified: openoffice/branches/alg/aw080/main/sw/source/ui/misc/insfnote.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/ui/misc/insfnote.cxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sw/source/ui/misc/insfnote.cxx (original)
+++ openoffice/branches/alg/aw080/main/sw/source/ui/misc/insfnote.cxx Wed Nov 27 17:25:40 2013
@@ -79,7 +79,7 @@ void __EXPORT SwInsFootNoteDlg::Apply()
 							   rFont.GetStyleName(), rFont.GetPitch(),
                                eCharSet, RES_CHRATR_FONT );
 			aSet.Put( aFont );
-			rSh.SetAttr( aSet, nsSetAttrMode::SETATTR_DONTEXPAND );
+			rSh.SetAttrSet( aSet, nsSetAttrMode::SETATTR_DONTEXPAND );
 			rSh.ResetSelect(0, sal_False);
 			rSh.Left(CRSR_SKIP_CHARS, sal_False, 1, sal_False );
 		}

Modified: openoffice/branches/alg/aw080/main/sw/source/ui/ribbar/inputwin.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/ui/ribbar/inputwin.cxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sw/source/ui/ribbar/inputwin.cxx (original)
+++ openoffice/branches/alg/aw080/main/sw/source/ui/ribbar/inputwin.cxx Wed Nov 27 17:25:40 2013
@@ -47,6 +47,7 @@
 #include "cellatr.hxx"
 #include "edtwin.hxx"
 #include "helpid.h"
+#include "access.hrc"
 
 // nur fuers UpdateRange - Box in dem der gestackte Cursor sthet loeschen
 #include "pam.hxx"
@@ -90,9 +91,16 @@ SwInputWindow::SwInputWindow( Window* pP
 	pWrtShell = pView ? pView->GetWrtShellPtr() : 0;
 
 	InsertWindow( ED_POS, &aPos, 0, 0);
+	//IAccessibility2 Implementation 2009-----
+	SetItemText(ED_POS, String(SW_RES(STR_ACCESS_FORMULA_TYPE)));
+	aPos.SetAccessibleName(String(SW_RES(STR_ACCESS_FORMULA_TYPE)));
+	SetAccessibleName(String(SW_RES(STR_ACCESS_FORMULA_TOOLBAR)));
 	InsertSeparator ( 1 );
 	InsertSeparator ();
 	InsertWindow( ED_FORMULA, &aEdit);
+	SetItemText(ED_FORMULA, String(SW_RES(STR_ACCESS_FORMULA_TEXT)));
+	aEdit.SetAccessibleName(String(SW_RES(STR_ACCESS_FORMULA_TEXT)));
+	//-----IAccessibility2 Implementation 2009
 	SetHelpId(ED_FORMULA, HID_EDIT_FORMULA);
 
     sal_Bool bHC = GetSettings().GetStyleSettings().GetHighContrastMode();

Modified: openoffice/branches/alg/aw080/main/sw/source/ui/ribbar/inputwin.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/ui/ribbar/inputwin.hrc?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sw/source/ui/ribbar/inputwin.hrc (original)
+++ openoffice/branches/alg/aw080/main/sw/source/ui/ribbar/inputwin.hrc Wed Nov 27 17:25:40 2013
@@ -60,6 +60,11 @@
 #define ED_POS				2
 #define ED_FORMULA 			3
 
+//IAccessibility2 Impplementaton 2009-----
+#define STR_ED_POS			1
+#define STR_ED_FORMULA		2
+#define STR_TOOLBAR_FORMULA	35
+//-----IAccessibility2 Impplementaton 2009
 #endif
 
 

Modified: openoffice/branches/alg/aw080/main/sw/source/ui/ribbar/inputwin.src
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/ui/ribbar/inputwin.src?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sw/source/ui/ribbar/inputwin.src (original)
+++ openoffice/branches/alg/aw080/main/sw/source/ui/ribbar/inputwin.src Wed Nov 27 17:25:40 2013
@@ -28,6 +28,8 @@
 #include "globals.hrc"
 #include "ribbar.hrc"
 #include "inputwin.hrc"
+#include "access.hrc"
+
 ToolBox RID_TBX_FORMULA
 {
 	Pos = MAP_APPFONT ( 0 , 0 ) ;
@@ -279,6 +281,20 @@ String STR_TBL_FORMULA
 {
 	Text [ en-US ] = "Text formula" ;
 };
+//IAccessibility2 Impplementaton 2009-----
+String STR_ACCESS_FORMULA_TOOLBAR
+{
+	Text [ en-US ] = "Formula Tool Bar" ;
+};
+String STR_ACCESS_FORMULA_TYPE
+{
+	Text [ en-US ] = "Formula Type" ;
+};
+String STR_ACCESS_FORMULA_TEXT
+{
+	Text [ en-US ] = "Formula Text" ;
+};
+//-----IAccessibility2 Impplementaton 2009
 #define TB_INPUT  \
     ToolBoxItem\
     {\

Modified: openoffice/branches/alg/aw080/main/sw/source/ui/ribbar/workctrl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/ui/ribbar/workctrl.cxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sw/source/ui/ribbar/workctrl.cxx (original)
+++ openoffice/branches/alg/aw080/main/sw/source/ui/ribbar/workctrl.cxx Wed Nov 27 17:25:40 2013
@@ -503,6 +503,15 @@ SwScrollNaviPopup::SwScrollNaviPopup( sa
             sText = String(SW_RES(nResStr));
             nTbxBits = TIB_CHECKABLE;
         }
+		//IAccessibility2 Impplementaton 2009-----
+		else
+		{
+			if (nNaviId == NID_PREV)
+				sText = String(SW_RES(STR_IMGBTN_PGE_UP));
+			else if (nNaviId == NID_NEXT)
+				sText = String(SW_RES(STR_IMGBTN_PGE_DOWN));
+		}
+		//-----IAccessibility2 Impplementaton 2009
         aToolBox.InsertItem(nNaviId, sText, nTbxBits);
         aToolBox.SetHelpId( nNaviId, aNavigationHelpIds[i] );
     }

Modified: openoffice/branches/alg/aw080/main/sw/source/ui/shells/annotsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/ui/shells/annotsh.cxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sw/source/ui/shells/annotsh.cxx (original)
+++ openoffice/branches/alg/aw080/main/sw/source/ui/shells/annotsh.cxx Wed Nov 27 17:25:40 2013
@@ -1093,20 +1093,21 @@ void SwAnnotationShell::StateInsert(SfxI
 
 void SwAnnotationShell::NoteExec(SfxRequest &rReq)
 {
-	SwPostItMgr* pPostItMgr = rView.GetPostItMgr();
-	if ( !pPostItMgr )
-		return;
+    SwPostItMgr* pPostItMgr = rView.GetPostItMgr();
+    if ( !pPostItMgr )
+        return;
 
-	sal_uInt16 nSlot = rReq.GetSlot();
-	switch (nSlot)
-	{
-		case FN_REPLY:
-		case FN_POSTIT:
-		case FN_DELETE_COMMENT:
-            if ( pPostItMgr->HasActiveSidebarWin() )
-                pPostItMgr->GetActiveSidebarWin()->ExecuteCommand(nSlot);
-			break;
-		case FN_DELETE_ALL_NOTES:
+    sal_uInt16 nSlot = rReq.GetSlot();
+    switch (nSlot)
+    {
+    case FN_REPLY:
+    case FN_POSTIT:
+    case FN_DELETE_COMMENT:
+        if ( pPostItMgr->HasActiveSidebarWin() )
+            pPostItMgr->GetActiveSidebarWin()->ExecuteCommand(nSlot);
+        break;
+
+    case FN_DELETE_ALL_NOTES:
 			pPostItMgr->Delete();
 			break;
 		case FN_DELETE_NOTE_AUTHOR:
@@ -1141,31 +1142,32 @@ void SwAnnotationShell::NoteExec(SfxRequ
 
 void SwAnnotationShell::GetNoteState(SfxItemSet &rSet)
 {
-	SwPostItMgr* pPostItMgr = rView.GetPostItMgr();
-	SfxWhichIter aIter(rSet);
-	sal_uInt16 nWhich = aIter.FirstWhich();
+    SwPostItMgr* pPostItMgr = rView.GetPostItMgr();
+    SfxWhichIter aIter(rSet);
+    sal_uInt16 nWhich = aIter.FirstWhich();
     while(nWhich)
-	{
+    {
         sal_uInt16 nSlotId = GetPool().GetSlotId( nWhich );
-		switch( nSlotId )
-		{
-			case FN_POSTIT:
-			case FN_DELETE_NOTE_AUTHOR:
-			case FN_DELETE_ALL_NOTES:
-			case FN_HIDE_NOTE:
-			case FN_HIDE_NOTE_AUTHOR:
-			case FN_HIDE_ALL_NOTES:
-            case FN_DELETE_COMMENT:
-			{
-                if ( !pPostItMgr ||
-                     !pPostItMgr->HasActiveAnnotationWin() )
+        switch( nSlotId )
+        {
+        case FN_POSTIT:
+        case FN_DELETE_NOTE_AUTHOR:
+        case FN_DELETE_ALL_NOTES:
+        case FN_HIDE_NOTE:
+        case FN_HIDE_NOTE_AUTHOR:
+        case FN_HIDE_ALL_NOTES:
+        case FN_DELETE_COMMENT:
+            {
+                if( !pPostItMgr
+                    || !pPostItMgr->HasActiveAnnotationWin() )
                 {
-					rSet.DisableItem(nWhich);
+                    rSet.DisableItem(nWhich);
                 }
-				break;
-			}
-			case FN_REPLY:
-			{
+                break;
+            }
+
+        case FN_REPLY:
+            {
                 if ( !pPostItMgr ||
                      !pPostItMgr->HasActiveAnnotationWin() )
                 {

Modified: openoffice/branches/alg/aw080/main/sw/source/ui/shells/basesh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/ui/shells/basesh.cxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sw/source/ui/shells/basesh.cxx (original)
+++ openoffice/branches/alg/aw080/main/sw/source/ui/shells/basesh.cxx Wed Nov 27 17:25:40 2013
@@ -293,27 +293,26 @@ void SwBaseShell::ExecClpbrd(SfxRequest 
 			}
 			return;
 
-		case SID_PASTE:
-			{
-				TransferableDataHelper aDataHelper(
-						TransferableDataHelper::CreateFromSystemClipboard(
-										&rSh.GetView().GetEditWin() ) );
-
-				if( aDataHelper.GetXTransferable().is() &&
-					SwTransferable::IsPaste( rSh, aDataHelper ))
-				{
-					// temp. Variablen, da die Shell nach dem Paste schon
-					// zerstoert sein kann
-					SwView* pView = &rView;
-					SwTransferable::Paste( rSh, aDataHelper );
-					if( rSh.IsFrmSelected() || rSh.IsObjSelected() )
-						rSh.EnterSelFrmMode();
-					pView->AttrChangedNotify( &rSh );
-				}
-				else
-					return;
-			}
-			break;
+        case SID_PASTE:
+            {
+                TransferableDataHelper aDataHelper(
+                    TransferableDataHelper::CreateFromSystemClipboard( &rSh.GetView().GetEditWin() ) );
+                if( aDataHelper.GetXTransferable().is()
+                    && SwTransferable::IsPaste( rSh, aDataHelper )
+                    && !rSh.CrsrInsideInputFld() )
+                {
+                    // temp. Variablen, da die Shell nach dem Paste schon
+                    // zerstoert sein kann
+                    SwView* pView = &rView;
+                    SwTransferable::Paste( rSh, aDataHelper );
+                    if( rSh.IsFrmSelected() || rSh.IsObjSelected() )
+                        rSh.EnterSelFrmMode();
+                    pView->AttrChangedNotify( &rSh );
+                }
+                else
+                    return;
+            }
+            break;
 
 		case SID_CLIPBOARD_FORMAT_ITEMS:
 			{
@@ -345,13 +344,12 @@ void SwBaseShell::ExecClpbrd(SfxRequest 
 			}
 			break;
 
-		case SID_PASTE_UNFORMATTED:
+        case SID_PASTE_UNFORMATTED:
             {
                 TransferableDataHelper aDataHelper(
-                    TransferableDataHelper::CreateFromSystemClipboard(
-                        &rSh.GetView().GetEditWin()) );
-                if( aDataHelper.GetXTransferable().is() &&
-                    SwTransferable::IsPaste( rSh, aDataHelper ))
+                    TransferableDataHelper::CreateFromSystemClipboard( &rSh.GetView().GetEditWin()) );
+                if( aDataHelper.GetXTransferable().is()
+                    && SwTransferable::IsPaste( rSh, aDataHelper ) )
                 {
                     // temp. Variablen, da die Shell nach dem Paste schon
                     // zerstoert sein kann
@@ -365,60 +363,61 @@ void SwBaseShell::ExecClpbrd(SfxRequest 
                         uno::Reference< frame::XDispatchRecorder > xRecorder =
                             pViewFrame->GetBindings().GetRecorder();
                         if(xRecorder.is()) {
-							SfxRequest aReq( pViewFrame, SID_CLIPBOARD_FORMAT_ITEMS );
-							aReq.AppendItem( SfxUInt32Item( SID_CLIPBOARD_FORMAT_ITEMS, SOT_FORMAT_STRING ) );
-							aReq.Done();
-						}
+                            SfxRequest aReq( pViewFrame, SID_CLIPBOARD_FORMAT_ITEMS );
+                            aReq.AppendItem( SfxUInt32Item( SID_CLIPBOARD_FORMAT_ITEMS, SOT_FORMAT_STRING ) );
+                            aReq.Done();
+                        }
                     }
 
-					if (rSh.IsFrmSelected() || rSh.IsObjSelected())
-						rSh.EnterSelFrmMode();
-					pView->AttrChangedNotify( &rSh );
-				}
-				else
-					return;
-			}
-			break;
+                    if (rSh.IsFrmSelected() || rSh.IsObjSelected())
+                        rSh.EnterSelFrmMode();
+                    pView->AttrChangedNotify( &rSh );
+                }
+                else
+                    return;
+            }
+            break;
 
         case SID_PASTE_SPECIAL:
-			{
-				TransferableDataHelper aDataHelper(
-						TransferableDataHelper::CreateFromSystemClipboard(
-										&rSh.GetView().GetEditWin()) );
-				if( aDataHelper.GetXTransferable().is() &&
-					SwTransferable::IsPaste( rSh, aDataHelper ))
-				{
-					// temp. Variablen, da die Shell nach dem Paste schon
-					// zerstoert sein kann
-					SwView* pView = &rView;
+            {
+                TransferableDataHelper aDataHelper(
+                    TransferableDataHelper::CreateFromSystemClipboard( &rSh.GetView().GetEditWin()) );
+                if( aDataHelper.GetXTransferable().is()
+                    && SwTransferable::IsPaste( rSh, aDataHelper )
+                    && !rSh.CrsrInsideInputFld() )
+                {
+                    // temp. Variablen, da die Shell nach dem Paste schon
+                    // zerstoert sein kann
+                    SwView* pView = &rView;
                     sal_uLong nFormatId = 0;
                     rReq.Ignore();
                     bIgnore = sal_True;
                     int nRet = SwTransferable::PasteSpecial( rSh, aDataHelper, nFormatId );
                     if(nRet)// && rReq.IsRecording() )
                     {
-		                SfxViewFrame* pViewFrame = pView->GetViewFrame();
+                        SfxViewFrame* pViewFrame = pView->GetViewFrame();
                         uno::Reference< frame::XDispatchRecorder > xRecorder =
-								pViewFrame->GetBindings().GetRecorder();
-						if(xRecorder.is()) {
-							SfxRequest aReq( pViewFrame, SID_CLIPBOARD_FORMAT_ITEMS );
-							aReq.AppendItem( SfxUInt32Item( SID_CLIPBOARD_FORMAT_ITEMS, nFormatId ) );
-							aReq.Done();
-						}
+                            pViewFrame->GetBindings().GetRecorder();
+                        if(xRecorder.is()) {
+                            SfxRequest aReq( pViewFrame, SID_CLIPBOARD_FORMAT_ITEMS );
+                            aReq.AppendItem( SfxUInt32Item( SID_CLIPBOARD_FORMAT_ITEMS, nFormatId ) );
+                            aReq.Done();
+                        }
                     }
 
-					if (rSh.IsFrmSelected() || rSh.IsObjSelected())
-						rSh.EnterSelFrmMode();
-					pView->AttrChangedNotify( &rSh );
-				}
-				else
-					return;
-			}
-			break;
-		default:
-			DBG_ERROR("falscher Dispatcher");
-			return;
-	}
+                    if (rSh.IsFrmSelected() || rSh.IsObjSelected())
+                        rSh.EnterSelFrmMode();
+                    pView->AttrChangedNotify( &rSh );
+                }
+                else
+                    return;
+            }
+            break;
+
+        default:
+            DBG_ERROR("falscher Dispatcher");
+            return;
+    }
     if(!bIgnore)
         rReq.Done();
 }
@@ -451,18 +450,28 @@ void SwBaseShell::StateClpbrd(SfxItemSet
 				rSet.DisableItem( nWhich );
 			break;
 
-		case SID_PASTE:
-            if( !GetView().IsPasteAllowed() )
-				rSet.DisableItem( SID_PASTE );
-			break;
+        case SID_PASTE:
+            if( !GetView().IsPasteAllowed()
+                || rSh.CrsrInsideInputFld() )
+            {
+                rSet.DisableItem( nWhich );
+            }
+            break;
 
         case SID_PASTE_SPECIAL:
+            if( !GetView().IsPasteSpecialAllowed()
+                || rSh.CrsrInsideInputFld() )
+            {
+                rSet.DisableItem( nWhich );
+            }
+            break;
+
+        case SID_PASTE_UNFORMATTED:
             if( !GetView().IsPasteSpecialAllowed() )
-			{
-                rSet.DisableItem( SID_PASTE_SPECIAL );
-				rSet.DisableItem( SID_PASTE_UNFORMATTED );
-			}
-			break;
+            {
+                rSet.DisableItem( nWhich );
+            }
+            break;
 
 		case SID_CLIPBOARD_FORMAT_ITEMS:
 			{
@@ -659,9 +668,10 @@ void SwBaseShell::Execute(SfxRequest &rR
 			}
 			break;
 
-		case FN_UPDATE_INPUTFIELDS:
-			rSh.UpdateInputFlds(NULL, sal_False);
-			break;
+        case FN_UPDATE_INPUTFIELDS:
+            rSh.UpdateInputFlds();
+            break;
+
 		case FN_PREV_BOOKMARK:
 			rReq.SetReturnValue(SfxBoolItem( nSlot, rSh.GoPrevBookmark()));
 			break;
@@ -691,7 +701,7 @@ void SwBaseShell::Execute(SfxRequest &rR
 					rSh.ClearMark();
 					rSh.EndSelect();
 				}
-				sal_Bool bRet = rSh.MoveFldType(pFldType, nSlot == FN_GOTO_NEXT_MARK);
+				sal_Bool bRet = rSh.MoveFldType( pFldType, nSlot == FN_GOTO_NEXT_MARK );
                 SwField* pCurField = bRet ? rSh.GetCurFld() : 0;
                 if (pCurField)
 					rSh.ClickToField(*pCurField);
@@ -1228,7 +1238,7 @@ void SwBaseShell::Execute(SfxRequest &rR
 			}
 			else
 			{
-				rSh.SetAttr( *pArgs );
+				rSh.SetAttrSet( *pArgs );
 			}
 			rSh.EndAllAction();
 		}
@@ -1261,7 +1271,7 @@ void SwBaseShell::Execute(SfxRequest &rR
 			else
 			{
 				// Umrandungsattribute ganz normal ueber Shell setzen
-				rSh.SetAttr( *pItem );
+				rSh.SetAttrItem( *pItem );
 			}
 		}
 		break;
@@ -1395,10 +1405,14 @@ void SwBaseShell::GetState( SfxItemSet &
 				break;
 
             case FN_INSERT_REGION:
-				if( rSh.IsSelFrmMode() ||
-					!rSh.IsInsRegionAvailable() )
-					rSet.DisableItem( nWhich );
-				break;
+                if( rSh.CrsrInsideInputFld()
+                    || rSh.IsSelFrmMode()
+                    || !rSh.IsInsRegionAvailable() )
+                {
+                    rSet.DisableItem( nWhich );
+                }
+                break;
+
             case FN_CONVERT_TABLE_TO_TEXT:
             {
                 sal_uInt16 eFrmType = rSh.GetFrmType(0,sal_True);
@@ -2127,7 +2141,7 @@ void SwBaseShell::ExecTxtCtrl( SfxReques
 
             if (!bAuto)
             {
-                rSh.SetAttr( *pArgs );
+                rSh.SetAttrSet( *pArgs );
             }
         }
 		delete pSSetItem;
@@ -2392,7 +2406,7 @@ void SwBaseShell::ExecBckCol(SfxRequest&
 			rSh.AutoUpdatePara( pColl, aSet);
 		}
 		else
-			rSh.SetAttr( aBrushItem );
+			rSh.SetAttrItem( aBrushItem );
 	}
 
     rReq.Done();
@@ -2530,7 +2544,7 @@ void SwBaseShell::ExecDlg(SfxRequest &rR
                 DBG_ASSERT(pDlg, "Dialogdiet fail!");
 				if ( pDlg->Execute() == RET_OK )
 				{
-					rSh.SetAttr( *pDlg->GetOutputItemSet() );
+					rSh.SetAttrSet( *pDlg->GetOutputItemSet() );
 					pOutSet = pDlg->GetOutputItemSet();
 				}
 			}
@@ -2598,7 +2612,7 @@ void SwBaseShell::ExecDlg(SfxRequest &rR
                 DBG_ASSERT(pDlg, "Dialogdiet fail!");
 				if ( pDlg->Execute() == RET_OK )
 				{
-					rSh.SetAttr( *pDlg->GetOutputItemSet() );
+					rSh.SetAttrSet( *pDlg->GetOutputItemSet() );
 					pOutSet = pDlg->GetOutputItemSet();
 				}
 			}
@@ -2881,7 +2895,7 @@ void SwBaseShell::ExecuteGallery(SfxRequ
 			SvxBrushItem aBrush( *pBrush );
 			aBrush.SetWhich( RES_BACKGROUND );
 			if ( nPos == nParagraphPos )
-				rSh.SetAttr( aBrush );
+				rSh.SetAttrItem( aBrush );
 			else if ( nPos == nTablePos )
 				rSh.SetTabBackground( aBrush );
 			else if ( nPos == nTableRowPos )

Modified: openoffice/branches/alg/aw080/main/sw/source/ui/shells/drwtxtex.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/ui/shells/drwtxtex.cxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sw/source/ui/shells/drwtxtex.cxx (original)
+++ openoffice/branches/alg/aw080/main/sw/source/ui/shells/drwtxtex.cxx Wed Nov 27 17:25:40 2013
@@ -986,51 +986,49 @@ void SwDrawTextShell::ExecClpbrd(SfxRequ
  --------------------------------------------------------------------*/
 void SwDrawTextShell::StateClpbrd(SfxItemSet &rSet)
 {
-	if (!IsTextEdit())	// Sonst Absturz!
-		return;
+    if (!IsTextEdit())	// Sonst Absturz!
+        return;
 
     OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView();
     ESelection aSel(pOLV->GetSelection());
-	const sal_Bool bCopy = (aSel.nStartPara != aSel.nEndPara) ||
-						   (aSel.nStartPos != aSel.nEndPos);
+    const sal_Bool bCopy = (aSel.nStartPara != aSel.nEndPara) ||
+        (aSel.nStartPos != aSel.nEndPos);
 
 
-	SfxWhichIter aIter(rSet);
-	sal_uInt16 nWhich = aIter.FirstWhich();
-
-	while(nWhich)
-	{
-		switch(nWhich)
-		{
-			case SID_CUT:
-			case SID_COPY:
-				if( !bCopy )
-					rSet.DisableItem( nWhich );
-				break;
+    SfxWhichIter aIter(rSet);
+    sal_uInt16 nWhich = aIter.FirstWhich();
 
-			case SID_PASTE:
-				{
-					TransferableDataHelper aDataHelper(
-						TransferableDataHelper::CreateFromSystemClipboard(
-								&GetView().GetEditWin() ) );
-
-					if( !aDataHelper.GetXTransferable().is() ||
-						!SwTransferable::IsPaste( GetShell(), aDataHelper ))
-						rSet.DisableItem( SID_PASTE );
-				}
-				break;
+    while(nWhich)
+    {
+        switch(nWhich)
+        {
+        case SID_CUT:
+        case SID_COPY:
+            if( !bCopy )
+                rSet.DisableItem( nWhich );
+            break;
+
+        case SID_PASTE:
+            {
+                TransferableDataHelper aDataHelper(
+                    TransferableDataHelper::CreateFromSystemClipboard( &GetView().GetEditWin() ) );
+
+                if( !aDataHelper.GetXTransferable().is()
+                    || !SwTransferable::IsPaste( GetShell(), aDataHelper ) )
+                {
+                    rSet.DisableItem( nWhich );
+                }
+            }
+            break;
+
+        case SID_PASTE_SPECIAL:
+        case SID_CLIPBOARD_FORMAT_ITEMS:
+            rSet.DisableItem( nWhich );
+            break;
+        }
 
-            case SID_PASTE_SPECIAL:
-                rSet.DisableItem( SID_PASTE_SPECIAL );
-				break;
-            // --> OD 2008-06-20 #151110#
-            case SID_CLIPBOARD_FORMAT_ITEMS:
-                rSet.DisableItem( SID_CLIPBOARD_FORMAT_ITEMS );
-                break;
-            // <--
-		}
-		nWhich = aIter.NextWhich();
-	}
+        nWhich = aIter.NextWhich();
+    }
 }
 
 /*--------------------------------------------------------------------

Modified: openoffice/branches/alg/aw080/main/sw/source/ui/shells/frmsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/ui/shells/frmsh.cxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sw/source/ui/shells/frmsh.cxx (original)
+++ openoffice/branches/alg/aw080/main/sw/source/ui/shells/frmsh.cxx Wed Nov 27 17:25:40 2013
@@ -1218,8 +1218,14 @@ void SwFrameShell::GetLineStyleState(Sfx
 
 void  SwFrameShell::StateInsert(SfxItemSet &rSet)
 {
-	const int nSel = GetShell().GetSelectionType();
-
-	if ((nSel & nsSelectionType::SEL_GRF) || (nSel & nsSelectionType::SEL_OLE))
-		rSet.DisableItem(FN_INSERT_FRAME);
+    const int nSel = GetShell().GetSelectionType();
+    if ( (nSel & nsSelectionType::SEL_GRF)
+        || (nSel & nsSelectionType::SEL_OLE) )
+    {
+        rSet.DisableItem(FN_INSERT_FRAME);
+    }
+    else if ( GetShell().CrsrInsideInputFld() )
+    {
+        rSet.DisableItem(FN_INSERT_FRAME);
+    }
 }

Modified: openoffice/branches/alg/aw080/main/sw/source/ui/shells/grfsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/ui/shells/grfsh.cxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sw/source/ui/shells/grfsh.cxx (original)
+++ openoffice/branches/alg/aw080/main/sw/source/ui/shells/grfsh.cxx Wed Nov 27 17:25:40 2013
@@ -339,7 +339,7 @@ void SwGrfShell::Execute(SfxRequest &rRe
 													   RES_GRFATR_END-1 );
 				aGrfSet.Put( *pSet );
 				if( aGrfSet.Count() )
-					rSh.SetAttr( aGrfSet );
+					rSh.SetAttrSet( aGrfSet );
 
 				rSh.EndUndo(UNDO_END);
 				rSh.EndAllAction();
@@ -354,7 +354,7 @@ void SwGrfShell::Execute(SfxRequest &rRe
             rSh.GetCurAttr( aSet );
 			SwMirrorGrf aGrf((const SwMirrorGrf &)aSet.Get(RES_GRFATR_MIRRORGRF));
 			aGrf.SetGrfToggle(!aGrf.IsGrfToggle());
-			rSh.SetAttr(aGrf);
+			rSh.SetAttrItem(aGrf);
 		}
 		break;
 
@@ -505,38 +505,45 @@ void SwGrfShell::ExecAttr( SfxRequest &r
 			ASSERT(!this, falscher Dispatcher);
 		}
 		if( aGrfSet.Count() )
-			GetShell().SetAttr( aGrfSet );
+			GetShell().SetAttrSet( aGrfSet );
 	}
 	GetView().GetViewFrame()->GetBindings().Invalidate(rReq.GetSlot());
 }
 
 void SwGrfShell::GetAttrState(SfxItemSet &rSet)
 {
-	SwWrtShell &rSh = GetShell();
-	SfxItemSet aCoreSet( GetPool(), aNoTxtNodeSetRange );
+    SwWrtShell &rSh = GetShell();
+    SfxItemSet aCoreSet( GetPool(), aNoTxtNodeSetRange );
     rSh.GetCurAttr( aCoreSet );
-	sal_Bool bParentCntProt = 0 != rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT );
-	sal_Bool bIsGrfCntnt = CNT_GRF == GetShell().GetCntType();
+    sal_Bool bParentCntProt = 0 != rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT );
+    sal_Bool bIsGrfCntnt = CNT_GRF == GetShell().GetCntType();
 
     SetGetStateSet( &rSet );
 
-	SfxWhichIter aIter( rSet );
-	sal_uInt16 nWhich = aIter.FirstWhich();
-	while( nWhich )
-	{
-		sal_Bool bDisable = bParentCntProt;
-		switch( nWhich )
-		{
-		case SID_INSERT_GRAPHIC:
+    SfxWhichIter aIter( rSet );
+    sal_uInt16 nWhich = aIter.FirstWhich();
+    while( nWhich )
+    {
+        sal_Bool bDisable = bParentCntProt;
+        switch( nWhich )
+        {
+        case SID_INSERT_GRAPHIC:
         case FN_FORMAT_GRAFIC_DLG:
-		case SID_TWAIN_TRANSFER:
-			if( bParentCntProt || !bIsGrfCntnt )
-				bDisable = sal_True;
-			break;
+        case SID_TWAIN_TRANSFER:
+            if( bParentCntProt || !bIsGrfCntnt )
+                bDisable = sal_True;
+            else if ( nWhich == SID_INSERT_GRAPHIC
+                      && rSh.CrsrInsideInputFld() )
+            {
+                bDisable = sal_True;
+            }
+            break;
+
         case FN_SAVE_GRAPHIC:
-			if( rSh.GetGraphicType() == GRAPHIC_NONE )
-			    bDisable = sal_True;
-        break;
+            if( rSh.GetGraphicType() == GRAPHIC_NONE )
+                bDisable = sal_True;
+            break;
+
         case SID_COLOR_SETTINGS:
         {
             if ( bParentCntProt || !bIsGrfCntnt )
@@ -631,31 +638,21 @@ void SwGrfShell::GetAttrState(SfxItemSet
 						aCoreSet.Get(RES_GRFATR_DRAWMODE)).GetValue() ));
 			break;
 
-		case SID_GRFFILTER:
-		case SID_GRFFILTER_INVERT:
-		case SID_GRFFILTER_SMOOTH:
-		case SID_GRFFILTER_SHARPEN:
-		case SID_GRFFILTER_REMOVENOISE:
-		case SID_GRFFILTER_SOBEL:
-		case SID_GRFFILTER_MOSAIC:
-		case SID_GRFFILTER_EMBOSS:
-		case SID_GRFFILTER_POSTER:
-		case SID_GRFFILTER_POPART:
-		case SID_GRFFILTER_SEPIA:
-		case SID_GRFFILTER_SOLARIZE:
+        case SID_GRFFILTER:
+        case SID_GRFFILTER_INVERT:
+        case SID_GRFFILTER_SMOOTH:
+        case SID_GRFFILTER_SHARPEN:
+        case SID_GRFFILTER_REMOVENOISE:
+        case SID_GRFFILTER_SOBEL:
+        case SID_GRFFILTER_MOSAIC:
+        case SID_GRFFILTER_EMBOSS:
+        case SID_GRFFILTER_POSTER:
+        case SID_GRFFILTER_POPART:
+        case SID_GRFFILTER_SEPIA:
+        case SID_GRFFILTER_SOLARIZE:
             {
                 if( bParentCntProt || !bIsGrfCntnt )
                     bDisable = sal_True;
-                // --> OD 2006-11-03 #i59688#
-                // load graphic only if type is unknown
-//                else if( bSwappedOut )
-//                {
-//                    rSet.DisableItem( nWhich );
-//                    if( AddGrfUpdateSlot( nWhich ))
-//                        rSh.GetGraphic(sal_False);  // start the loading
-//                }
-//                else
-//                    bDisable = !bBitmapType;
                 else
                 {
                     const sal_uInt16 eGraphicType( rSh.GetGraphicType() );
@@ -674,17 +671,17 @@ void SwGrfShell::GetAttrState(SfxItemSet
                 }
                 // <--
             }
-			break;
+            break;
 
-		default:
-			bDisable = sal_False;
-		}
+        default:
+            bDisable = sal_False;
+        }
 
-		if( bDisable )
-			rSet.DisableItem( nWhich );
-		nWhich = aIter.NextWhich();
-	}
-	SetGetStateSet( 0 );
+        if( bDisable )
+            rSet.DisableItem( nWhich );
+        nWhich = aIter.NextWhich();
+    }
+    SetGetStateSet( 0 );
 }
 
 

Modified: openoffice/branches/alg/aw080/main/sw/source/ui/shells/langhelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/ui/shells/langhelper.cxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sw/source/ui/shells/langhelper.cxx (original)
+++ openoffice/branches/alg/aw080/main/sw/source/ui/shells/langhelper.cxx Wed Nov 27 17:25:40 2013
@@ -282,7 +282,7 @@ namespace SwLangHelper
 					{
 						rWrtSh.GetCurAttr( rCoreSet );
 						rCoreSet.Put( SvxLanguageItem( nLang, nLangWhichId ));
-						rWrtSh.SetAttr( rCoreSet );
+						rWrtSh.SetAttrSet( rCoreSet );
 					}
 				}
 				else // change language for all text
@@ -298,7 +298,7 @@ namespace SwLangHelper
 	            
 					// #i102191: hard set respective language attribute in text document
 					// (for all text in the document - which should be selected by now...)
-					rWrtSh.SetAttr( SvxLanguageItem( nLang, nLangWhichId ) );
+					rWrtSh.SetAttrItem( SvxLanguageItem( nLang, nLangWhichId ) );
 				}
 			}
 		}
@@ -346,7 +346,7 @@ namespace SwLangHelper
 				rWrtSh.GetCurAttr( rCoreSet );
 				for (sal_uInt16 i = 0; i < 3; ++i)
 					rCoreSet.Put( SvxLanguageItem( LANGUAGE_NONE, aLangWhichId_Writer[i] ));
-				rWrtSh.SetAttr( rCoreSet );
+				rWrtSh.SetAttrSet( rCoreSet );
 			}
 		}
 		else // change language for all text

Modified: openoffice/branches/alg/aw080/main/sw/source/ui/shells/listsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/ui/shells/listsh.cxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sw/source/ui/shells/listsh.cxx (original)
+++ openoffice/branches/alg/aw080/main/sw/source/ui/shells/listsh.cxx Wed Nov 27 17:25:40 2013
@@ -273,6 +273,13 @@ void SwListShell::GetState(SfxItemSet &r
                 if(nCurrentNumLevel == (MAXLEVEL - 1))
                     rSet.DisableItem(nWhich);
             break;
+
+            case FN_NUM_BULLET_NONUM:
+                if ( rSh.CrsrInsideInputFld() )
+                {
+                    rSet.DisableItem(nWhich);
+                }
+                break;
         }
 		nWhich = aIter.NextWhich();
 	}

Modified: openoffice/branches/alg/aw080/main/sw/source/ui/shells/tabsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sw/source/ui/shells/tabsh.cxx?rev=1546124&r1=1546123&r2=1546124&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sw/source/ui/shells/tabsh.cxx (original)
+++ openoffice/branches/alg/aw080/main/sw/source/ui/shells/tabsh.cxx Wed Nov 27 17:25:40 2013
@@ -1289,11 +1289,12 @@ void SwTableShell::GetState(SfxItemSet &
 				}
 				break;
 
-			case FN_INSERT_TABLE:
-				// Irgendeinen Wert "putten", damit Controller enabled bleibt.
-				// Statt "Insert:Table" erscheint dann "Format:Table".
-//				rSet.Put(SfxUInt16Item(nSlot, 1));
-				break;
+            case FN_INSERT_TABLE:
+                if ( rSh.CrsrInsideInputFld() )
+                {
+                    rSet.DisableItem( nSlot );
+                }
+                break;
 
 			case FN_TABLE_OPTIMAL_HEIGHT:
 			{



Mime
View raw message