summaryrefslogtreecommitdiff
path: root/sw/source/ui/dbui
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/dbui')
-rw-r--r--sw/source/ui/dbui/dbinsdlg.cxx16
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.cxx14
-rw-r--r--sw/source/ui/dbui/mmoutputpage.cxx8
3 files changed, 19 insertions, 19 deletions
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 24eb19692340..cc3befe72043 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -716,7 +716,7 @@ IMPL_LINK_TYPED( SwInsertDBColAutoPilot, TableFormatHdl, Button*, pButton, void
}
else
nWidth = rSh.GetAnyCurRect(
- FrmTypeFlags::FLY_ANY & rSh.GetFrmType( nullptr, true )
+ FrameTypeFlags::FLY_ANY & rSh.GetFrameType( nullptr, true )
? RECT_FLY_PRT_EMBEDDED
: RECT_PAGE_PRT ).Width();
@@ -1194,7 +1194,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
if( !rSh.IsEndPara() )
{
rSh.SwEditShell::SplitNode();
- rSh.SwCrsrShell::Left(1,CRSR_SKIP_CHARS);
+ rSh.SwCursorShell::Left(1,CRSR_SKIP_CHARS);
}
rSh.DoUndo( false );
@@ -1247,7 +1247,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
GetFieldType( 0, RES_DBNEXTSETFLD )),
"1", "", aDBData );
- bool bSetCrsr = true;
+ bool bSetCursor = true;
const size_t nCols = aColArr.size();
::sw::mark::IMark* pMark = nullptr;
for( sal_Int32 i = 0 ; ; ++i )
@@ -1358,21 +1358,21 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
{
rSh.Insert( sIns );
- if( bSetCrsr)
+ if( bSetCursor)
{
// to the beginning and set a mark, so that
// the cursor can be set to the initial position
// at the end.
- rSh.SwCrsrShell::MovePara(
+ rSh.SwCursorShell::MovePara(
GetfnParaCurr(), GetfnParaStart() );
pMark = rSh.SetBookmark(
vcl::KeyCode(),
OUString(),
OUString(), IDocumentMarkAccess::MarkType::UNO_BOOKMARK );
- rSh.SwCrsrShell::MovePara(
+ rSh.SwCursorShell::MovePara(
GetfnParaCurr(), GetfnParaEnd() );
- bSetCrsr = false;
+ bSetCursor = false;
}
}
}
@@ -1396,7 +1396,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
pWait.reset(new SwWait( *pView->GetDocShell(), true ));
}
- if( !bSetCrsr && pMark != nullptr)
+ if( !bSetCursor && pMark != nullptr)
{
rSh.SetMark();
rSh.GotoMark( pMark );
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index 10fbcdc0752f..06446f3dcdb2 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -296,17 +296,17 @@ SwFrameFormat* SwMailMergeLayoutPage::InsertAddressFrame(
else
aSet.Put(SwFormatHoriOrient( rDestination.X(), text::HoriOrientation::NONE, text::RelOrientation::PAGE_FRAME ));
aSet.Put(SwFormatVertOrient( rDestination.Y(), text::VertOrientation::NONE, text::RelOrientation::PAGE_FRAME ));
- aSet.Put(SwFormatFrmSize( ATT_MIN_SIZE, DEFAULT_ADDRESS_WIDTH, DEFAULT_ADDRESS_HEIGHT ));
+ aSet.Put(SwFormatFrameSize( ATT_MIN_SIZE, DEFAULT_ADDRESS_WIDTH, DEFAULT_ADDRESS_HEIGHT ));
// the example gets a border around the frame, the real document doesn't get one
if(!bExample)
aSet.Put(SvxBoxItem( RES_BOX ));
aSet.Put(SwFormatSurround( SURROUND_NONE ));
- rShell.NewFlyFrm(aSet, true );
+ rShell.NewFlyFrame(aSet, true );
SwFrameFormat* pRet = rShell.GetFlyFrameFormat();
OSL_ENSURE( pRet, "Fly not inserted" );
- rShell.UnSelectFrm();
+ rShell.UnSelectFrame();
const Sequence< OUString> aBlocks = rConfigItem.GetAddressBlocks();
if(bExample)
{
@@ -423,7 +423,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig
const SwRect& rPageRect = rShell.GetAnyCurRect(RECT_PAGE);
const Point aGreetingPos( DEFAULT_LEFT_DISTANCE + rPageRect.Left(), GREETING_TOP_DISTANCE );
- const bool bRet = rShell.SetShadowCrsrPos( aGreetingPos, FILL_SPACE );
+ const bool bRet = rShell.SetShadowCursorPos( aGreetingPos, FILL_SPACE );
if(!bRet)
{
@@ -654,8 +654,8 @@ IMPL_LINK_NOARG_TYPED(SwMailMergeLayoutPage, PreviewLoadedHdl_Impl, SwOneExample
aZoom <<= (sal_Int16)DocumentZoomType::ENTIRE_PAGE;
m_xViewProperties->setPropertyValue(UNO_NAME_ZOOM_TYPE, aZoom);
- const SwFormatFrmSize& rPageSize = m_pExampleWrtShell->GetPageDesc(
- m_pExampleWrtShell->GetCurPageDesc()).GetMaster().GetFrmSize();
+ const SwFormatFrameSize& rPageSize = m_pExampleWrtShell->GetPageDesc(
+ m_pExampleWrtShell->GetCurPageDesc()).GetMaster().GetFrameSize();
m_pLeftMF->SetMax(rPageSize.GetWidth() - DEFAULT_LEFT_DISTANCE);
m_pTopMF->SetMax(rPageSize.GetHeight() - DEFAULT_TOP_DISTANCE);
}
@@ -702,7 +702,7 @@ IMPL_LINK_NOARG_TYPED(SwMailMergeLayoutPage, ChangeAddressHdl_Impl, SpinField&,
else
aSet.Put(SwFormatHoriOrient( nLeft, text::HoriOrientation::NONE, text::RelOrientation::PAGE_FRAME ));
aSet.Put(SwFormatVertOrient( nTop, text::VertOrientation::NONE, text::RelOrientation::PAGE_FRAME ));
- m_pExampleWrtShell->GetDoc()->SetFlyFrmAttr( *m_pAddressBlockFormat, aSet );
+ m_pExampleWrtShell->GetDoc()->SetFlyFrameAttr( *m_pAddressBlockFormat, aSet );
}
}
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 1ab325949492..eaf6d5f9efa2 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -552,11 +552,11 @@ IMPL_LINK_TYPED(SwMailMergeOutputPage, SaveStartHdl_Impl, Button*, pButton, void
OSL_ENSURE( pSourceView, "source view missing");
if(pSourceView)
{
- SfxViewFrame* pSourceViewFrm = pSourceView->GetViewFrame();
+ SfxViewFrame* pSourceViewFrame = pSourceView->GetViewFrame();
uno::Reference< frame::XFrame > xFrame =
- pSourceViewFrm->GetFrame().GetFrameInterface();
+ pSourceViewFrame->GetFrame().GetFrameInterface();
xFrame->getContainerWindow()->setVisible(sal_True);
- pSourceViewFrm->GetDispatcher()->Execute(SID_SAVEDOC, SfxCallMode::SYNCHRON);
+ pSourceViewFrame->GetDispatcher()->Execute(SID_SAVEDOC, SfxCallMode::SYNCHRON);
xFrame->getContainerWindow()->setVisible(sal_False);
SwDocShell* pDocShell = pSourceView->GetDocShell();
//if the document has been saved its URL has to be stored for
@@ -594,7 +594,7 @@ int SwMailMergeOutputPage::documentStartPageNumber( int document ) const
SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
SwView* pTargetView = rConfigItem.GetTargetView();
assert( pTargetView );
- SwCrsrShell& shell = pTargetView->GetWrtShell();
+ SwCursorShell& shell = pTargetView->GetWrtShell();
const SwDocMergeInfo& info = rConfigItem.GetDocumentMergeInfo( document );
sal_uInt16 page, dummy;
shell.Push();
generated by cgit (git 2.34.1) at 2024-06-27 08:36:46 +0000