diff options
Diffstat (limited to 'sw/source/uibase/shells')
| -rw-r--r-- | sw/source/uibase/shells/annotsh.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/shells/drwtxtsh.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/shells/textfld.cxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/shells/textsh2.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
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 ; |