diff options
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/core/bastyp/init.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/crsr/viscrs.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/doc/DocumentStylePoolManager.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/text/atrstck.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/text/frmpaint.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/text/inftxt.cxx | 8 | ||||
-rw-r--r-- | sw/source/core/text/itrform2.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/text/porlin.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/text/pormulti.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/text/porrst.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/text/txtdrop.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/text/txttab.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/txtnode/fntcache.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/txtnode/swfont.cxx | 46 | ||||
-rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/ww8/wrtww8.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par6.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/uiview/viewstat.cxx | 2 |
18 files changed, 51 insertions, 51 deletions
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx index 1d59814cd810..61a6e982edb6 100644 --- a/sw/source/core/bastyp/init.cxx +++ b/sw/source/core/bastyp/init.cxx @@ -493,7 +493,7 @@ void InitCore() aAttrTab[ RES_CHRATR_CTL_POSTURE - POOLATTR_BEGIN ] = new SvxPostureItem(ITALIC_NONE, RES_CHRATR_CTL_POSTURE ); aAttrTab[ RES_CHRATR_CTL_WEIGHT - POOLATTR_BEGIN ] = new SvxWeightItem( WEIGHT_NORMAL, RES_CHRATR_CTL_WEIGHT ); - aAttrTab[ RES_CHRATR_ROTATE - POOLATTR_BEGIN ] = new SvxCharRotateItem( Degree10(0), false, RES_CHRATR_ROTATE ); + aAttrTab[ RES_CHRATR_ROTATE - POOLATTR_BEGIN ] = new SvxCharRotateItem( 0_deg10, false, RES_CHRATR_ROTATE ); aAttrTab[ RES_CHRATR_EMPHASIS_MARK - POOLATTR_BEGIN ] = new SvxEmphasisMarkItem( FontEmphasisMark::NONE, RES_CHRATR_EMPHASIS_MARK ); aAttrTab[ RES_CHRATR_TWO_LINES - POOLATTR_BEGIN ] = new SvxTwoLinesItem( false, 0, 0, RES_CHRATR_TWO_LINES ); aAttrTab[ RES_CHRATR_SCALEW - POOLATTR_BEGIN ] = new SvxCharScaleWidthItem( 100, RES_CHRATR_SCALEW ); diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx index 7a364b2ee83a..2813f162f1f6 100644 --- a/sw/source/core/crsr/viscrs.cxx +++ b/sw/source/core/crsr/viscrs.cxx @@ -133,7 +133,7 @@ void SwVisibleCursor::SetPosAndShow(SfxViewShell const * pViewShell) if( 0 > nTmpY ) { nTmpY = -nTmpY; - m_aTextCursor.SetOrientation( Degree10(900) ); + m_aTextCursor.SetOrientation( 900_deg10 ); aRect = SwRect( m_pCursorShell->m_aCharRect.Pos(), Size( m_pCursorShell->m_aCharRect.Height(), nTmpY ) ); aRect.Pos().setX(aRect.Pos().getX() + m_pCursorShell->m_aCursorHeight.getX()); diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx index 68f122f443de..a8da344f1e5e 100644 --- a/sw/source/core/doc/DocumentStylePoolManager.cxx +++ b/sw/source/core/doc/DocumentStylePoolManager.cxx @@ -1604,7 +1604,7 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool( sal_uInt16 nId ) } break; case RES_POOLCHR_VERT_NUM: - aSet.Put( SvxCharRotateItem( Degree10(900), false, RES_CHRATR_ROTATE ) ); + aSet.Put( SvxCharRotateItem( 900_deg10, false, RES_CHRATR_ROTATE ) ); break; case RES_POOLFRM_FRAME: diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx index e30d03816da5..c5d29692719f 100644 --- a/sw/source/core/text/atrstck.cxx +++ b/sw/source/core/text/atrstck.cxx @@ -772,7 +772,7 @@ void SwAttrHandler::FontChg(const SfxPoolItem& rItem, SwFont& rFnt, bool bPush ) // 2. attribute is active if ( !bRuby && static_cast<const SvxTwoLinesItem&>(rItem).GetValue() ) { - rFnt.SetVertical( Degree10(0), m_bVertLayout ); + rFnt.SetVertical( 0_deg10, m_bVertLayout ); break; } @@ -798,7 +798,7 @@ void SwAttrHandler::FontChg(const SfxPoolItem& rItem, SwFont& rFnt, bool bPush ) break; } case RES_TXTATR_CJK_RUBY : - rFnt.SetVertical( Degree10(0), m_bVertLayout ); + rFnt.SetVertical( 0_deg10, m_bVertLayout ); break; case RES_TXTATR_REFMARK : if ( bPush ) diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx index 706d265ab43e..1a402d842030 100644 --- a/sw/source/core/text/frmpaint.cxx +++ b/sw/source/core/text/frmpaint.cxx @@ -132,7 +132,7 @@ SwExtraPainter::SwExtraPainter( const SwTextFrame *pFrame, SwViewShell *pVwSh, m_pFnt.reset( new SwFont(&pFormat->GetAttrSet(), &pFrame->GetDoc().getIDocumentSettingAccess()) ); m_pFnt->Invalidate(); m_pFnt->ChgPhysFnt( m_pSh, *m_pSh->GetOut() ); - m_pFnt->SetVertical( Degree10(0), pFrame->IsVertical() ); + m_pFnt->SetVertical( 0_deg10, pFrame->IsVertical() ); } if( bLineNum ) @@ -550,7 +550,7 @@ bool SwTextFrame::PaintEmpty( const SwRect &rRect, bool bCheck ) const pFnt->SetStyleName(OUString(), SwFontScript::Latin); pFnt->SetCharSet( RTL_TEXTENCODING_SYMBOL, SwFontScript::Latin ); } - pFnt->SetVertical( Degree10(0), IsVertical() ); + pFnt->SetVertical( 0_deg10, IsVertical() ); SwFrameSwapper aSwapper( this, true ); SwLayoutModeModifier aLayoutModeModifier( *pSh->GetOut() ); aLayoutModeModifier.Modify( IsRightToLeft() ); diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index ac0b61f29a79..8d6026886b35 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -607,7 +607,7 @@ SwTransparentTextGuard::~SwTransparentTextGuard() aVCLGradient.SetStyle(GradientStyle::Linear); aVCLGradient.SetStartColor(aTransColor); aVCLGradient.SetEndColor(aTransColor); - aVCLGradient.SetAngle(Degree10(0)); + aVCLGradient.SetAngle(0_deg10); aVCLGradient.SetBorder(0); aVCLGradient.SetOfsX(0); aVCLGradient.SetOfsY(0); @@ -880,7 +880,7 @@ static void lcl_DrawSpecial( const SwTextPaintInfo& rTextPaintInfo, const SwLine // Some of the current values are set at the font: if ( ! bRotate ) - s_aFnt.SetVertical( Degree10(0), rTextPaintInfo.GetTextFrame()->IsVertical() ); + s_aFnt.SetVertical( 0_deg10, rTextPaintInfo.GetTextFrame()->IsVertical() ); else s_aFnt.SetVertical( pOldFnt->GetOrientation() ); @@ -896,11 +896,11 @@ static void lcl_DrawSpecial( const SwTextPaintInfo& rTextPaintInfo, const SwLine // The maximum width depends on the current orientation const Degree10 nDir = s_aFnt.GetOrientation( rTextPaintInfo.GetTextFrame()->IsVertical() ); SwTwips nMaxWidth; - if (nDir == Degree10(900) || nDir == Degree10(2700)) + if (nDir == 900_deg10 || nDir == 2700_deg10) nMaxWidth = rRect.Height(); else { - assert(nDir == Degree10(0)); //Unknown direction set at font + assert(nDir == 0_deg10); //Unknown direction set at font nMaxWidth = rRect.Width(); } diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index aa4ba00b8d8d..fdd4e276b951 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -1504,7 +1504,7 @@ SwLinePortion *SwTextFormatter::NewPortion( SwTextFormatInfo &rInf ) { delete pPor; pPor = new SwRotatedPortion(rInf.GetIdx() + TextFrameIndex(1), - Degree10(900) == nDir + 900_deg10 == nDir ? DIR_BOTTOM2TOP : DIR_TOP2BOTTOM ); } @@ -1520,7 +1520,7 @@ SwLinePortion *SwTextFormatter::NewPortion( SwTextFormatInfo &rInf ) if ( nDir ) { delete pPor; - pPor = new SwRotatedPortion(TextFrameIndex(0), Degree10(900) == nDir + pPor = new SwRotatedPortion(TextFrameIndex(0), 900_deg10 == nDir ? DIR_BOTTOM2TOP : DIR_TOP2BOTTOM ); diff --git a/sw/source/core/text/porlin.cxx b/sw/source/core/text/porlin.cxx index 3a6177ef384e..b94d4b7896c9 100644 --- a/sw/source/core/text/porlin.cxx +++ b/sw/source/core/text/porlin.cxx @@ -97,7 +97,7 @@ void SwLinePortion::PrePaint( const SwTextPaintInfo& rInf, bool( ComplexTextLayoutFlags::BiDiRtl & rInf.GetOut()->GetLayoutMode() ); Degree10 nDir = bBidiPor ? - Degree10(1800) : + 1800_deg10 : rInf.GetFont()->GetOrientation( rInf.GetTextFrame()->IsVertical() ); // pLast == this *only* for the 1st portion in the line so nLastWidth is 0; diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx index 8050303942c2..74c3e22543c9 100644 --- a/sw/source/core/text/pormulti.cxx +++ b/sw/source/core/text/pormulti.cxx @@ -786,7 +786,7 @@ static bool lcl_CheckRotation(const SfxPoolItem *const pItem, { if ( pItem ) { - rValue = static_cast<const SvxCharRotateItem*>(pItem)->GetValue() != Degree10(0); + rValue = static_cast<const SvxCharRotateItem*>(pItem)->GetValue() != 0_deg10; if( !rpRef ) rpRef = static_cast<const SvxCharRotateItem*>(pItem); else if( static_cast<const SvxCharRotateItem*>(pItem)->GetValue() != @@ -1731,7 +1731,7 @@ void SwTextPainter::PaintMultiPortion( const SwRect &rPaint, { // we do not allow any rotation inside a bidi portion SwFont* pTmpFont = GetInfo().GetFont(); - pTmpFont->SetVertical( Degree10(0), GetInfo().GetTextFrame()->IsVertical() ); + pTmpFont->SetVertical( 0_deg10, GetInfo().GetTextFrame()->IsVertical() ); } if( pPor->IsMultiPortion() && static_cast<SwMultiPortion*>(pPor)->IsBidi() ) diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx index f31c597eac57..6326a2e7c9df 100644 --- a/sw/source/core/text/porrst.cxx +++ b/sw/source/core/text/porrst.cxx @@ -293,7 +293,7 @@ SwTwips SwTextFrame::EmptyHeight() const } if ( IsVertical() ) - pFnt->SetVertical( Degree10(2700) ); + pFnt->SetVertical( 2700_deg10 ); OutputDevice* pOut = pSh ? pSh->GetOut() : nullptr; if ( !pOut || !pSh->GetViewOptions()->getBrowseMode() || diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx index 1a0eb5d292bc..8e4a72e6de60 100644 --- a/sw/source/core/text/txtdrop.cxx +++ b/sw/source/core/text/txtdrop.cxx @@ -405,7 +405,7 @@ void SwDropPortion::Paint( const SwTextPaintInfo &rInf ) const if ( rInf.GetFont()->GetOrientation( rInf.GetTextFrame()->IsVertical() ) ) { pTmpFont.reset(new SwFont( *rInf.GetFont() )); - pTmpFont->SetVertical( Degree10(0), rInf.GetTextFrame()->IsVertical() ); + pTmpFont->SetVertical( 0_deg10, rInf.GetTextFrame()->IsVertical() ); } SwFontSave aFontSave( rInf, pTmpFont.get() ); @@ -620,7 +620,7 @@ SwDropPortion *SwTextFormatter::NewDropPortion( SwTextFormatInfo &rInf ) } // we do not allow a vertical font for the drop portion - pTmpFnt->SetVertical( Degree10(0), rInf.GetTextFrame()->IsVertical() ); + pTmpFnt->SetVertical( 0_deg10, rInf.GetTextFrame()->IsVertical() ); // find next attribute change / script change const TextFrameIndex nTmpIdx = nNextChg; diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx index e62fd8d17b87..56ae1a0c1ceb 100644 --- a/sw/source/core/text/txttab.cxx +++ b/sw/source/core/text/txttab.cxx @@ -358,7 +358,7 @@ bool SwTabPortion::PreFormat( SwTextFormatInfo &rInf ) // #95477# Rotated tab stops get the width of one blank const Degree10 nDir = rInf.GetFont()->GetOrientation( rInf.GetTextFrame()->IsVertical() ); - if( ! bFull && Degree10(0) == nDir ) + if( ! bFull && 0_deg10 == nDir ) { const PortionType nWhich = GetWhichPor(); switch( nWhich ) diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index 7f2e65230e65..5b8661b4cf5a 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -296,7 +296,7 @@ static void lcl_calcLinePos( const CalcLinePosData &rData, sal_Int32 nKernStart = nStart ? rData.pKernArray[sal_Int32(nStart) - 1] : 0; sal_Int32 nKernEnd = rData.pKernArray[sal_Int32(nEnd) - 1]; - const Degree10 nDir = rData.bBidiPor ? Degree10(1800) + const Degree10 nDir = rData.bBidiPor ? 1800_deg10 : UnMapDirection(rData.rFont.GetOrientation(), rData.bSwitchH2V, rData.bSwitchH2VLRBT); @@ -1736,7 +1736,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf ) tools::Long nKernVal = pKernArray[sal_Int32(rInf.GetLen()) - 1]; const Degree10 nDir = bBidiPor - ? Degree10(1800) + ? 1800_deg10 : UnMapDirection(GetFont().GetOrientation(), bSwitchH2V, bSwitchH2VLRBT); diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index 2a2801c0517e..c1b94840d060 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -311,9 +311,9 @@ sal_uInt16 SwFont::CalcShadowSpace(const SvxShadowItemSide nShadow, const bool b case SvxShadowItemSide::TOP: if(( aLoc == SvxShadowLocation::TopLeft || aLoc == SvxShadowLocation::TopRight ) && - ( nOrient == Degree10(0) || nOrient == Degree10(1800) || - ( nOrient == Degree10(900) && !bSkipRight ) || - ( nOrient == Degree10(2700) && !bSkipLeft ))) + ( nOrient == 0_deg10 || nOrient == 1800_deg10 || + ( nOrient == 900_deg10 && !bSkipRight ) || + ( nOrient == 2700_deg10 && !bSkipLeft ))) { nSpace = m_nShadowWidth; } @@ -322,9 +322,9 @@ sal_uInt16 SwFont::CalcShadowSpace(const SvxShadowItemSide nShadow, const bool b case SvxShadowItemSide::BOTTOM: if(( aLoc == SvxShadowLocation::BottomLeft || aLoc == SvxShadowLocation::BottomRight ) && - ( nOrient == Degree10(0) || nOrient == Degree10(1800) || - ( nOrient == Degree10(900) && !bSkipLeft ) || - ( nOrient == Degree10(2700) && !bSkipRight ))) + ( nOrient == 0_deg10 || nOrient == 1800_deg10 || + ( nOrient == 900_deg10 && !bSkipLeft ) || + ( nOrient == 2700_deg10 && !bSkipRight ))) { nSpace = m_nShadowWidth; } @@ -333,9 +333,9 @@ sal_uInt16 SwFont::CalcShadowSpace(const SvxShadowItemSide nShadow, const bool b case SvxShadowItemSide::LEFT: if(( aLoc == SvxShadowLocation::TopLeft || aLoc == SvxShadowLocation::BottomLeft ) && - ( nOrient == Degree10(900) || nOrient == Degree10(2700) || - ( nOrient == Degree10(0) && !bSkipLeft ) || - ( nOrient == Degree10(1800) && !bSkipRight ))) + ( nOrient == 900_deg10 || nOrient == 2700_deg10 || + ( nOrient == 0_deg10 && !bSkipLeft ) || + ( nOrient == 1800_deg10 && !bSkipRight ))) { nSpace = m_nShadowWidth; } @@ -344,9 +344,9 @@ sal_uInt16 SwFont::CalcShadowSpace(const SvxShadowItemSide nShadow, const bool b case SvxShadowItemSide::RIGHT: if(( aLoc == SvxShadowLocation::TopRight || aLoc == SvxShadowLocation::BottomRight ) && - ( nOrient == Degree10(900) || nOrient == Degree10(2700) || - ( nOrient == Degree10(0) && !bSkipRight ) || - ( nOrient == Degree10(1800) && !bSkipLeft ))) + ( nOrient == 900_deg10 || nOrient == 2700_deg10 || + ( nOrient == 0_deg10 && !bSkipRight ) || + ( nOrient == 1800_deg10 && !bSkipLeft ))) { nSpace = m_nShadowWidth; } @@ -368,15 +368,15 @@ static Degree10 MapDirection(Degree10 nDir, const bool bVertFormat, const bool b { case 0 : if (bVertFormatLRBT) - nDir = Degree10(900); + nDir = 900_deg10; else - nDir = Degree10(2700); + nDir = 2700_deg10; break; case 900 : - nDir = Degree10(0); + nDir = 0_deg10; break; case 2700 : - nDir = Degree10(1800); + nDir = 1800_deg10; break; #if OSL_DEBUG_LEVEL > 0 default : @@ -397,7 +397,7 @@ Degree10 UnMapDirection(Degree10 nDir, const bool bVertFormat, const bool bVertF switch (nDir.get()) { case 900: - nDir = Degree10(0); + nDir = 0_deg10; break; default: SAL_WARN("sw.core", "unsupported direction for VertLRBT"); @@ -411,13 +411,13 @@ Degree10 UnMapDirection(Degree10 nDir, const bool bVertFormat, const bool bVertF switch ( nDir.get() ) { case 0 : - nDir = Degree10(900); + nDir = 900_deg10; break; case 1800 : - nDir = Degree10(2700); + nDir = 2700_deg10; break; case 2700 : - nDir = Degree10(0); + nDir = 0_deg10; break; #if OSL_DEBUG_LEVEL > 0 default : @@ -695,7 +695,7 @@ void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet, if( SfxItemState::SET == pAttrSet->GetItemState( RES_CHRATR_TWO_LINES, true, &pTwoLinesItem )) if ( static_cast<const SvxTwoLinesItem*>(pTwoLinesItem)->GetValue() ) - SetVertical( Degree10(0) ); + SetVertical( 0_deg10 ); } else { @@ -882,7 +882,7 @@ SwFont::SwFont( const SwAttrSet* pAttrSet, if ( ! rTwoLinesItem.GetValue() ) SetVertical( pAttrSet->GetCharRotate().GetValue() ); else - SetVertical( Degree10(0) ); + SetVertical( 0_deg10 ); if( pIDocumentSettingAccess && pIDocumentSettingAccess->get( DocumentSettingId::SMALL_CAPS_PERCENTAGE_66 )) { m_aSub[ SwFontScript::Latin ].m_bSmallCapsPercentage66 = true; @@ -1473,7 +1473,7 @@ void SwDrawTextInfo::Shift( Degree10 nDir ) bVert = GetFrame()->IsVertical(); bVertLRBT = GetFrame()->IsVertLRBT(); } - nDir = bBidiPor ? Degree10(1800) : UnMapDirection(nDir, bVert, bVertLRBT); + nDir = bBidiPor ? 1800_deg10 : UnMapDirection(nDir, bVert, bVertLRBT); switch ( nDir.get() ) { diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index bc2955566213..fb5eac573767 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -4698,7 +4698,7 @@ void DocxAttributeOutput::OutputDefaultItem(const SfxPoolItem& rHt) break; case RES_CHRATR_ROTATE: - bMustWrite = static_cast< const SvxCharRotateItem& >(rHt).GetValue() != Degree10(0); + bMustWrite = static_cast< const SvxCharRotateItem& >(rHt).GetValue() != 0_deg10; break; case RES_CHRATR_EMPHASIS_MARK: bMustWrite = static_cast< const SvxEmphasisMarkItem& >(rHt).GetEmphasisMark() != FontEmphasisMark::NONE; @@ -9149,7 +9149,7 @@ void DocxAttributeOutput::FormatFillGradient( const XFillGradientItem& rFillGrad // /oox/source/vml/vmlformatting.cxx :: FillModel::pushToPropMap // and also in // /oox/source/drawingml/fillproperties.cxx :: FillProperties::pushToPropMap - sal_Int32 nReverseAngle = (Degree10(4500) - rGradient.GetAngle()).get(); + sal_Int32 nReverseAngle = (4500_deg10 - rGradient.GetAngle()).get(); nReverseAngle = nReverseAngle / 10; nReverseAngle = (270 - nReverseAngle) % 360; if (nReverseAngle != 0) diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index e325f331f6f0..70f2cd9c6f48 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -2076,11 +2076,11 @@ static sal_uInt16 lcl_TCFlags(SwDoc &rDoc, const SwTableBox * pBox, sal_Int32 nR if ( SfxItemState::SET == aCoreSet.GetItemState(RES_CHRATR_ROTATE, true, &pRotItem)) { const SvxCharRotateItem * pRotate = static_cast<const SvxCharRotateItem*>(pRotItem); - if(pRotate && pRotate->GetValue() == Degree10(900)) + if(pRotate && pRotate->GetValue() == 900_deg10) { nFlags = nFlags | 0x0004 | 0x0008; } - else if(pRotate && pRotate->GetValue() == Degree10(2700) ) + else if(pRotate && pRotate->GetValue() == 2700_deg10 ) { nFlags = nFlags | 0x0004 | 0x0010; } diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 0f812f917a0c..fe4a3ec91d61 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -3566,7 +3566,7 @@ void SwWW8ImplReader::Read_DoubleLine_Rotate( sal_uInt16, const sal_uInt8* pData case 1: // rotated characters { bool bFitToLine = 0 != *(pData+1); - NewAttr( SvxCharRotateItem( Degree10(900), bFitToLine, RES_CHRATR_ROTATE )); + NewAttr( SvxCharRotateItem( 900_deg10, bFitToLine, RES_CHRATR_ROTATE )); } break; } diff --git a/sw/source/uibase/uiview/viewstat.cxx b/sw/source/uibase/uiview/viewstat.cxx index 961053559eba..b69effc8542d 100644 --- a/sw/source/uibase/uiview/viewstat.cxx +++ b/sw/source/uibase/uiview/viewstat.cxx @@ -467,7 +467,7 @@ void SwView::GetState(SfxItemSet &rSet) { SfxImageItem aImageItem(nWhich); if(m_pWrtShell->IsInVerticalText()) - aImageItem.SetRotation( Degree10(2700) ); + aImageItem.SetRotation( 2700_deg10 ); if(m_pWrtShell->IsInRightToLeftText()) aImageItem.SetMirrored( true ); rSet.Put(aImageItem); |