diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2014-01-09 12:59:28 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-09 15:32:21 +0000 |
| commit | 74593273655e475017bb2bd45aba3c6b132e372d (patch) | |
| tree | d0552a4b6e7c81ad49c58864a9f65d1b03ec8838 /sw/source/ui/shells | |
| parent | wrong title, copied and paste from its neighbour (diff) | |
| download | core-74593273655e475017bb2bd45aba3c6b132e372d.tar.gz core-74593273655e475017bb2bd45aba3c6b132e372d.zip | |
Resolves: #i123988# assure that hyperlink attribute...
(<SwFmtINetFmt>) always provides character style names for visited and
unvisited state
(cherry picked from commit c15b814d6e8ea429287def9a0bf3ac71db414119)
Conflicts:
sw/inc/fmtinfmt.hxx
sw/source/core/doc/doctxm.cxx
sw/source/core/txtnode/fmtatr2.cxx
sw/source/core/txtnode/txtatr2.cxx
sw/source/filter/ww8/ww8atr.cxx
sw/source/filter/ww8/ww8par5.cxx
sw/source/ui/chrdlg/chardlg.cxx
sw/source/ui/shells/txtattr.cxx
Change-Id: Ib23d55a299d0d78a2eba18dd5c1c0327c816da56
Diffstat (limited to 'sw/source/ui/shells')
| -rw-r--r-- | sw/source/ui/shells/txtattr.cxx | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx index 706df6231e60..0acaf93e3705 100644 --- a/sw/source/ui/shells/txtattr.cxx +++ b/sw/source/ui/shells/txtattr.cxx @@ -179,37 +179,42 @@ void SwTextShell::ExecCharAttrArgs(SfxRequest &rReq) SwTxtFmtColl* pColl = 0; // Is only set if the whole paragraph is selected and AutoUpdateFmt is set. - if( rWrtSh.HasSelection() && rWrtSh.IsSelFullPara() ) + if (rWrtSh.HasSelection() && rWrtSh.IsSelFullPara()) { pColl = rWrtSh.GetCurTxtFmtColl(); - if(pColl && !pColl->IsAutoUpdateFmt()) + if ( pColl && !pColl->IsAutoUpdateFmt() ) pColl = 0; } SfxItemPool& rPool = GetPool(); - sal_uInt16 nWhich = rPool.GetWhich(nSlot); - switch ( nSlot ) + sal_uInt16 nWhich = rPool.GetWhich( nSlot ); + switch (nSlot) { case FN_TXTATR_INET: // Special treatment of the PoolId of the SwFmtInetFmt if(bArgs) { - const SfxPoolItem& rItem = pArgs->Get(nWhich ); + const SfxPoolItem& rItem = pArgs->Get( nWhich ); - SwFmtINetFmt aINetFmt((const SwFmtINetFmt&)rItem); - if( USHRT_MAX == aINetFmt.GetVisitedFmtId() ) + SwFmtINetFmt aINetFmt( (const SwFmtINetFmt&) rItem ); + if ( USHRT_MAX == aINetFmt.GetVisitedFmtId() ) { - aINetFmt.SetVisitedFmtId( - SwStyleNameMapper::GetPoolIdFromUIName( aINetFmt.GetVisitedFmt(), nsSwGetPoolIdFromName::GET_POOLID_CHRFMT)); + OSL_ENSURE( false, "<SwTextShell::ExecCharAttrArgs(..)> - unexpected visited character format ID at hyperlink attribute" ); + aINetFmt.SetVisitedFmtAndId( + aINetFmt.GetVisitedFmt(), + SwStyleNameMapper::GetPoolIdFromUIName( aINetFmt.GetVisitedFmt(), nsSwGetPoolIdFromName::GET_POOLID_CHRFMT ) ); } - if( USHRT_MAX == aINetFmt.GetINetFmtId() ) + if ( USHRT_MAX == aINetFmt.GetINetFmtId() ) { - aINetFmt.SetINetFmtId( - SwStyleNameMapper::GetPoolIdFromUIName( aINetFmt.GetINetFmt(), nsSwGetPoolIdFromName::GET_POOLID_CHRFMT)); + OSL_ENSURE( false, "<SwTextShell::ExecCharAttrArgs(..)> - unexpected unvisited character format ID at hyperlink attribute" ); + aINetFmt.SetINetFmtAndId( + aINetFmt.GetINetFmt(), + SwStyleNameMapper::GetPoolIdFromUIName( aINetFmt.GetINetFmt(), nsSwGetPoolIdFromName::GET_POOLID_CHRFMT ) ); } if ( pColl ) pColl->SetFmtAttr( aINetFmt ); - else rWrtSh.SetAttrItem( aINetFmt ); + else + rWrtSh.SetAttrItem( aINetFmt ); rReq.Done(); } break; |