diff options
Diffstat (limited to 'sw/source/uibase')
23 files changed, 49 insertions, 50 deletions
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: */ |