diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-06-13 17:52:30 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-06-13 17:54:35 +0200 |
| commit | 887b3a35628b349e7934f2ae7c220a1cc17c3e63 (patch) | |
| tree | 3fc519fc86fe3a44de3d21233450d54c7e397dea | |
| parent | 6b8440134f4a8fa05450cdd492942e92c1f75803 (diff) | |
loplugin:staticcall
Change-Id: I26e1e0f66dad5ed4e8351fc7509449b312559166
63 files changed, 135 insertions, 136 deletions
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx index 7a7d804ffcc1..15a8085f6caa 100644 --- a/sw/qa/core/macros-test.cxx +++ b/sw/qa/core/macros-test.cxx @@ -150,7 +150,7 @@ void SwMacrosTest::testVba() SfxObjectShell* pFoundShell = SfxObjectShell::GetShellFromComponent(xComponent); CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell); - pFoundShell->CallXScript(xComponent, sUrl, aParams, aRet, aOutParamIndex,aOutParam); + SfxObjectShell::CallXScript(xComponent, sUrl, aParams, aRet, aOutParamIndex,aOutParam); OUString aStringRes; aRet >>= aStringRes; std::cout << "value of Ret " << OUStringToOString( aStringRes, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl; diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 21a08a108d6c..f35dfcd30eac 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -1475,7 +1475,7 @@ OUString SwAccessibleParagraph::GetFieldTypeNameAtIndex(sal_Int32 nIndex) const SwField* pField = (pTxtFld->GetFmtFld()).GetField(); if (pField) { - strTypeName = pField->GetTyp()->GetTypeStr(pField->GetTypeId()); + strTypeName = SwFieldType::GetTypeStr(pField->GetTypeId()); sal_uInt16 nWhich = pField->GetTyp()->Which(); rtl::OUString sEntry; sal_Int32 subType = 0; diff --git a/sw/source/core/access/accselectionhelper.cxx b/sw/source/core/access/accselectionhelper.cxx index 16ff5c5c1642..a55a44a67197 100644 --- a/sw/source/core/access/accselectionhelper.cxx +++ b/sw/source/core/access/accselectionhelper.cxx @@ -248,7 +248,7 @@ sal_Int32 SwAccessibleSelectionHelper::getSelectedAccessibleChildCount( ) { const SwAccessibleChild& rChild = *aIter; if( rChild.GetDrawObject() && !rChild.GetSwFrm() && - rContext.GetParent(rChild, rContext.IsInPagePreview()) + SwAccessibleFrame::GetParent(rChild, rContext.IsInPagePreview()) == rContext.GetFrm() && pFEShell->IsObjSelected( *rChild.GetDrawObject() ) ) { @@ -301,7 +301,7 @@ Reference<XAccessible> SwAccessibleSelectionHelper::getSelectedAccessibleChild( { if( 0 == nSelectedChildIndex ) { - if(rContext.GetParent( SwAccessibleChild(pFlyFrm), rContext.IsInPagePreview()) == rContext.GetFrm() ) + if(SwAccessibleFrame::GetParent( SwAccessibleChild(pFlyFrm), rContext.IsInPagePreview()) == rContext.GetFrm() ) { aChild = pFlyFrm; } @@ -313,7 +313,7 @@ Reference<XAccessible> SwAccessibleSelectionHelper::getSelectedAccessibleChild( const SwFmtAnchor& pAnchor = pFrmFmt->GetAnchor(); if( pAnchor.GetAnchorId() == FLY_AS_CHAR ) { - const SwFrm *pParaFrm = rContext.GetParent( SwAccessibleChild(pFlyFrm), rContext.IsInPagePreview() ); + const SwFrm *pParaFrm = SwAccessibleFrame::GetParent( SwAccessibleChild(pFlyFrm), rContext.IsInPagePreview() ); aChild = pParaFrm; } } @@ -335,7 +335,7 @@ Reference<XAccessible> SwAccessibleSelectionHelper::getSelectedAccessibleChild( { const SwAccessibleChild& rChild = *aIter; if( rChild.GetDrawObject() && !rChild.GetSwFrm() && - rContext.GetParent(rChild, rContext.IsInPagePreview()) == + SwAccessibleFrame::GetParent(rChild, rContext.IsInPagePreview()) == rContext.GetFrm() && pFEShell->IsObjSelected( *rChild.GetDrawObject() ) ) { diff --git a/sw/source/core/doc/docxforms.cxx b/sw/source/core/doc/docxforms.cxx index 82a6946a00bd..1d464830ab9e 100644 --- a/sw/source/core/doc/docxforms.cxx +++ b/sw/source/core/doc/docxforms.cxx @@ -67,7 +67,7 @@ void SwDoc::initXForms( bool bCreateDefaultModel ) Reference< XModule > xModule; SwDocShell* pShell( GetDocShell() ); if ( pShell ) - xModule = xModule.query( pShell->GetModel() ); + xModule.set(pShell->GetModel(), css::uno::UNO_QUERY); OSL_ENSURE( xModule.is(), "SwDoc::initXForms: no XModule at the document!" ); if ( xModule.is() ) xModule->setIdentifier( OUString( "com.sun.star.xforms.XMLFormDocument" ) ); diff --git a/sw/source/core/docnode/retrievedinputstreamdata.cxx b/sw/source/core/docnode/retrievedinputstreamdata.cxx index 3c864965ee08..d8168abfba96 100644 --- a/sw/source/core/docnode/retrievedinputstreamdata.cxx +++ b/sw/source/core/docnode/retrievedinputstreamdata.cxx @@ -82,7 +82,7 @@ void SwRetrievedInputStreamDataManager::PushData( tDataKey* pDataKey = new tDataKey; *pDataKey = nDataKey; - GetpApp()->PostUserEvent( LINK( this, SwRetrievedInputStreamDataManager, LinkedInputStreamReady ), pDataKey ); + Application::PostUserEvent( LINK( this, SwRetrievedInputStreamDataManager, LinkedInputStreamReady ), pDataKey ); } else { diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx index dec2dc70402b..35e32aa1e461 100644 --- a/sw/source/core/fields/expfld.cxx +++ b/sw/source/core/fields/expfld.cxx @@ -718,7 +718,7 @@ bool SwSeqFldList::SeekEntry( const _SeqFldLstElem& rNew, sal_uInt16* pP ) const const OUString rTmp2 = rNew.sDlgEntry; sal_Int32 nFndPos2 = 0; const OUString sNum2( rTmp2.getToken( 0, ' ', nFndPos2 )); - bool bIsNum2IsNumeric = rCC.isAsciiNumeric( sNum2 ); + bool bIsNum2IsNumeric = CharClass::isAsciiNumeric( sNum2 ); sal_Int32 nNum2 = bIsNum2IsNumeric ? sNum2.toInt32() : 0; nO--; diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index e5d128c78da0..dfb2d410d6fe 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -2489,7 +2489,7 @@ bool SwFlyFrm::GetContour( PolyPolygon& rContour, if ( bPixelMap ) aOrgSize = pOutDev->PixelToLogic( aGrfSize, aDispMap ); else - aOrgSize = pOutDev->LogicToLogic( aGrfSize, aGrfMap, aDispMap ); + aOrgSize = OutputDevice::LogicToLogic( aGrfSize, aGrfMap, aDispMap ); if ( aOrgSize.Width() && aOrgSize.Height() ) { @@ -2505,7 +2505,7 @@ bool SwFlyFrm::GetContour( PolyPolygon& rContour, if ( bPixelMap ) aNewPoint = pOutDev->PixelToLogic( rPoly[ i ], aDispMap ); else - aNewPoint = pOutDev->LogicToLogic( rPoly[ i ], aGrfMap, aDispMap ); + aNewPoint = OutputDevice::LogicToLogic( rPoly[ i ], aGrfMap, aDispMap ); rPoly[ i ] = Point( FRound( aNewPoint.getX() * fScaleX ), FRound( aNewPoint.getY() * fScaleY ) ); } diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx index 5196ea9f163c..bffbb1481ad5 100644 --- a/sw/source/core/layout/ftnfrm.cxx +++ b/sw/source/core/layout/ftnfrm.cxx @@ -2113,7 +2113,7 @@ void SwFtnBossFrm::MoveFtns( const SwCntntFrm *pSrc, SwCntntFrm *pDest, if( pDestBoss ) // robust { SwFtnFrms aFtnArr; - pDestBoss->_CollectFtns( pDest, pFtn, aFtnArr ); + SwFtnBossFrm::_CollectFtns( pDest, pFtn, aFtnArr ); if ( !aFtnArr.empty() ) { pDestBoss->_MoveFtns( aFtnArr, true ); diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 91e726c3788b..023f64f12908 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -2029,7 +2029,7 @@ bool SwLayIdle::DoIdleJob( IdleJobType eJob, bool bVisAreaOnly ) break; case AUTOCOMPLETE_WORDS : if( !pViewOptions->IsAutoCompleteWords() || - pDoc->GetAutoCompleteWords().IsLockWordLstLocked()) + SwDoc::GetAutoCompleteWords().IsLockWordLstLocked()) return false; break; case WORD_COUNT : diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 8ee0c0c7ea3a..e5c8604557af 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -3552,7 +3552,7 @@ void SwLayoutFrm::Paint(SwRect const& rRect, SwPrintData const*const) const if ( rRect.IsOver( aPaintRect ) ) { if ( bCnt && pFrm->IsCompletePaint() && - !rRect.IsInside( aPaintRect ) && GetpApp()->AnyInput( VCL_INPUT_KEYBOARD ) ) + !rRect.IsInside( aPaintRect ) && Application::AnyInput( VCL_INPUT_KEYBOARD ) ) { //fix(8104): It may happen, that the processing wasn't complete //but some parts of the paragraph were still repainted. diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 7ce119cc9441..d260a6ff830a 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -248,7 +248,7 @@ void SwTxtSizeInfo::CtorInitTxtSizeInfo( SwTxtFrm *pFrame, SwFont *pNewFnt, if ( pNd->getIDocumentSettingAccess()->get(IDocumentSettingAccess::HTML_MODE) ) { // We can only pick the AppWin here? (there's nothing better to pick?) - m_pOut = GetpApp()->GetDefaultDevice(); + m_pOut = Application::GetDefaultDevice(); } else m_pOut = pNd->getIDocumentDeviceAccess()->getPrinter( false ); diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx index a1bfaa6dcb02..41488530e0ea 100644 --- a/sw/source/core/text/itratr.cxx +++ b/sw/source/core/text/itratr.cxx @@ -552,7 +552,7 @@ void SwTxtNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMa if( pSh ) pOut = pSh->GetWin(); if( !pOut ) - pOut = GetpApp()->GetDefaultDevice(); + pOut = Application::GetDefaultDevice(); } MapMode aOldMap( pOut->GetMapMode() ); @@ -786,7 +786,7 @@ sal_uInt16 SwTxtNode::GetScalingOfSelectedText( sal_Int32 nStt, sal_Int32 nEnd ) { // Access via StarONE, there's no need for an existing or active shell if ( getIDocumentSettingAccess()->get(IDocumentSettingAccess::HTML_MODE) ) - pOut = GetpApp()->GetDefaultDevice(); + pOut = Application::GetDefaultDevice(); else pOut = getIDocumentDeviceAccess()->getReferenceDevice( true ); } diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx index be6676ef218d..280acfdbb92d 100644 --- a/sw/source/core/text/porrst.cxx +++ b/sw/source/core/text/porrst.cxx @@ -381,7 +381,7 @@ bool SwTxtFrm::FillRegister( SwTwips& rRegStart, KSHORT& rRegDiff ) pOut = pSh->GetWin(); if( !pOut ) - pOut = GetpApp()->GetDefaultDevice(); + pOut = Application::GetDefaultDevice(); MapMode aOldMap( pOut->GetMapMode() ); pOut->SetMapMode( MapMode( MAP_TWIP ) ); diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx index 44f1495216bd..f783ef335ac1 100644 --- a/sw/source/core/text/redlnitr.cxx +++ b/sw/source/core/text/redlnitr.cxx @@ -416,7 +416,7 @@ void SwExtend::ActualizeFont( SwFont &rFnt, sal_uInt16 nAttr ) if ( nAttr & EXTTEXTINPUT_ATTR_HIGHLIGHT ) { - const StyleSettings& rStyleSettings = GetpApp()->GetSettings().GetStyleSettings(); + const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); rFnt.SetColor( rStyleSettings.GetHighlightTextColor() ); rFnt.SetBackColor( new Color( rStyleSettings.GetHighlightColor() ) ); } diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx index 563a1ffefd1c..b7e8d67ed3ed 100644 --- a/sw/source/core/text/txtdrop.cxx +++ b/sw/source/core/text/txtdrop.cxx @@ -743,7 +743,7 @@ void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, SwTxtFormatInfo &rInf ) if( rInf.GetVsh() && rInf.GetVsh()->GetWin() ) pWin = rInf.GetVsh()->GetWin(); else - pWin = GetpApp()->GetDefaultDevice(); + pWin = Application::GetDefaultDevice(); while( bGrow ) { diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx index fc9325296476..15c7021cb8b3 100644 --- a/sw/source/core/text/txtftn.cxx +++ b/sw/source/core/text/txtftn.cxx @@ -460,8 +460,8 @@ void SwTxtFrm::RemoveFtn( const sal_Int32 nStart, const sal_Int32 nLen ) // -> Ftn wandert in den PrevFollow // beide muessen auf einer Seite/in einer Spalte stehen. - SwFtnFrm *pFtnFrm = bEndn ? pEndBoss->FindFtn( pSource, pFtn ) : - pFtnBoss->FindFtn( pSource, pFtn ); + SwFtnFrm *pFtnFrm = bEndn ? SwFtnBossFrm::FindFtn( pSource, pFtn ) : + SwFtnBossFrm::FindFtn( pSource, pFtn ); if( pFtnFrm ) { @@ -481,7 +481,7 @@ void SwTxtFrm::RemoveFtn( const sal_Int32 nStart, const sal_Int32 nLen ) while( pDest->GetFollow() && ((SwTxtFrm*)pDest-> GetFollow())->GetOfst() <= nIdx ) pDest = pDest->GetFollow(); - OSL_ENSURE( !pDest->FindFtnBossFrm( !bEndn )->FindFtn( + OSL_ENSURE( !SwFtnBossFrm::FindFtn( pDest,pFtn),"SwTxtFrm::RemoveFtn: footnote exists"); //Nicht ummelden sondern immer Moven. @@ -507,7 +507,7 @@ void SwTxtFrm::RemoveFtn( const sal_Int32 nStart, const sal_Int32 nLen ) } ((SwTxtFrm*)pDest)->SetFtn( true ); - OSL_ENSURE( pDest->FindFtnBossFrm( !bEndn )->FindFtn( pDest, + OSL_ENSURE( SwFtnBossFrm::FindFtn( pDest, pFtn),"SwTxtFrm::RemoveFtn: footnote ChgRef failed"); } else @@ -521,8 +521,8 @@ void SwTxtFrm::RemoveFtn( const sal_Int32 nStart, const sal_Int32 nLen ) else pFtnBoss->RemoveFtn( this, pFtn ); bRemove = bRemove || !bEndDoc; - OSL_ENSURE( bEndn ? !pEndBoss->FindFtn( this, pFtn ) : - !pFtnBoss->FindFtn( this, pFtn ), + OSL_ENSURE( bEndn ? !SwFtnBossFrm::FindFtn( this, pFtn ) : + !SwFtnBossFrm::FindFtn( this, pFtn ), "SwTxtFrm::RemoveFtn: can't get off that footnote" ); } } @@ -607,7 +607,7 @@ void SwTxtFrm::ConnectFtn( SwTxtFtn *pFtn, const SwTwips nDeadLine ) { if( pSect && pSrcFrm ) { - SwFtnFrm *pFtnFrm = pBoss->FindFtn( pSrcFrm, pFtn ); + SwFtnFrm *pFtnFrm = SwFtnBossFrm::FindFtn( pSrcFrm, pFtn ); if( pFtnFrm && pFtnFrm->IsInSct() ) { pBoss->RemoveFtn( pSrcFrm, pFtn ); @@ -617,7 +617,7 @@ void SwTxtFrm::ConnectFtn( SwTxtFtn *pFtn, const SwTwips nDeadLine ) } else if( bEnd && pSect ) { - SwFtnFrm *pFtnFrm = pSrcFrm ? pBoss->FindFtn( pSrcFrm, pFtn ) : NULL; + SwFtnFrm *pFtnFrm = pSrcFrm ? SwFtnBossFrm::FindFtn( pSrcFrm, pFtn ) : NULL; if( pFtnFrm && !pFtnFrm->GetUpper() ) pFtnFrm = NULL; SwDoc *pDoc = GetNode()->GetDoc(); @@ -663,7 +663,7 @@ void SwTxtFrm::ConnectFtn( SwTxtFtn *pFtn, const SwTwips nDeadLine ) pBoss->AppendFtn( this, pFtn ); else { - SwFtnFrm *pFtnFrm = pBoss->FindFtn( pSrcFrm, pFtn ); + SwFtnFrm *pFtnFrm = SwFtnBossFrm::FindFtn( pSrcFrm, pFtn ); SwFtnBossFrm *pFtnBoss = pFtnFrm->FindFtnBossFrm(); bool bBrutal = false; @@ -826,7 +826,7 @@ SwFtnPortion *SwTxtFormatter::NewFtnPortion( SwTxtFormatInfo &rInf, SwFtnBossFrm *pBoss = pFrm->FindFtnBossFrm( !rFtn.IsEndNote() ); SwFtnFrm *pFtnFrm = NULL; if( pScrFrm ) - pFtnFrm = pBoss->FindFtn( pScrFrm, pFtn ); + pFtnFrm = SwFtnBossFrm::FindFtn( pScrFrm, pFtn ); // Wir erkundigen uns, ob durch unser Append irgendeine // Fussnote noch auf der Seite/Spalte steht. Wenn nicht verschwindet diff --git a/sw/source/filter/html/htmlctxt.cxx b/sw/source/filter/html/htmlctxt.cxx index 72ecfbf975b9..aceeb3557161 100644 --- a/sw/source/filter/html/htmlctxt.cxx +++ b/sw/source/filter/html/htmlctxt.cxx @@ -461,7 +461,7 @@ bool SwHTMLParser::CreateContainer( const OUString& rClass, { bool bRet = false; if( rClass.equalsIgnoreAsciiCase( "sd-abs-pos" ) && - pCSS1Parser->MayBePositioned( rPropInfo ) ) + SwCSS1Parser::MayBePositioned( rPropInfo ) ) { // Container-Klasse SfxItemSet *pFrmItemSet = pContext->GetFrmItemSet( pDoc ); diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 18cdf936e5cf..eee34a296dc3 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -170,7 +170,7 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri, // des Containers uebernommen. rFrmItemSet.Put( *pCntnrItemSet ); } - else if( pCSS1Parser->MayBePositioned( rCSS1PropInfo, true ) ) + else if( SwCSS1Parser::MayBePositioned( rCSS1PropInfo, true ) ) { // Wenn die Ausrichtung anhand der CSS1-Optionen gesetzt werden kann // werden die benutzt. diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx index 8c10ed1d983c..48fd9daee314 100644 --- a/sw/source/filter/html/htmlsect.cxx +++ b/sw/source/filter/html/htmlsect.cxx @@ -615,7 +615,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss ) // Do positioning. bool bPositioned = false; - if( bInCntnr || pCSS1Parser->MayBePositioned( aPropInfo, true ) ) + if( bInCntnr || SwCSS1Parser::MayBePositioned( aPropInfo, true ) ) { SfxItemSet aFrmItemSet( pDoc->GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1 ); diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 7be47f03041d..4aa965088ecb 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -3221,7 +3221,7 @@ _CellSaveStruct::_CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable, if( bHasNumFmt ) { LanguageType eLang; - nValue = rParser.GetTableDataOptionsValNum( + nValue = SfxHTMLParser::GetTableDataOptionsValNum( nNumFmt, eLang, aValue, aNumFmt, *rParser.pDoc->GetNumberFormatter() ); } diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 1319faa1a3af..a5983c1ba17a 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -2474,7 +2474,7 @@ void SwHTMLParser::Show() OSL_ENSURE( SVPAR_WORKING==eState, "Show nicht im Working-State - Das kann ins Auge gehen" ); SwViewShell *pOldVSh = CallEndAction(); - GetpApp()->Reschedule(); + Application::Reschedule(); if( ( pDoc->GetDocShell() && pDoc->GetDocShell()->IsAbortingImport() ) || 1 == pDoc->getReferenceCount() ) @@ -2513,7 +2513,7 @@ void SwHTMLParser::ShowStatline() } else { - GetpApp()->Reschedule(); + Application::Reschedule(); if( ( pDoc->GetDocShell() && pDoc->GetDocShell()->IsAbortingImport() ) || 1 == pDoc->getReferenceCount() ) diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 425721a10476..cb32cd81bbc5 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -1343,7 +1343,7 @@ HTMLSaveData::HTMLSaveData(SwHTMLWriter& rWriter, sal_uLong nStt, { bOldWriteAll = rWrt.bWriteAll; - rWrt.pCurPam = rWrt.NewSwPaM( *rWrt.pDoc, nStt, nEnd ); + rWrt.pCurPam = Writer::NewSwPaM( *rWrt.pDoc, nStt, nEnd ); // Tabelle in Sonderbereichen erkennen if( nStt != rWrt.pCurPam->GetMark()->nNode.GetIndex() ) diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index c31159ab2901..65c9b00c116b 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -3035,7 +3035,7 @@ void SwEscherEx::WriteOCXControl( const SwFrmFmt& rFmt, sal_uInt32 nShapeId ) // SdrExchangeView aExchange(pModel, pDevice); SdrView aExchange(pModel, pDevice); - Graphic aGraphic(aExchange.GetObjGraphic(pModel, pSdrObj)); + Graphic aGraphic(SdrExchangeView::GetObjGraphic(pModel, pSdrObj)); EscherPropertyContainer aPropOpt; WriteOLEPicture(aPropOpt, 0xa00 | SHAPEFLAG_OLESHAPE, aGraphic, diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index d110c90af36b..db37d41b60ff 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -582,14 +582,14 @@ void WW8Export::ExportDopTypography(WW8DopTypography &rTypo) !lcl_CmpBeginEndChars ( pForbidden->endLine, - rTypo.GetJapanNotEndLevel1(), + WW8DopTypography::GetJapanNotEndLevel1(), rTypo.nMaxLeading * sizeof(sal_Unicode) ) && !lcl_CmpBeginEndChars ( pForbidden->beginLine, - rTypo.GetJapanNotBeginLevel1(), + WW8DopTypography::GetJapanNotBeginLevel1(), rTypo.nMaxFollowing * sizeof(sal_Unicode) ) ) diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index c29cf966b45d..9f2d09ad92bb 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -361,16 +361,16 @@ void WW8Export::OutputLinkedOLE( const OUString& rOleId ) // Ouput the cPicLocation attribute ww::bytes* pBuf = new ww::bytes(); - GetWriter().InsUInt16( *pBuf, NS_sprm::LN_CPicLocation ); - GetWriter().InsUInt32( *pBuf, rOleId.copy( 1 ).toInt32() ); + SwWW8Writer::InsUInt16( *pBuf, NS_sprm::LN_CPicLocation ); + SwWW8Writer::InsUInt32( *pBuf, rOleId.copy( 1 ).toInt32() ); - GetWriter().InsUInt16( *pBuf, NS_sprm::LN_CFOle2 ); + SwWW8Writer::InsUInt16( *pBuf, NS_sprm::LN_CFOle2 ); pBuf->push_back( 1 ); - GetWriter().InsUInt16( *pBuf, NS_sprm::LN_CFSpec ); + SwWW8Writer::InsUInt16( *pBuf, NS_sprm::LN_CFSpec ); pBuf->push_back( 1 ); - GetWriter().InsUInt16( *pBuf, NS_sprm::LN_CFObj ); + SwWW8Writer::InsUInt16( *pBuf, NS_sprm::LN_CFObj ); pBuf->push_back( 1 ); pChpPlc->AppendFkpEntry( Strm().Tell(), pBuf->size(), pBuf->data() ); diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 114108c876d7..90b6a44c551a 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -1135,7 +1135,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, SwDocShell* pDocShell = rReader.mpDocShell; if(pDocShell) { - rReader.ReadEmbeddedData( aMemStream, pDocShell, hlStr); + SwWW8ImplReader::ReadEmbeddedData( aMemStream, pDocShell, hlStr); } } @@ -1990,8 +1990,8 @@ void SwWW8ImplReader::ImportDopTypography(const WW8DopTypography &rTypo) */ if (!rTypo.reserved2) { - i18n::ForbiddenCharacters aForbidden(rTypo.GetJapanNotBeginLevel1(), - rTypo.GetJapanNotEndLevel1()); + i18n::ForbiddenCharacters aForbidden(WW8DopTypography::GetJapanNotBeginLevel1(), + WW8DopTypography::GetJapanNotEndLevel1()); rDoc.getIDocumentSettingAccess().setForbiddenCharacters(LANGUAGE_JAPANESE,aForbidden); } diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx index 8898ffdea064..64968e4ed946 100644 --- a/sw/source/filter/xml/xmlexpit.cxx +++ b/sw/source/filter/xml/xmlexpit.cxx @@ -134,7 +134,7 @@ void SvXMLExportItemMapper::exportXML( const SvXMLExport& rExport, const SfxBoolItem* pSplit = PTR_CAST(SfxBoolItem, &rItem); assert(pSplit); //Wrong Which-ID const unsigned int eEnum = (pSplit && pSplit->GetValue()) ? 1 : 0; - rUnitConverter.convertEnum( aOut, eEnum, aXML_KeepTogetherType ); + SvXMLUnitConverter::convertEnum( aOut, eEnum, aXML_KeepTogetherType ); aValue = aOut.makeStringAndClear(); } if( bAddAttribute ) @@ -865,7 +865,7 @@ bool SvXMLExportItemMapper::QueryXMLValue( break; } - bOk = rUnitConverter.convertEnum( aOut, eEnum, psXML_BreakType ); + bOk = SvXMLUnitConverter::convertEnum( aOut, eEnum, psXML_BreakType ); } break; @@ -1039,7 +1039,7 @@ bool SvXMLExportItemMapper::QueryXMLValue( assert(pHoriOrient); //Wrong Which-ID if (pHoriOrient) { - rUnitConverter.convertEnum( aOut, pHoriOrient->GetHoriOrient(), + SvXMLUnitConverter::convertEnum( aOut, pHoriOrient->GetHoriOrient(), aXMLTableAlignMap ); bOk = true; } @@ -1051,7 +1051,7 @@ bool SvXMLExportItemMapper::QueryXMLValue( SwFmtVertOrient* pVertOrient = PTR_CAST(SwFmtVertOrient, &rItem); OSL_ENSURE( pVertOrient != NULL, "Wrong Which-ID" ); - rUnitConverter.convertEnum( aOut, pVertOrient->GetVertOrient(), + SvXMLUnitConverter::convertEnum( aOut, pVertOrient->GetVertOrient(), aXMLTableVAlignMap ); bOk = true; } diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx index c7f1efbfdf71..529a59879d98 100644 --- a/sw/source/filter/xml/xmlimpit.cxx +++ b/sw/source/filter/xml/xmlimpit.cxx @@ -593,7 +593,7 @@ bool SvXMLImportItemMapper::PutXMLValue( sal_uInt16 eEnum; - if( !rUnitConverter.convertEnum( eEnum, rValue, psXML_BreakType ) ) + if( !SvXMLUnitConverter::convertEnum( eEnum, rValue, psXML_BreakType ) ) return false; if( eEnum == 0 ) @@ -681,7 +681,7 @@ bool SvXMLImportItemMapper::PutXMLValue( { SvxGraphicPosition eGraphicPos = pBrush->GetGraphicPos(); sal_uInt16 nPos = GPOS_NONE; - if( rUnitConverter.convertEnum( nPos, rValue, + if( SvXMLUnitConverter::convertEnum( nPos, rValue, psXML_BrushRepeat ) ) { if( GPOS_MM != nPos || GPOS_NONE == eGraphicPos || @@ -740,7 +740,7 @@ bool SvXMLImportItemMapper::PutXMLValue( else ePos = GPOS_MM; } - else if( rUnitConverter.convertEnum( nTmp, aToken, + else if( SvXMLUnitConverter::convertEnum( nTmp, aToken, psXML_BrushHoriPos ) ) { if( bVert ) @@ -752,7 +752,7 @@ bool SvXMLImportItemMapper::PutXMLValue( bOk = false; bHori = true; } - else if( rUnitConverter.convertEnum( nTmp, aToken, + else if( SvXMLUnitConverter::convertEnum( nTmp, aToken, psXML_BrushVertPos ) ) { if( bHori ) @@ -827,7 +827,7 @@ bool SvXMLImportItemMapper::PutXMLValue( OSL_ENSURE( pHoriOrient != NULL, "Wrong Which-ID" ); sal_uInt16 nValue; - bOk = rUnitConverter.convertEnum( nValue, rValue, + bOk = SvXMLUnitConverter::convertEnum( nValue, rValue, aXMLTableAlignMap ); if( bOk ) pHoriOrient->SetHoriOrient( nValue ); @@ -840,7 +840,7 @@ bool SvXMLImportItemMapper::PutXMLValue( OSL_ENSURE( pVertOrient != NULL, "Wrong Which-ID" ); sal_uInt16 nValue; - bOk = rUnitConverter.convertEnum( nValue, rValue, + bOk = SvXMLUnitConverter::convertEnum( nValue, rValue, aXMLTableVAlignMap ); if( bOk ) pVertOrient->SetVertOrient( nValue ); diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx index faa2dd5dc2d2..d97fd0f54304 100644 --- a/sw/source/filter/xml/xmlithlp.cxx +++ b/sw/source/filter/xml/xmlithlp.cxx @@ -107,13 +107,13 @@ bool sw_frmitems_parseXMLBorder( const OUString& rValue, while( aTokens.getNextToken( aToken ) && !aToken.isEmpty() ) { if( !rHasWidth && - rUnitConverter.convertEnum( rNamedWidth, aToken, + SvXMLUnitConverter::convertEnum( rNamedWidth, aToken, psXML_NamedBorderWidths ) ) { rHasWidth = true; } else if( !rHasStyle && - rUnitConverter.convertEnum( rStyle, aToken, + SvXMLUnitConverter::convertEnum( rStyle, aToken, psXML_BorderStyles ) ) { rHasStyle = true; diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 22b56c43b669..7352a06ea6a7 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -838,15 +838,15 @@ void SwStdFontTabPage::Reset( const SfxItemSet* rSet) nLabelHeight = pFontConfig->GetFontHeight( FONT_CAPTION , nFontGroup, eLanguage ); nIndexHeight = pFontConfig->GetFontHeight( FONT_INDEX , nFontGroup, eLanguage ); if( nStandardHeight <= 0) - nStandardHeight = pFontConfig->GetDefaultHeightFor( FONT_STANDARD + nFontGroup * FONT_PER_GROUP, eLanguage); + nStandardHeight = SwStdFontConfig::GetDefaultHeightFor( FONT_STANDARD + nFontGroup * FONT_PER_GROUP, eLanguage); if( nTitleHeight <= 0) - nTitleHeight = pFontConfig->GetDefaultHeightFor( FONT_OUTLINE + nFontGroup * FONT_PER_GROUP, eLanguage); + nTitleHeight = SwStdFontConfig::GetDefaultHeightFor( FONT_OUTLINE + nFontGroup * FONT_PER_GROUP, eLanguage); if( nListHeight <= 0) - nListHeight = pFontConfig->GetDefaultHeightFor( FONT_LIST + nFontGroup * FONT_PER_GROUP, eLanguage); + nListHeight = SwStdFontConfig::GetDefaultHeightFor( FONT_LIST + nFontGroup * FONT_PER_GROUP, eLanguage); if( nLabelHeight <= 0) - nLabelHeight = pFontConfig->GetDefaultHeightFor( FONT_CAPTION + nFontGroup * FONT_PER_GROUP, eLanguage); + nLabelHeight = SwStdFontConfig::GetDefaultHeightFor( FONT_CAPTION + nFontGroup * FONT_PER_GROUP, eLanguage); if( nIndexHeight <= 0) - nIndexHeight = pFontConfig->GetDefaultHeightFor( FONT_INDEX + nFontGroup * FONT_PER_GROUP, eLanguage); + nIndexHeight = SwStdFontConfig::GetDefaultHeightFor( FONT_INDEX + nFontGroup * FONT_PER_GROUP, eLanguage); pDocOnlyCB->Enable(false); } diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index eee381038623..2cbde87a6fc6 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -94,8 +94,8 @@ void SwFldDBPage::Reset(const SfxItemSet*) for(sal_uInt16 i = rRg.nStart; i < rRg.nEnd; ++i) { - const sal_uInt16 nTypeId = GetFldMgr().GetTypeId(i); - const sal_Int32 nPos = m_pTypeLB->InsertEntry(GetFldMgr().GetTypeStr(i)); + const sal_uInt16 nTypeId = SwFldMgr::GetTypeId(i); + const sal_Int32 nPos = m_pTypeLB->InsertEntry(SwFldMgr::GetTypeStr(i)); m_pTypeLB->SetEntryData(nPos, reinterpret_cast<void*>(nTypeId)); } } @@ -103,7 +103,7 @@ void SwFldDBPage::Reset(const SfxItemSet*) { const sal_uInt16 nTypeId = GetCurField()->GetTypeId(); const sal_Int32 nPos = m_pTypeLB->InsertEntry( - GetFldMgr().GetTypeStr(GetFldMgr().GetPos(nTypeId))); + SwFldMgr::GetTypeStr(SwFldMgr::GetPos(nTypeId))); m_pTypeLB->SetEntryData(nPos, reinterpret_cast<void*>(nTypeId)); } diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index abf1b45179c3..d19672b9ef17 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -101,7 +101,7 @@ void SwFldDokPage::Reset(const SfxItemSet* ) // fill Type-Listbox for(sal_uInt16 i = rRg.nStart; i < rRg.nEnd; ++i) { - const sal_uInt16 nTypeId = GetFldMgr().GetTypeId(i); + const sal_uInt16 nTypeId = SwFldMgr::GetTypeId(i); switch (nTypeId) { @@ -117,7 +117,7 @@ void SwFldDokPage::Reset(const SfxItemSet* ) break; default: - nPos = m_pTypeLB->InsertEntry(GetFldMgr().GetTypeStr(i)); + nPos = m_pTypeLB->InsertEntry(SwFldMgr::GetTypeStr(i)); m_pTypeLB->SetEntryData(nPos, reinterpret_cast<void*>(nTypeId)); break; } @@ -131,7 +131,7 @@ void SwFldDokPage::Reset(const SfxItemSet* ) nTypeId = TYP_DATEFLD; if (nTypeId == TYP_FIXTIMEFLD) nTypeId = TYP_TIMEFLD; - nPos = m_pTypeLB->InsertEntry(GetFldMgr().GetTypeStr(GetFldMgr().GetPos(nTypeId))); + nPos = m_pTypeLB->InsertEntry(SwFldMgr::GetTypeStr(SwFldMgr::GetPos(nTypeId))); m_pTypeLB->SetEntryData(nPos, reinterpret_cast<void*>(nTypeId)); m_pNumFormatLB->SetAutomaticLanguage(pCurField->IsAutomaticLanguage()); SwWrtShell *pSh = GetWrtShell(); diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index 794485a51914..4e94a7775b82 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -68,7 +68,7 @@ SwFldEditDlg::SwFldEditDlg(SwView& rVw) if(!pCurFld) return; - pSh->SetCareWin(this); + SwViewShell::SetCareWin(this); if ( pSh->CrsrInsideInputFld() ) { @@ -195,7 +195,7 @@ SfxTabPage* SwFldEditDlg::CreatePage(sal_uInt16 nGroup) SwFldEditDlg::~SwFldEditDlg() { - pSh->SetCareWin(NULL); + SwViewShell::SetCareWin(NULL); pSh->EnterStdMode(); } diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index 9b9bb40ce69e..a663eba68771 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -111,15 +111,15 @@ void SwFldFuncPage::Reset(const SfxItemSet* ) // fill Typ-Listbox for(sal_uInt16 i = rRg.nStart; i < rRg.nEnd; ++i) { - const sal_uInt16 nTypeId = GetFldMgr().GetTypeId(i); - nPos = m_pTypeLB->InsertEntry(GetFldMgr().GetTypeStr(i)); + const sal_uInt16 nTypeId = SwFldMgr::GetTypeId(i); + nPos = m_pTypeLB->InsertEntry(SwFldMgr::GetTypeStr(i)); m_pTypeLB->SetEntryData(nPos, reinterpret_cast<void*>(nTypeId)); } } else { const sal_uInt16 nTypeId = GetCurField()->GetTypeId(); - nPos = m_pTypeLB->InsertEntry(GetFldMgr().GetTypeStr(GetFldMgr().GetPos(nTypeId))); + nPos = m_pTypeLB->InsertEntry(SwFldMgr::GetTypeStr(SwFldMgr::GetPos(nTypeId))); m_pTypeLB->SetEntryData(nPos, reinterpret_cast<void*>(nTypeId)); if (nTypeId == TYP_MACROFLD) diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 08b822ff9bf2..031b6308c6e0 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -165,11 +165,11 @@ void SwFldRefPage::Reset(const SfxItemSet* ) for (short i = rRg.nStart; i < rRg.nEnd; ++i) { - const sal_uInt16 nTypeId = GetFldMgr().GetTypeId(i); + const sal_uInt16 nTypeId = SwFldMgr::GetTypeId(i); if (!IsFldEdit() || nTypeId != TYP_SETREFFLD) { - nPos = m_pTypeLB->InsertEntry(GetFldMgr().GetTypeStr(i), i - rRg.nStart); + nPos = m_pTypeLB->InsertEntry(SwFldMgr::GetTypeStr(i), i - rRg.nStart); m_pTypeLB->SetEntryData(nPos, reinterpret_cast<void*>(nTypeId)); } } diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index a017599c51cd..4e69ec32455c 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -107,8 +107,8 @@ void SwFldVarPage::Reset(const SfxItemSet* ) for (short i = rRg.nStart; i < rRg.nEnd; ++i) { - nTypeId = GetFldMgr().GetTypeId(i); - nPos = m_pTypeLB->InsertEntry(GetFldMgr().GetTypeStr(i)); + nTypeId = SwFldMgr::GetTypeId(i); + nPos = m_pTypeLB->InsertEntry(SwFldMgr::GetTypeStr(i)); m_pTypeLB->SetEntryData(nPos, reinterpret_cast<void*>(nTypeId)); } } @@ -118,7 +118,7 @@ void SwFldVarPage::Reset(const SfxItemSet* ) nTypeId = pCurField->GetTypeId(); if (nTypeId == TYP_SETINPFLD) nTypeId = TYP_INPUTFLD; - nPos = m_pTypeLB->InsertEntry(GetFldMgr().GetTypeStr(GetFldMgr().GetPos(nTypeId))); + nPos = m_pTypeLB->InsertEntry(SwFldMgr::GetTypeStr(SwFldMgr::GetPos(nTypeId))); m_pTypeLB->SetEntryData(nPos, reinterpret_cast<void*>(nTypeId)); m_pNumFormatLB->SetAutomaticLanguage(pCurField->IsAutomaticLanguage()); SwWrtShell *pSh = GetWrtShell(); diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 79268fdcf006..7f537e01e9b8 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -491,7 +491,7 @@ IMPL_LINK_NOARG( SwMultiTOXTabDialog, ShowPreviewHdl ) if(!pExampleFrame->IsServiceAvailable()) { - pExampleFrame->CreateErrorMessage(0); + SwOneExampleFrame::CreateErrorMessage(0); } } m_pShowExampleCB->Show(pExampleFrame && pExampleFrame->IsServiceAvailable()); diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx index 93ac3107d689..c96807725bff 100644 --- a/sw/source/ui/misc/insfnote.cxx +++ b/sw/source/ui/misc/insfnote.cxx @@ -191,7 +191,7 @@ SwInsFootNoteDlg::SwInsFootNoteDlg(Window *pParent, SwWrtShell &rShell, bool bEd m_pPrevBT->SetClickHdl(LINK(this, SwInsFootNoteDlg, NextPrevHdl)); m_pNextBT->SetClickHdl(LINK(this, SwInsFootNoteDlg, NextPrevHdl)); - rSh.SetCareWin(this); + SwViewShell::SetCareWin(this); if (bEdit) { @@ -204,7 +204,7 @@ SwInsFootNoteDlg::SwInsFootNoteDlg(Window *pParent, SwWrtShell &rShell, bool bEd SwInsFootNoteDlg::~SwInsFootNoteDlg() { - rSh.SetCareWin(0); + SwViewShell::SetCareWin(0); if (bEdit) rSh.ResetSelect(0, false); diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index fc4831177d83..9973c2d5a340 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -364,7 +364,7 @@ void SwNumPositionTabPage::ActivatePage(const SfxItemSet& ) { const SfxPoolItem* pItem; sal_uInt16 nTmpNumLvl = - pOutlineDlg ? pOutlineDlg->GetActNumLevel() : 0; + pOutlineDlg ? SwOutlineTabDialog::GetActNumLevel() : 0; const SfxItemSet* pExampleSet = GetTabDialog()->GetExampleSet(); if(pExampleSet && pExampleSet->GetItemState(FN_PARAM_NUM_PRESET, false, &pItem)) { diff --git a/sw/source/ui/vba/vbarow.cxx b/sw/source/ui/vba/vbarow.cxx index 27db78bd8cfd..21537b2820d9 100644 --- a/sw/source/ui/vba/vbarow.cxx +++ b/sw/source/ui/vba/vbarow.cxx @@ -87,7 +87,7 @@ void SwVbaRow::SelectRow( const uno::Reference< frame::XModel >& xModel, const u sal_Int32 nColCount = aTableHelper.getTabColumnsCount( nEndRow ); // FIXME: the column count > 26 //sal_Char cCol = 'A' + nColCount - 1; - OUString sCol = aTableHelper.getColumnStr( nColCount - 1); + OUString sCol = SwVbaTableHelper::getColumnStr( nColCount - 1); aRangeName.append(':').append( sCol ).append( sal_Int32( nEndRow + 1 ) ); uno::Reference< table::XCellRange > xCellRange( xTextTable, uno::UNO_QUERY_THROW ); diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index e3612d1a8b61..8e8b30e62ff9 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -952,7 +952,7 @@ void SwDocShell::GetState(SfxItemSet& rSet) bDisable = true; break; } - pTmpFrm = pTmpFrm->GetNext(*pTmpFrm, this); + pTmpFrm = SfxViewFrame::GetNext(*pTmpFrm, this); } } // End of disabled "multiple layout" diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index bf2c429a1ed1..74cbb0332481 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -168,7 +168,7 @@ void SwDocShell::ToggleBrowserMode(bool bSet, SwView* _pView ) pTmpFrm = SfxViewFrame::GetFirst(this, false); } else - pTmpFrm = pTmpFrm->GetNext(*pTmpFrm, this, false); + pTmpFrm = SfxViewFrame::GetNext(*pTmpFrm, this, false); } const SwViewOption& rViewOptions = *pTempView->GetWrtShell().GetViewOptions(); pTempView->GetWrtShell().CheckBrowseView( true ); @@ -417,7 +417,7 @@ void SwDocShell::Execute(SfxRequest& rReq) } if( bFound && !bOnly ) break; - pTmpFrm = pTmpFrm->GetNext(*pTmpFrm, this); + pTmpFrm = SfxViewFrame::GetNext(*pTmpFrm, this); } if( pArgs && SFX_ITEM_SET == diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx index c7a5130b69cf..cda1266afbd7 100644 --- a/sw/source/uibase/app/docshini.cxx +++ b/sw/source/uibase/app/docshini.cxx @@ -213,7 +213,7 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) pFontItem.reset(); sal_Int32 nFontHeight = pStdFont->GetFontHeight( FONT_STANDARD, i, eLanguage ); if(nFontHeight <= 0) - nFontHeight = pStdFont->GetDefaultHeightFor( nFontId, eLanguage ); + nFontHeight = SwStdFontConfig::GetDefaultHeightFor( nFontId, eLanguage ); pDoc->SetDefault(SvxFontHeightItem( nFontHeight, 100, aFontHeightWhich[i] )); if( !bHTMLTemplSet ) { @@ -275,7 +275,7 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) } sal_Int32 nFontHeight = pStdFont->GetFontHeight( static_cast< sal_Int8 >(aFontIdPoolId[nIdx]), 0, eLanguage ); if(nFontHeight <= 0) - nFontHeight = pStdFont->GetDefaultHeightFor( aFontIdPoolId[nIdx], eLanguage ); + nFontHeight = SwStdFontConfig::GetDefaultHeightFor( aFontIdPoolId[nIdx], eLanguage ); if(!pColl) pColl = pDoc->GetTxtCollFromPool(aFontIdPoolId[nIdx + 1]); SvxFontHeightItem aFontHeight( (const SvxFontHeightItem&)pColl->GetFmtAttr( nFontHeightWhich, true )); diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index a95dc0ef970b..5565ef66401c 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -1377,7 +1377,7 @@ sal_uLong SwDBManager::GetColumnFmt( const OUString& rDBName, xConnection = pImpl->pMergeData->xConnection; xSource = SwDBManager::getDataSourceAsParent(xConnection,rDBName); bUseMergeData = true; - xColsSupp = xColsSupp.query( pImpl->pMergeData->xResultSet ); + xColsSupp.set(pImpl->pMergeData->xResultSet, css::uno::UNO_QUERY); } if(!xConnection.is()) { @@ -1389,7 +1389,7 @@ sal_uLong SwDBManager::GetColumnFmt( const OUString& rDBName, if(pParam && pParam->xConnection.is()) { xConnection = pParam->xConnection; - xColsSupp = xColsSupp.query( pParam->xResultSet ); + xColsSupp.set(pParam->xResultSet, css::uno::UNO_QUERY); } else { diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx index 68e9c6a4274b..31192a3f02fd 100644 --- a/sw/source/uibase/dochdl/gloshdl.cxx +++ b/sw/source/uibase/dochdl/gloshdl.cxx @@ -628,7 +628,7 @@ void SwGlossaryHdl::GetMacros( const OUString &rShortName, // ctor, dtor SwGlossaryHdl::SwGlossaryHdl(SfxViewFrame* pVwFrm, SwWrtShell *pSh) : rStatGlossaries( *::GetGlossaries() ), - aCurGrp( rStatGlossaries.GetDefName() ), + aCurGrp( SwGlossaries::GetDefName() ), pViewFrame( pVwFrm ), pWrtShell( pSh ), pCurGrp( 0 ) diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 2b7124fc0cdd..13cf00612798 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -3659,7 +3659,7 @@ bool SwTrnsfrDdeLink::WriteData( SvStream& rStrm ) rtl_TextEncoding eEncoding = DDE_TXT_ENCODING; const OString aAppNm(OUStringToOString( - GetpApp()->GetAppName(), eEncoding)); + Application::GetAppName(), eEncoding)); const OString aTopic(OUStringToOString( pDocShell->GetTitle(SFX_TITLE_FULLNAME), eEncoding)); const OString aName(OUStringToOString(sName, eEncoding)); diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx index 4d23b448e202..1915d3306024 100644 --- a/sw/source/uibase/docvw/SidebarTxtControl.cxx +++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx @@ -222,7 +222,7 @@ void SidebarTxtControl::KeyInput( const KeyEvent& rKeyEvt ) bool bIsProtected = mrSidebarWin.IsProtected(); if ( !bIsProtected || ( bIsProtected && - !mrSidebarWin.GetOutlinerView()->GetOutliner()->GetEditEngine().DoesKeyChangeText(rKeyEvt)) ) + !EditEngine::DoesKeyChangeText(rKeyEvt)) ) { bDone = GetTextView() && GetTextView()->PostKeyEvent( rKeyEvt ); } @@ -347,7 +347,7 @@ void SidebarTxtControl::Command( const CommandEvent& rCEvt ) } else { - boost::scoped_ptr<SfxPopupMenuManager> pMgr(mrDocView.GetViewFrame()->GetDispatcher()->Popup(0, this,&rCEvt.GetMousePosPixel())); + boost::scoped_ptr<SfxPopupMenuManager> pMgr(SfxDispatcher::Popup(0, this,&rCEvt.GetMousePosPixel())); ((PopupMenu*)pMgr->GetSVMenu())->SetSelectHdl( LINK(this, SidebarTxtControl, Select) ); { diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx index 3abc911a4e98..856d18c993d3 100644 --- a/sw/source/uibase/docvw/SidebarWin.cxx +++ b/sw/source/uibase/docvw/SidebarWin.cxx @@ -419,7 +419,7 @@ void SwSidebarWin::InitControls() sal_uLong nCntrl = mpOutliner->GetControlWord(); // TODO: crash when AUTOCOMPLETE enabled nCntrl |= EE_CNTRL_MARKFIELDS | EE_CNTRL_PASTESPECIAL | EE_CNTRL_AUTOCORRECT | EV_CNTRL_AUTOSCROLL | EE_CNTRL_URLSFXEXECUTE; // | EE_CNTRL_AUTOCOMPLETE; - if (pVOpt->IsFieldShadings()) + if (SwViewOption::IsFieldShadings()) nCntrl |= EE_CNTRL_MARKFIELDS; else nCntrl &= ~EE_CNTRL_MARKFIELDS; @@ -430,9 +430,9 @@ void SwSidebarWin::InitControls() mpOutliner->SetControlWord(nCntrl); sal_uInt16 aIndex = SW_MOD()->InsertRedlineAuthor(GetAuthor()); - SetColor( mrMgr.GetColorDark(aIndex), - mrMgr.GetColorLight(aIndex), - mrMgr.GetColorAnchor(aIndex)); + SetColor( SwPostItMgr::GetColorDark(aIndex), + SwPostItMgr::GetColorLight(aIndex), + SwPostItMgr::GetColorAnchor(aIndex)); CheckMetaText(); diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 11521509fc67..71e7f483c4be 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -5122,7 +5122,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt ) } } else if ( !m_rView.ExecSpellPopup( aDocPos ) ) - GetView().GetViewFrame()->GetDispatcher()->ExecutePopup( 0, this, &aPixPos); + SfxDispatcher::ExecutePopup( 0, this, &aPixPos); } else if (m_pApplyTempl->bUndo) rSh.Do(SwWrtShell::UNDO); @@ -5882,7 +5882,7 @@ void QuickHelpData::FillStrArr( SwWrtShell& rSh, const OUString& rWord ) } // Add matching words from AutoCompleteWord list - const SwAutoCompleteWord& rACList = rSh.GetAutoCompleteWords(); + const SwAutoCompleteWord& rACList = SwEditShell::GetAutoCompleteWords(); std::vector<OUString> strings; if ( rACList.GetWordsMatching( rWord, strings ) ) diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index 5ad3760bac3a..c1ff04e01f47 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -412,8 +412,7 @@ void TextViewOutWin::Command( const CommandEvent& rCEvt ) switch(rCEvt.GetCommand()) { case COMMAND_CONTEXTMENU: - ((SwSrcEditWindow*)GetParent())->GetSrcView()->GetViewFrame()-> - GetDispatcher()->ExecutePopup(); + SfxDispatcher::ExecutePopup(); break; case COMMAND_WHEEL: case COMMAND_STARTAUTOSCROLL: diff --git a/sw/source/uibase/lingu/hhcwrp.cxx b/sw/source/uibase/lingu/hhcwrp.cxx index 5560c52cd765..941ca804710d 100644 --- a/sw/source/uibase/lingu/hhcwrp.cxx +++ b/sw/source/uibase/lingu/hhcwrp.cxx @@ -116,7 +116,7 @@ SwHHCWrapper::~SwHHCWrapper() { delete m_pConvArgs; - m_rWrtShell.SetCareWin( NULL ); + SwViewShell::SetCareWin( NULL ); // check for existence of a draw view which means that there are // (or previously were) draw objects present in the document. diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index 8f5968d7bd84..81444cddc8ee 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -937,7 +937,7 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, GotoHdl) SvTreeListEntry* pActEntry = pSelEntry; pSh->StartAction(); pSh->EnterStdMode(); - pSh->SetCareWin(pParentDlg); + SwViewShell::SetCareWin(pParentDlg); while (pSelEntry) { @@ -974,7 +974,7 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, GotoHdl) pSh->LeaveAddMode(); pSh->EndAction(); - pSh->SetCareWin(NULL); + SwViewShell::SetCareWin(NULL); } bool bEnable = !pSh->getIDocumentRedlineAccess()->GetRedlinePassword().getLength(); pTPView->EnableAccept( bEnable && bSel /*&& !bReadonlySel*/ ); @@ -1101,7 +1101,7 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl) sTitle += SW_RESSTR( nResId ); pDlg->SetText(sTitle); - pSh->SetCareWin(pDlg->GetWindow()); + SwViewShell::SetCareWin(pDlg->GetWindow()); if ( pDlg->Execute() == RET_OK ) { @@ -1114,7 +1114,7 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl) } pDlg.reset(); - pSh->SetCareWin(NULL); + SwViewShell::SetCareWin(NULL); } } diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index 2b6158dff581..86bcdfc0a11b 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -1274,7 +1274,7 @@ void SwAnnotationShell::ExecLingu(SfxRequest &rReq) if( !bCommonTerms ) nOptions = nOptions | i18n::TextConversionOption::CHARACTER_BY_CHARACTER; - Font aTargetFont = pOLV->GetWindow()->GetDefaultFont( DEFAULTFONT_CJK_TEXT, + Font aTargetFont = OutputDevice::GetDefaultFont( DEFAULTFONT_CJK_TEXT, nTargetLang, DEFAULTFONT_FLAGS_ONLYONE ); pOLV->StartTextConversion( nSourceLang, nTargetLang, &aTargetFont, nOptions, false, false ); diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx index f362e30377f1..346859aa86f7 100644 --- a/sw/source/uibase/shells/drwtxtsh.cxx +++ b/sw/source/uibase/shells/drwtxtsh.cxx @@ -353,7 +353,7 @@ void SwDrawTextShell::ExecDrawLingu(SfxRequest &rReq) if( !bCommonTerms ) nOptions = nOptions | i18n::TextConversionOption::CHARACTER_BY_CHARACTER; - Font aTargetFont = pOLV->GetWindow()->GetDefaultFont( DEFAULTFONT_CJK_TEXT, + Font aTargetFont = OutputDevice::GetDefaultFont( DEFAULTFONT_CJK_TEXT, nTargetLang, DEFAULTFONT_FLAGS_ONLYONE ); pOLV->StartTextConversion( nSourceLang, nTargetLang, &aTargetFont, nOptions, false, false ); diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx index 3c87e9135c91..8278f700d81b 100644 --- a/sw/source/uibase/shells/textfld.cxx +++ b/sw/source/uibase/shells/textfld.cxx @@ -489,7 +489,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) pDlg->SetNextHdl(LINK(this, SwTextShell, RedlineNextHdl)); } - rSh.SetCareWin(pDlg->GetWindow()); + SwViewShell::SetCareWin(pDlg->GetWindow()); bNoInterrupt = true; if ( pDlg->Execute() == RET_OK ) @@ -502,7 +502,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) } pDlg.reset(); - rSh.SetCareWin(NULL); + SwViewShell::SetCareWin(NULL); bNoInterrupt = false; rSh.ClearMark(); GetView().AttrChangedNotify(GetShellPtr()); diff --git a/sw/source/uibase/shells/textsh2.cxx b/sw/source/uibase/shells/textsh2.cxx index 0f4c3662a3a2..d3576190433d 100644 --- a/sw/source/uibase/shells/textsh2.cxx +++ b/sw/source/uibase/shells/textsh2.cxx @@ -128,7 +128,7 @@ void SwTextShell::ExecDB(SfxRequest &rReq) if ( !xConnection.is() ) { Reference<XDataSource> xSource; - xConnection = pDBManager->GetConnection(sSourceArg, xSource); + xConnection = SwDBManager::GetConnection(sSourceArg, xSource); } if(!xConnection.is()) return ; diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index b0016dfdbd7a..62f49adb813d 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -452,7 +452,7 @@ void SwPagePreviewWin::Command( const CommandEvent& rCEvt ) switch( rCEvt.GetCommand() ) { case COMMAND_CONTEXTMENU: - mrView.GetViewFrame()->GetDispatcher()->ExecutePopup(); + SfxDispatcher::ExecutePopup(); bCallBase = false; break; diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx index dfdf33112381..95aa89f7482d 100644 --- a/sw/source/uibase/uiview/viewling.cxx +++ b/sw/source/uibase/uiview/viewling.cxx @@ -164,7 +164,7 @@ void SwView::ExecLingu(SfxRequest &rReq) if( !bCommonTerms ) nOptions = nOptions | i18n::TextConversionOption::CHARACTER_BY_CHARACTER; - Font aTargetFont = GetEditWin().GetDefaultFont( DEFAULTFONT_CJK_TEXT, + Font aTargetFont = OutputDevice::GetDefaultFont( DEFAULTFONT_CJK_TEXT, nTargetLang, DEFAULTFONT_FLAGS_ONLYONE ); // disallow formatting, updating the view, ... while diff --git a/sw/source/uibase/uno/dlelstnr.cxx b/sw/source/uibase/uno/dlelstnr.cxx index 802d45c40f4b..7827b654954d 100644 --- a/sw/source/uibase/uno/dlelstnr.cxx +++ b/sw/source/uibase/uno/dlelstnr.cxx @@ -114,7 +114,7 @@ void SAL_CALL SwLinguServiceEventListener::processLinguServiceEvent( } if (rLngSvcEvent.nEvent & HYPHENATE_AGAIN) { - SwView *pSwView = SW_MOD()->GetFirstView(); + SwView *pSwView = SwModule::GetFirstView(); //!! since this function may be called within the ctor of //!! SwView (during formatting) where the WrtShell is not yet @@ -123,7 +123,7 @@ void SAL_CALL SwLinguServiceEventListener::processLinguServiceEvent( while (pSwView && pSwView->GetWrtShellPtr()) { pSwView->GetWrtShell().ChgHyphenation(); - pSwView = SW_MOD()->GetNextView( pSwView ); + pSwView = SwModule::GetNextView( pSwView ); } } } diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx index ea4b619eb633..e6e0bca7e3a2 100644 --- a/sw/source/uibase/uno/unomod.cxx +++ b/sw/source/uibase/uno/unomod.cxx @@ -623,10 +623,10 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c case HANDLE_VIEWSET_DRAWINGS : mpViewOption->SetDraw(bVal); break; case HANDLE_VIEWSET_FIELD_COMMANDS : mpViewOption->SetFldName(bVal); break; case HANDLE_VIEWSET_ANNOTATIONS : mpViewOption->SetPostIts(bVal); break; - case HANDLE_VIEWSET_INDEX_MARK_BACKGROUND : mpViewOption->SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bVal, true); break; + case HANDLE_VIEWSET_INDEX_MARK_BACKGROUND : SwViewOption::SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bVal, true); break; case HANDLE_VIEWSET_NONPRINTING_CHARACTERS: mpViewOption->SetViewMetaChars( bVal ); break; - case HANDLE_VIEWSET_FOOTNOTE_BACKGROUND : mpViewOption->SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bVal, true); break; - case HANDLE_VIEWSET_TEXT_FIELD_BACKGROUND : mpViewOption->SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bVal, true); break; + case HANDLE_VIEWSET_FOOTNOTE_BACKGROUND : SwViewOption::SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bVal, true); break; + case HANDLE_VIEWSET_TEXT_FIELD_BACKGROUND : SwViewOption::SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bVal, true); break; case HANDLE_VIEWSET_PARA_BREAKS : mpViewOption->SetParagraph(bVal); break; case HANDLE_VIEWSET_SOFT_HYPHENS : mpViewOption->SetSoftHyph(bVal); break; case HANDLE_VIEWSET_SPACES : mpViewOption->SetBlank(bVal); break; @@ -636,7 +636,7 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c case HANDLE_VIEWSET_HIDDEN_TEXT : mpViewOption->SetShowHiddenField(bVal); break; case HANDLE_VIEWSET_HIDDEN_CHARACTERS : mpViewOption->SetShowHiddenChar(bVal); break; case HANDLE_VIEWSET_HIDDEN_PARAGRAPHS : mpViewOption->SetShowHiddenPara(bVal); break; - case HANDLE_VIEWSET_TABLE_BOUNDARIES : mpViewOption->SetAppearanceFlag(VIEWOPT_TABLE_BOUNDARIES, bVal, true); break; + case HANDLE_VIEWSET_TABLE_BOUNDARIES : SwViewOption::SetAppearanceFlag(VIEWOPT_TABLE_BOUNDARIES, bVal, true); break; case HANDLE_VIEWSET_TEXT_BOUNDARIES : mpViewOption->SetDocBoundaries(bVal); break; case HANDLE_VIEWSET_SMOOTH_SCROLLING : mpViewOption->SetSmoothScroll(bVal); break; case HANDLE_VIEWSET_SHOW_CONTENT_TIPS : mpViewOption->SetShowContentTips(bVal); break; diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 73d687a815aa..c020b75d662a 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -2754,7 +2754,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer( { // HTML source view and prospect adapt to the printer's paper size aTmpSize = pPrinter->GetPaperSize(); - aTmpSize = pPrinter->LogicToLogic( aTmpSize, + aTmpSize = OutputDevice::LogicToLogic( aTmpSize, pPrinter->GetMapMode(), MapMode( MAP_100TH_MM )); aPageSize = awt::Size( aTmpSize.Width(), aTmpSize.Height() ); #if 0 diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index f4e7830319e2..ff5dfc8b2628 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -1174,7 +1174,7 @@ OUString SwNavigationPI::CreateDropFileName( TransferableDataHelper& rData ) sal_Int8 SwNavigationPI::AcceptDrop( const AcceptDropEvent& /*rEvt*/ ) { - return ( !aContentTree.IsInDrag() && + return ( !SwContentTree::IsInDrag() && ( aContentTree.IsDropFormatSupported( FORMAT_FILE ) || aContentTree.IsDropFormatSupported( FORMAT_STRING ) || aContentTree.IsDropFormatSupported( SOT_FORMATSTR_ID_SOLK ) || @@ -1192,7 +1192,7 @@ sal_Int8 SwNavigationPI::ExecuteDrop( const ExecuteDropEvent& rEvt ) TransferableDataHelper aData( rEvt.maDropEvent.Transferable ); sal_Int8 nRet = DND_ACTION_NONE; OUString sFileName; - if( !aContentTree.IsInDrag() && + if( !SwContentTree::IsInDrag() && !(sFileName = SwNavigationPI::CreateDropFileName( aData )).isEmpty() ) { INetURLObject aTemp( sFileName ); diff --git a/sw/source/uibase/utlui/prcntfld.cxx b/sw/source/uibase/utlui/prcntfld.cxx index cd4863753d10..182e866bf3ef 100644 --- a/sw/source/uibase/utlui/prcntfld.cxx +++ b/sw/source/uibase/utlui/prcntfld.cxx @@ -76,7 +76,7 @@ void PercentField::ShowPercent(bool bPercent) m_pField->SetUnit(FUNIT_CUSTOM); m_pField->SetDecimalDigits( 0 ); - nAktWidth = m_pField->ConvertValue(nOldMin, 0, nOldDigits, eOldUnit, FUNIT_TWIP); + nAktWidth = MetricField::ConvertValue(nOldMin, 0, nOldDigits, eOldUnit, FUNIT_TWIP); // round to 0.5 percent nPercent = ((nAktWidth * 10) / nRefValue + 5) / 10; @@ -86,7 +86,7 @@ void PercentField::ShowPercent(bool bPercent) m_pField->SetBaseValue(0); if (nOldValue != nLastValue) { - nAktWidth = m_pField->ConvertValue(nOldValue, 0, nOldDigits, eOldUnit, FUNIT_TWIP); + nAktWidth = MetricField::ConvertValue(nOldValue, 0, nOldDigits, eOldUnit, FUNIT_TWIP); nPercent = ((nAktWidth * 10) / nRefValue + 5) / 10; m_pField->SetValue(nPercent); nLastPercent = nPercent; @@ -129,12 +129,12 @@ void PercentField::SetPrcntValue(sal_Int64 nNewValue, FieldUnit eInUnit) sal_Int64 nPercent, nAktWidth; if(eInUnit == FUNIT_TWIP) { - nAktWidth = m_pField->ConvertValue(nNewValue, 0, nOldDigits, FUNIT_TWIP, FUNIT_TWIP); + nAktWidth = MetricField::ConvertValue(nNewValue, 0, nOldDigits, FUNIT_TWIP, FUNIT_TWIP); } else { sal_Int64 nValue = Convert(nNewValue, eInUnit, eOldUnit); - nAktWidth = m_pField->ConvertValue(nValue, 0, nOldDigits, eOldUnit, FUNIT_TWIP); + nAktWidth = MetricField::ConvertValue(nValue, 0, nOldDigits, eOldUnit, FUNIT_TWIP); } nPercent = ((nAktWidth * 10) / nRefValue + 5) / 10; m_pField->SetValue(nPercent); @@ -144,7 +144,7 @@ void PercentField::SetPrcntValue(sal_Int64 nNewValue, FieldUnit eInUnit) void PercentField::SetBaseValue(sal_Int64 nNewValue, FieldUnit eInUnit) { if (m_pField->GetUnit() == FUNIT_CUSTOM) - nOldBaseValue = m_pField->ConvertValue(nNewValue, 0, nOldDigits, eInUnit, eOldUnit); + nOldBaseValue = MetricField::ConvertValue(nNewValue, 0, nOldDigits, eInUnit, eOldUnit); else m_pField->SetBaseValue(nNewValue, eInUnit); } @@ -219,12 +219,12 @@ void PercentField::SetUserValue(sal_Int64 nNewValue, FieldUnit eInUnit) sal_Int64 nPercent, nAktWidth; if (eInUnit == FUNIT_TWIP) { - nAktWidth = m_pField->ConvertValue(nNewValue, 0, nOldDigits, FUNIT_TWIP, FUNIT_TWIP); + nAktWidth = MetricField::ConvertValue(nNewValue, 0, nOldDigits, FUNIT_TWIP, FUNIT_TWIP); } else { sal_Int64 nValue = Convert(nNewValue, eInUnit, eOldUnit); - nAktWidth = m_pField->ConvertValue(nValue, 0, nOldDigits, eOldUnit, FUNIT_TWIP); + nAktWidth = MetricField::ConvertValue(nValue, 0, nOldDigits, eOldUnit, FUNIT_TWIP); } nPercent = ((nAktWidth * 10) / nRefValue + 5) / 10; m_pField->SetUserValue(nPercent,FUNIT_NONE); @@ -264,7 +264,7 @@ sal_Int64 PercentField::Convert(sal_Int64 nValue, FieldUnit eInUnit, FieldUnit e if (eOutUnit == FUNIT_TWIP) // Only convert if necessary return NormalizePercent(nTwipValue); else - return m_pField->ConvertValue(NormalizePercent(nTwipValue), 0, nOldDigits, FUNIT_TWIP, eOutUnit); + return MetricField::ConvertValue(NormalizePercent(nTwipValue), 0, nOldDigits, FUNIT_TWIP, eOutUnit); } if (eOutUnit == FUNIT_CUSTOM) @@ -276,12 +276,12 @@ sal_Int64 PercentField::Convert(sal_Int64 nValue, FieldUnit eInUnit, FieldUnit e if (eInUnit == FUNIT_TWIP) // Only convert if necessary nAktWidth = nValue; else - nAktWidth = m_pField->ConvertValue(nValue, 0, nOldDigits, eInUnit, FUNIT_TWIP); + nAktWidth = MetricField::ConvertValue(nValue, 0, nOldDigits, eInUnit, FUNIT_TWIP); // Round to 0.5 percent return ((nAktWidth * 1000) / nRefValue + 5) / 10; } - return m_pField->ConvertValue(nValue, 0, nOldDigits, eInUnit, eOutUnit); + return MetricField::ConvertValue(nValue, 0, nOldDigits, eInUnit, eOutUnit); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |