summaryrefslogtreecommitdiff
path: root/sc/source/ui/view
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/view')
-rw-r--r--sc/source/ui/view/drawvie4.cxx2
-rw-r--r--sc/source/ui/view/gridwin.cxx2
-rw-r--r--sc/source/ui/view/gridwin4.cxx8
-rw-r--r--sc/source/ui/view/olinewin.cxx2
-rw-r--r--sc/source/ui/view/output.cxx8
-rw-r--r--sc/source/ui/view/output2.cxx12
-rw-r--r--sc/source/ui/view/output3.cxx2
-rw-r--r--sc/source/ui/view/printfun.cxx4
-rw-r--r--sc/source/ui/view/tabcont.cxx4
9 files changed, 22 insertions, 22 deletions
diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx
index c2f73702bddf..08a3565d28ca 100644
--- a/sc/source/ui/view/drawvie4.cxx
+++ b/sc/source/ui/view/drawvie4.cxx
@@ -97,7 +97,7 @@ bool ScDrawView::BeginDrag( vcl::Window* pWindow, const Point& rStartPos )
BrkAction();
Rectangle aMarkedRect = GetAllMarkedRect();
- Region aRegion( aMarkedRect );
+ vcl::Region aRegion( aMarkedRect );
aDragStartDiff = rStartPos - aMarkedRect.TopLeft();
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index e777df8c87f6..f36db76e22b3 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -4636,7 +4636,7 @@ void ScGridWindow::UpdateFormulas()
// #i122149# do not use old GetChangedArea() which used polygon-based Regions, but use
// the region-band based new version; anyways, only rectangles are added
- Region aChangedRegion( aOutputData.GetChangedAreaRegion() ); // logic (PixelToLogic)
+ vcl::Region aChangedRegion( aOutputData.GetChangedAreaRegion() ); // logic (PixelToLogic)
if(!aChangedRegion.IsEmpty())
{
Invalidate(aChangedRegion);
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index cbdd99d638fb..0991b7e5bed5 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -144,7 +144,7 @@ static void lcl_DrawOneFrame( OutputDevice* pDev, const Rectangle& rInnerPixel,
long nTextStart = bLayoutRTL ? aInner.Right() - aTextSize.Width() + 1 : aInner.Left();
bool bWasClip = false;
- Region aOldClip;
+ vcl::Region aOldClip;
bool bClip = ( aTextSize.Width() > aOuter.Right() - nBWidth - aInner.Left() );
if ( bClip )
{
@@ -155,7 +155,7 @@ static void lcl_DrawOneFrame( OutputDevice* pDev, const Rectangle& rInnerPixel,
}
long nClipStartX = bLayoutRTL ? aOuter.Left() + nBWidth : aInner.Left();
long nClipEndX = bLayoutRTL ? aInner.Right() : aOuter.Right() - nBWidth;
- pDev->SetClipRegion( Region(Rectangle( nClipStartX, nButtonY + nVer/2,
+ pDev->SetClipRegion( vcl::Region(Rectangle( nClipStartX, nButtonY + nVer/2,
nClipEndX, nButtonY + nVer/2 + aTextSize.Height())) );
}
@@ -603,7 +603,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
if(pDrawView)
{
// #i74769# Use new BeginDrawLayers() interface
- Region aDrawingRegion(aDrawingRectLogic);
+ vcl::Region aDrawingRegion(aDrawingRectLogic);
pTargetPaintWindow = pDrawView->BeginDrawLayers(this, aDrawingRegion);
OSL_ENSURE(pTargetPaintWindow, "BeginDrawLayers: Got no SdrPaintWindow (!)");
@@ -1250,7 +1250,7 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCCOL nX2, ScTableInfo& rTabInfo, Out
Rectangle aRect = GetListValButtonRect( aListValPos );
aComboButton.SetPosPixel( aRect.TopLeft() );
aComboButton.SetSizePixel( aRect.GetSize() );
- pContentDev->SetClipRegion(Region(aRect));
+ pContentDev->SetClipRegion(vcl::Region(aRect));
aComboButton.Draw( false, false );
pContentDev->SetClipRegion(); // always called from Draw() without clip region
aComboButton.SetPosPixel( aOldPos ); // restore old state
diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx
index da59eda93515..89ee877e3b7a 100644
--- a/sc/source/ui/view/olinewin.cxx
+++ b/sc/source/ui/view/olinewin.cxx
@@ -510,7 +510,7 @@ void ScOutlineWindow::DataChanged( const DataChangedEvent& rDCEvt )
void ScOutlineWindow::SetEntryAreaClipRegion()
{
- SetClipRegion( Region(Rectangle(
+ SetClipRegion( vcl::Region(Rectangle(
GetPoint( 0, mnMainFirstPos ),
GetPoint( GetOutputSizeLevel() - 1, mnMainLastPos ))));
}
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 6b19602ec53a..5a622e255dae 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -1483,7 +1483,7 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
mpDev->IntersectClipRegion( aClipRect );
}
else
- mpDev->SetClipRegion( Region( aClipRect ) );
+ mpDev->SetClipRegion( vcl::Region( aClipRect ) );
svx::frame::Array& rArray = mrTabInfo.maArray;
boost::scoped_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor(CreateProcessor2D( ));
@@ -1822,9 +1822,9 @@ drawinglayer::processor2d::BaseProcessor2D* ScOutputData::CreateProcessor2D( )
// Printer
-Region ScOutputData::GetChangedAreaRegion()
+vcl::Region ScOutputData::GetChangedAreaRegion()
{
- Region aRegion;
+ vcl::Region aRegion;
Rectangle aDrawingRect;
bool bHad(false);
long nPosY = nScrY;
@@ -1901,7 +1901,7 @@ bool ScOutputData::SetChangedClip()
bool bRet = (aPoly.Count() != 0);
if (bRet)
- mpDev->SetClipRegion(Region(aPoly));
+ mpDev->SetClipRegion(vcl::Region(aPoly));
return bRet;
}
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 5bca67950889..04d2a7b87291 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -1958,7 +1958,7 @@ void ScOutputData::DrawStrings( bool bPixelToLogic )
mpDev->IntersectClipRegion( aAreaParam.maClipRect );
}
else
- mpDev->SetClipRegion( Region( aAreaParam.maClipRect ) );
+ mpDev->SetClipRegion( vcl::Region( aAreaParam.maClipRect ) );
}
Point aURLStart( nJustPosX, nJustPosY ); // copy before modifying for orientation
@@ -3039,7 +3039,7 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam)
mpDev->IntersectClipRegion( aLogicClip );
}
else
- mpDev->SetClipRegion( Region( aLogicClip ) );
+ mpDev->SetClipRegion( vcl::Region( aLogicClip ) );
}
}
@@ -3227,7 +3227,7 @@ bool ScOutputData::Clip( DrawEditParam& rParam, const Size& aCellSize,
mpDev->IntersectClipRegion( aLogicClip );
}
else
- mpDev->SetClipRegion( Region( aLogicClip ) );
+ mpDev->SetClipRegion( vcl::Region( aLogicClip ) );
}
}
@@ -4015,7 +4015,7 @@ void ScOutputData::DrawEditStacked(DrawEditParam& rParam)
mpDev->IntersectClipRegion( aLogicClip );
}
else
- mpDev->SetClipRegion( Region( aLogicClip ) );
+ mpDev->SetClipRegion( vcl::Region( aLogicClip ) );
}
}
@@ -4364,7 +4364,7 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam)
mpDev->IntersectClipRegion( aLogicClip );
}
else
- mpDev->SetClipRegion( Region( aLogicClip ) );
+ mpDev->SetClipRegion( vcl::Region( aLogicClip ) );
}
}
@@ -5090,7 +5090,7 @@ void ScOutputData::DrawRotated(bool bPixelToLogic)
mpDev->IntersectClipRegion( aAreaParam.maClipRect );
}
else
- mpDev->SetClipRegion( Region( aAreaParam.maClipRect ) );
+ mpDev->SetClipRegion( vcl::Region( aAreaParam.maClipRect ) );
}
Point aLogicStart;
diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxx
index 4cdcd5017ed9..91c8da809d24 100644
--- a/sc/source/ui/view/output3.cxx
+++ b/sc/source/ui/view/output3.cxx
@@ -87,7 +87,7 @@ Point ScOutputData::PrePrintDrawingLayer(long nLogStX, long nLogStY )
// #i74769# work with SdrPaintWindow directly
// #i76114# pass bDisableIntersect = true, because the intersection of the table area
// with the Window's paint region can be empty
- Region aRectRegion(aRect);
+ vcl::Region aRectRegion(aRect);
mpTargetPaintWindow = pLocalDrawView->BeginDrawLayers(mpDev, aRectRegion, true);
OSL_ENSURE(mpTargetPaintWindow, "BeginDrawLayers: Got no SdrPaintWindow (!)");
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 48697023ecad..87c65ee90c82 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -1606,7 +1606,7 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
if( aTableParam.bCellContent )
aOutputData.DrawBackground();
- pDev->SetClipRegion(Region(Rectangle(
+ pDev->SetClipRegion(vcl::Region(Rectangle(
aPos, Size(aOutputData.GetScrW(), aOutputData.GetScrH()))));
pDev->SetClipRegion();
@@ -1784,7 +1784,7 @@ void ScPrintFunc::PrintHF( long nPageNo, bool bHeader, long nStartY,
// Clipping for Text
- pDev->SetClipRegion(Region(Rectangle(aStart, aPaperSize)));
+ pDev->SetClipRegion(vcl::Region(Rectangle(aStart, aPaperSize)));
// left
diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx
index 914ead8adf0c..ce52883e9ae1 100644
--- a/sc/source/ui/view/tabcont.cxx
+++ b/sc/source/ui/view/tabcont.cxx
@@ -454,14 +454,14 @@ void ScTabControl::StartDrag( sal_Int8 /* nAction */, const Point& rPosPixel )
if (!bDisable)
{
- Region aRegion( Rectangle(0,0,0,0) );
+ vcl::Region aRegion( Rectangle(0,0,0,0) );
CommandEvent aCEvt( rPosPixel, COMMAND_STARTDRAG, true ); // needed for StartDrag
if (TabBar::StartDrag( aCEvt, aRegion ))
DoDrag( aRegion );
}
}
-void ScTabControl::DoDrag( const Region& /* rRegion */ )
+void ScTabControl::DoDrag( const vcl::Region& /* rRegion */ )
{
ScDocShell* pDocSh = pViewData->GetDocShell();
ScDocument& rDoc = pDocSh->GetDocument();
generated by cgit (git 2.34.1) at 2024-08-20 21:24:03 +0000