summaryrefslogtreecommitdiff
path: root/sd/source/ui/view
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/view')
-rw-r--r--sd/source/ui/view/DocumentRenderer.cxx12
-rw-r--r--sd/source/ui/view/Outliner.cxx16
-rw-r--r--sd/source/ui/view/drawview.cxx4
-rw-r--r--sd/source/ui/view/drviews2.cxx8
-rw-r--r--sd/source/ui/view/drviewse.cxx4
-rw-r--r--sd/source/ui/view/outlnvsh.cxx2
-rw-r--r--sd/source/ui/view/outlview.cxx8
-rw-r--r--sd/source/ui/view/sdview2.cxx6
8 files changed, 29 insertions, 31 deletions
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 38989bd61c2a..feeb2c1b7b00 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -1121,12 +1121,12 @@ namespace {
const ::tools::Rectangle aOutRect (rPrinter.GetPageOffset(), rPrinter.GetOutputSize());
Outliner* pOutliner = rDocument.GetInternalOutliner();
const OutlinerMode nSavedOutlMode (pOutliner->GetOutlinerMode());
- const bool bSavedUpdateMode (pOutliner->GetUpdateMode());
+ const bool bSavedUpdateMode (pOutliner->IsUpdateLayout());
const Size aSavedPaperSize (pOutliner->GetPaperSize());
pOutliner->Init(OutlinerMode::OutlineView);
pOutliner->SetPaperSize(aOutRect.GetSize());
- pOutliner->SetUpdateMode(true);
+ pOutliner->SetUpdateLayout(true);
pOutliner->Clear();
pOutliner->SetText(*mpParaObject);
@@ -1139,7 +1139,7 @@ namespace {
// Restore outliner and printer.
pOutliner->Clear();
- pOutliner->SetUpdateMode(bSavedUpdateMode);
+ pOutliner->SetUpdateLayout(bSavedUpdateMode);
pOutliner->SetPaperSize(aSavedPaperSize);
pOutliner->Init(nSavedOutlMode);
}
@@ -1626,11 +1626,11 @@ private:
Outliner* pOutliner = mrBase.GetDocument()->GetInternalOutliner();
pOutliner->Init(OutlinerMode::OutlineView);
const OutlinerMode nSavedOutlMode (pOutliner->GetOutlinerMode());
- const bool bSavedUpdateMode (pOutliner->GetUpdateMode());
+ const bool bSavedUpdateMode (pOutliner->IsUpdateLayout());
const Size aSavedPaperSize (pOutliner->GetPaperSize());
const MapMode aSavedMapMode (pOutliner->GetRefMapMode());
pOutliner->SetPaperSize(aOutRect.GetSize());
- pOutliner->SetUpdateMode(true);
+ pOutliner->SetUpdateLayout(true);
::tools::Long nPageH = aOutRect.GetHeight();
@@ -1751,7 +1751,7 @@ private:
}
pOutliner->SetRefMapMode(aSavedMapMode);
- pOutliner->SetUpdateMode(bSavedUpdateMode);
+ pOutliner->SetUpdateLayout(bSavedUpdateMode);
pOutliner->SetPaperSize(aSavedPaperSize);
pOutliner->Init(nSavedOutlMode);
}
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 16e86f239d83..de86a8695605 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -315,7 +315,7 @@ void SdOutliner::EndSpelling()
mpImpl->ReleaseOutlinerView();
}
- SetUpdateMode(true);
+ SetUpdateLayout(true);
}
// Before clearing the modify flag use it as a hint that
@@ -965,7 +965,7 @@ void SdOutliner::DetectChange()
if (pPageView != nullptr)
mpView->UnmarkAllObj (pPageView);
mpView->SdrEndTextEdit();
- SetUpdateMode(false);
+ SetUpdateLayout(false);
OutlinerView* pOutlinerView = getOutlinerView();
if (pOutlinerView != nullptr)
pOutlinerView->SetOutputArea( ::tools::Rectangle( Point(), Size(1, 1) ) );
@@ -1187,7 +1187,7 @@ void SdOutliner::ProvideNextTextObject()
{
DBG_UNHANDLED_EXCEPTION("sd.view");
}
- SetUpdateMode(false);
+ SetUpdateLayout(false);
OutlinerView* pOutlinerView = getOutlinerView();
if (pOutlinerView != nullptr)
pOutlinerView->SetOutputArea( ::tools::Rectangle( Point(), Size(1, 1) ) );
@@ -1642,7 +1642,7 @@ void SdOutliner::EnterEditMode (bool bGrabFocus)
mpView->SdrBeginTextEdit(mpSearchSpellTextObj, pPV, mpWindow, true, this,
pOutlinerView, true, true, bGrabFocus);
- SetUpdateMode(true);
+ SetUpdateLayout(true);
mbFoundObject = true;
}
@@ -1804,10 +1804,10 @@ void SdOutliner::StartConversion( LanguageType nSourceLanguage, LanguageType nT
*/
void SdOutliner::PrepareConversion()
{
- SetUpdateMode(true);
+ SetUpdateLayout(true);
if( HasConvertibleTextPortion( mnConversionLanguage ) )
{
- SetUpdateMode(false);
+ SetUpdateLayout(false);
mbStringFound = true;
mbMatchMayExist = true;
@@ -1819,7 +1819,7 @@ void SdOutliner::PrepareConversion()
}
else
{
- SetUpdateMode(false);
+ SetUpdateLayout(false);
}
}
@@ -1996,7 +1996,7 @@ void SdOutliner::Implementation::ProvideOutlinerView (
if (bInsert)
rOutliner.InsertView( mpOutlineView );
- rOutliner.SetUpdateMode(false);
+ rOutliner.SetUpdateLayout(false);
mpOutlineView->SetOutputArea (::tools::Rectangle (Point(), Size(1, 1)));
rOutliner.SetPaperSize( Size(1, 1) );
rOutliner.SetText(OUString(), rOutliner.GetParagraph(0));
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index 10cd6db42f6f..abde4954e3f9 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -181,7 +181,7 @@ bool DrawView::SetAttributes(const SfxItemSet& rSet,
OutlinerView* pOV = GetTextEditOutlinerView();
::Outliner* pOutliner = pOV->GetOutliner();
- pOutliner->SetUpdateMode(false);
+ pOutliner->SetUpdateLayout(false);
mpDocSh->SetWaitCursor( true );
// replace placeholder by template name
@@ -256,7 +256,7 @@ bool DrawView::SetAttributes(const SfxItemSet& rSet,
}
mpDocSh->SetWaitCursor( false );
- pOV->GetOutliner()->SetUpdateMode(true);
+ pOV->GetOutliner()->SetUpdateLayout(true);
mpDocSh->GetUndoManager()->LeaveListAction();
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 5a1a75e4670c..10ad17751f65 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -509,9 +509,9 @@ public:
// Calculate to outliner text size
pOutliner->UpdateFields();
- pOutliner->SetUpdateMode(true);
+ pOutliner->SetUpdateLayout(true);
Size aTextSize(pOutliner->CalcTextSize());
- pOutliner->SetUpdateMode(false);
+ pOutliner->SetUpdateLayout(false);
// Create objects, apply the outliner and add them (objects) to all master pages
const sal_uInt16 nCount = m_rDrawViewShell.GetDoc()->GetMasterSdPageCount(PageKind::Standard);
@@ -2498,10 +2498,10 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
pRectObj->SetMergedItem(makeSdrTextAutoGrowWidthItem(true));
pOutl->UpdateFields();
- pOutl->SetUpdateMode( true );
+ pOutl->SetUpdateLayout( true );
Size aSize( pOutl->CalcTextSize() );
aSize.setWidth( aSize.Width() * nMul );
- pOutl->SetUpdateMode( false );
+ pOutl->SetUpdateLayout( false );
Point aPos;
::tools::Rectangle aRect( aPos, GetActiveWindow()->GetOutputSizePixel() );
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index b1016470bc42..dd9d8bb20620 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -1496,9 +1496,9 @@ void DrawViewShell::InsertURLField(const OUString& rURL, const OUString& rText,
OBJ_TEXT);
pOutl->UpdateFields();
- pOutl->SetUpdateMode( true );
+ pOutl->SetUpdateLayout( true );
Size aSize(pOutl->CalcTextSize());
- pOutl->SetUpdateMode( false );
+ pOutl->SetUpdateLayout( false );
Point aPos;
::tools::Rectangle aRect(aPos, GetActiveWindow()->GetOutputSizePixel() );
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index f4d1b15d7888..accd57ec4d22 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -147,7 +147,7 @@ void OutlineViewShell::Construct()
ReadFrameViewData(mpFrameView);
::Outliner& rOutl = pOlView->GetOutliner();
- rOutl.SetUpdateMode(true);
+ rOutl.SetUpdateLayout(true);
if (!bModified)
{
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index eae262aa26a7..13501f4f6553 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -99,7 +99,7 @@ OutlineView::OutlineView( DrawDocShell& rDocSh, vcl::Window* pWindow, OutlineVie
mpOutlinerViews[0].reset( new OutlinerView(&mrOutliner, pWindow) );
mpOutlinerViews[0]->SetOutputArea(::tools::Rectangle());
- mrOutliner.SetUpdateMode(false);
+ mrOutliner.SetUpdateLayout(false);
mrOutliner.InsertView(mpOutlinerViews[0].get(), EE_APPEND);
onUpdateStyleSettings( true );
@@ -152,7 +152,7 @@ OutlineView::~OutlineView()
// uninitialize Outliner: enable color display
ResetLinks();
EEControlBits nCntrl = mrOutliner.GetControlWord();
- mrOutliner.SetUpdateMode(false); // otherwise there will be drawn on SetControlWord
+ mrOutliner.SetUpdateLayout(false); // otherwise there will be drawn on SetControlWord
mrOutliner.SetControlWord(nCntrl & ~EEControlBits::NOCOLORS);
SvtAccessibilityOptions aOptions;
mrOutliner.ForceAutoColor( aOptions.GetIsAutomaticFontColor() );
@@ -1003,7 +1003,7 @@ void OutlineView::FillOutliner()
mrOutliner.GetUndoManager().Clear();
mrOutliner.EnableUndo(false);
ResetLinks();
- mrOutliner.SetUpdateMode(false);
+ mrOutliner.SetUpdateLayout(false);
Paragraph* pTitleToSelect = nullptr;
sal_uInt16 nPageCount = mrDoc.GetSdPageCount(PageKind::Standard);
@@ -1098,7 +1098,7 @@ void OutlineView::FillOutliner()
mrOutliner.EnableUndo(true);
- mrOutliner.SetUpdateMode(true);
+ mrOutliner.SetUpdateLayout(true);
}
/**
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index ba1b2cc226d7..950a2422c599 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -289,9 +289,7 @@ void View::DoPaste (::sd::Window* pWindow)
// remove all hard linebreaks from the title
if (pOutliner->GetParagraphCount() > 1)
{
- bool bOldUpdateMode = pOutliner->GetUpdateMode();
-
- pOutliner->SetUpdateMode( false );
+ bool bOldUpdateMode = pOutliner->SetUpdateLayout( false );
const EditEngine& rEdit = pOutliner->GetEditEngine();
const sal_Int32 nParaCount = rEdit.GetParagraphCount();
@@ -304,7 +302,7 @@ void View::DoPaste (::sd::Window* pWindow)
}
DBG_ASSERT( rEdit.GetParagraphCount() <= 1, "Titleobject contains hard line breaks" );
- pOutliner->SetUpdateMode(bOldUpdateMode);
+ pOutliner->SetUpdateLayout(bOldUpdateMode);
}
}