summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/qa/cppunit/complextext.cxx4
-rw-r--r--vcl/source/app/svapp.cxx2
-rw-r--r--vcl/source/control/button.cxx2
-rw-r--r--vcl/source/control/combobox.cxx6
-rw-r--r--vcl/source/control/fixedhyper.cxx4
-rw-r--r--vcl/source/control/imp_listbox.cxx2
-rw-r--r--vcl/source/control/scrbar.cxx4
-rw-r--r--vcl/source/filter/ipdf/pdfdocument.cxx8
-rw-r--r--vcl/source/filter/ipict/ipict.cxx4
-rw-r--r--vcl/source/helper/canvasbitmap.cxx10
-rw-r--r--vcl/source/outdev/transparent.cxx2
-rw-r--r--vcl/source/treelist/svlbitm.cxx4
-rw-r--r--vcl/source/window/cursor.cxx2
-rw-r--r--vcl/source/window/menu.cxx8
-rw-r--r--vcl/source/window/splitwin.cxx4
-rw-r--r--vcl/source/window/toolbox.cxx14
-rw-r--r--vcl/workben/minvcl.cxx2
-rw-r--r--vcl/workben/vcldemo.cxx6
18 files changed, 44 insertions, 44 deletions
diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx
index 3bf69cd3a8d4..a79fe420884d 100644
--- a/vcl/qa/cppunit/complextext.cxx
+++ b/vcl/qa/cppunit/complextext.cxx
@@ -95,8 +95,8 @@ void VclComplexTextTest::testArabic()
pOutDev->GetTextBoundRect(aBoundRect, aOneTwoThree);
CPPUNIT_ASSERT_DOUBLES_EQUAL(0, aBoundRect.Left(), 1); // This sometimes equals to 1
CPPUNIT_ASSERT_DOUBLES_EQUAL(1, aBoundRect.Top(), 1);
- CPPUNIT_ASSERT_DOUBLES_EQUAL(71, aBoundRect.getWidth(), 1); // This sometimes equals to 70
- CPPUNIT_ASSERT_DOUBLES_EQUAL(15, aBoundRect.getHeight(), 1);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(71, aBoundRect.getOpenWidth(), 1); // This sometimes equals to 70
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(15, aBoundRect.getOpenHeight(), 1);
#if 0
// FIXME: This seems to be wishful thinking, GetTextRect() does not take
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index d63b8d34bd82..c315c35f0fd1 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1375,7 +1375,7 @@ tools::Rectangle Application::GetScreenPosSizePixel( unsigned int nScreen )
return tools::Rectangle();
}
tools::Rectangle aRect = pSys->GetDisplayScreenPosSizePixel(nScreen);
- if (aRect.getHeight() == 0)
+ if (aRect.getOpenHeight() == 0)
SAL_WARN("vcl", "Requesting screen size/pos for screen #" << nScreen << " returned 0 height.");
return aRect;
}
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 210d2b6290e0..24a8295ed824 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -242,7 +242,7 @@ void Button::ImplDrawAlignedImage(OutputDevice* pDev, Point& rPos,
// If the button text doesn't fit into it, put it into a tooltip (might happen in sidebar)
if (GetQuickHelpText()!= aText && mpButtonData->mbGeneratedTooltip)
SetQuickHelpText("");
- if (GetQuickHelpText().isEmpty() && textRect.getWidth() > rSize.getWidth())
+ if (GetQuickHelpText().isEmpty() && textRect.getOpenWidth() > rSize.getWidth())
{
SetQuickHelpText(aText);
mpButtonData->mbGeneratedTooltip = true;
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 15e088d7f3c6..6c33b209710f 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -1012,7 +1012,7 @@ tools::Long ComboBox::getMaxWidthScrollBarAndDownButton() const
if ( GetNativeControlRegion(ControlType::Combobox, ControlPart::ButtonDown,
aArea, ControlState::NONE, aControlValue, aBound, aContent) )
{
- nButtonDownWidth = aContent.getWidth();
+ nButtonDownWidth = aContent.getOpenWidth();
}
tools::Long nScrollBarWidth = GetSettings().GetStyleSettings().GetScrollBarSize();
@@ -1468,7 +1468,7 @@ ComboBoxBounds ComboBox::Impl::calcComboBoxDropDownComponentBounds(
aContent.Move(-aPoint.X(), -aPoint.Y());
aBounds.aButtonPos = Point(aContent.Left(), nTop);
- aBounds.aButtonSize = Size(aContent.getWidth(), (nBottom-nTop));
+ aBounds.aButtonSize = Size(aContent.getOpenWidth(), (nBottom-nTop));
// adjust the size of the edit field
if (m_rThis.GetNativeControlRegion(ControlType::Combobox, ControlPart::SubEdit,
@@ -1484,7 +1484,7 @@ ComboBoxBounds ComboBox::Impl::calcComboBoxDropDownComponentBounds(
else
{
// use the themes drop down size for the button
- aBounds.aSubEditSize = Size(rOutSz.Width() - aContent.getWidth(), rOutSz.Height());
+ aBounds.aSubEditSize = Size(rOutSz.Width() - aContent.getOpenWidth(), rOutSz.Height());
}
}
else
diff --git a/vcl/source/control/fixedhyper.cxx b/vcl/source/control/fixedhyper.cxx
index 8a451d2fab47..d43d8559d602 100644
--- a/vcl/source/control/fixedhyper.cxx
+++ b/vcl/source/control/fixedhyper.cxx
@@ -108,9 +108,9 @@ void FixedHyperlink::GetFocus()
Size aSize = GetSizePixel();
tools::Rectangle aFocusRect(Point(1, 1), Size(m_nTextLen + 4, aSize.Height() - 2));
if (GetStyle() & WB_RIGHT)
- aFocusRect.Move(aSize.Width() - aFocusRect.getWidth(), 0);
+ aFocusRect.Move(aSize.Width() - aFocusRect.getOpenWidth(), 0);
else if (GetStyle() & WB_CENTER)
- aFocusRect.Move((aSize.Width() - aFocusRect.getWidth()) / 2, 0);
+ aFocusRect.Move((aSize.Width() - aFocusRect.getOpenWidth()) / 2, 0);
Invalidate(aFocusRect);
ShowFocus(aFocusRect);
diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx
index e0e731a4b5b7..b16adb9ccec6 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -2914,7 +2914,7 @@ Size ImplListBoxFloatingWindow::CalcFloatSize() const
aFloatSz.AdjustWidth(nSBWidth );
}
- tools::Long nDesktopWidth = GetDesktopRectPixel().getWidth();
+ tools::Long nDesktopWidth = GetDesktopRectPixel().getOpenWidth();
if (aFloatSz.Width() > nDesktopWidth)
// Don't exceed the desktop width.
aFloatSz.setWidth( nDesktopWidth );
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index 844f80b02d56..7ef7174ee714 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -1118,12 +1118,12 @@ IMPL_LINK_NOARG(ScrollBar, ImplAutoTimerHdl, Timer *, void)
void ScrollBar::ImplInvert()
{
tools::Rectangle aRect( maThumbRect );
- if( aRect.getWidth() > 4 )
+ if( aRect.getOpenWidth() > 4 )
{
aRect.AdjustLeft(2 );
aRect.AdjustRight( -2 );
}
- if( aRect.getHeight() > 4 )
+ if( aRect.getOpenHeight() > 4 )
{
aRect.AdjustTop(2 );
aRect.AdjustBottom( -2 );
diff --git a/vcl/source/filter/ipdf/pdfdocument.cxx b/vcl/source/filter/ipdf/pdfdocument.cxx
index 493826e38f8f..5cee203d3ecc 100644
--- a/vcl/source/filter/ipdf/pdfdocument.cxx
+++ b/vcl/source/filter/ipdf/pdfdocument.cxx
@@ -273,9 +273,9 @@ sal_Int32 PDFDocument::WriteAppearanceObject(tools::Rectangle& rSignatureRectang
}
aEditBuffer.WriteCharPtr("/BBox[0 0 ");
- aEditBuffer.WriteOString(OString::number(rSignatureRectangle.getWidth()));
+ aEditBuffer.WriteOString(OString::number(rSignatureRectangle.getOpenWidth()));
aEditBuffer.WriteCharPtr(" ");
- aEditBuffer.WriteOString(OString::number(rSignatureRectangle.getHeight()));
+ aEditBuffer.WriteOString(OString::number(rSignatureRectangle.getOpenHeight()));
aEditBuffer.WriteCharPtr("]\n/Length ");
// Add the object to the doc-level edit buffer and update the offset.
@@ -329,9 +329,9 @@ sal_Int32 PDFDocument::WriteAnnotObject(PDFObjectElement const& rFirstPage, sal_
m_aEditBuffer.WriteCharPtr(" 0 obj\n");
m_aEditBuffer.WriteCharPtr("<</Type/Annot/Subtype/Widget/F 132\n");
m_aEditBuffer.WriteCharPtr("/Rect[0 0 ");
- m_aEditBuffer.WriteOString(OString::number(rSignatureRectangle.getWidth()));
+ m_aEditBuffer.WriteOString(OString::number(rSignatureRectangle.getOpenWidth()));
m_aEditBuffer.WriteCharPtr(" ");
- m_aEditBuffer.WriteOString(OString::number(rSignatureRectangle.getHeight()));
+ m_aEditBuffer.WriteOString(OString::number(rSignatureRectangle.getOpenHeight()));
m_aEditBuffer.WriteCharPtr("]\n");
m_aEditBuffer.WriteCharPtr("/FT/Sig\n");
m_aEditBuffer.WriteCharPtr("/P ");
diff --git a/vcl/source/filter/ipict/ipict.cxx b/vcl/source/filter/ipict/ipict.cxx
index 0f8fd5ba0c3a..447d1c153625 100644
--- a/vcl/source/filter/ipict/ipict.cxx
+++ b/vcl/source/filter/ipict/ipict.cxx
@@ -1337,8 +1337,8 @@ sal_uInt64 PictReader::ReadData(sal_uInt16 nOpcode)
// before drawing some text and also to draw this text.
// So using a too small region can lead to clip the end of the text ;
// but this can be discussable...
- aRect.setWidth(aRect.getWidth()+1);
- aRect.setHeight(aRect.getHeight()+1);
+ aRect.setWidth(aRect.getOpenWidth()+1);
+ aRect.setHeight(aRect.getOpenHeight()+1);
pVirDev->SetClipRegion( vcl::Region( aRect ) );
break;
}
diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx
index 8807ce7a11c5..631f887d3732 100644
--- a/vcl/source/helper/canvasbitmap.cxx
+++ b/vcl/source/helper/canvasbitmap.cxx
@@ -393,17 +393,17 @@ uno::Sequence< sal_Int8 > SAL_CALL VclCanvasBitmap::getData( rendering::IntegerB
aRequestedBytes.SetRight( (aRequestedArea.Right()*m_nBitsPerOutputPixel + 7)/8 );
// copy stuff to output sequence
- aRet.realloc(aRequestedBytes.getWidth()*aRequestedBytes.getHeight());
+ aRet.realloc(aRequestedBytes.getOpenWidth()*aRequestedBytes.getOpenHeight());
sal_Int8* pOutBuf = aRet.getArray();
- bitmapLayout.ScanLines = aRequestedBytes.getHeight();
+ bitmapLayout.ScanLines = aRequestedBytes.getOpenHeight();
bitmapLayout.ScanLineBytes =
- bitmapLayout.ScanLineStride= aRequestedBytes.getWidth();
+ bitmapLayout.ScanLineStride= aRequestedBytes.getOpenWidth();
sal_Int32 nScanlineStride=bitmapLayout.ScanLineStride;
if( !(m_pBmpAcc->GetScanlineFormat() & ScanlineFormat::TopDown) )
{
- pOutBuf += bitmapLayout.ScanLineStride*(aRequestedBytes.getHeight()-1);
+ pOutBuf += bitmapLayout.ScanLineStride*(aRequestedBytes.getOpenHeight()-1);
nScanlineStride *= -1;
}
@@ -416,7 +416,7 @@ uno::Sequence< sal_Int8 > SAL_CALL VclCanvasBitmap::getData( rendering::IntegerB
for( tools::Long y=aRequestedBytes.Top(); y<aRequestedBytes.Bottom(); ++y )
{
Scanline pScan = pBmpAcc->GetScanline(y);
- memcpy(pOutBuf, pScan+aRequestedBytes.Left(), aRequestedBytes.getWidth());
+ memcpy(pOutBuf, pScan+aRequestedBytes.Left(), aRequestedBytes.getOpenWidth());
pOutBuf += nScanlineStride;
}
}
diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx
index f747c04798fe..a4019ca94f85 100644
--- a/vcl/source/outdev/transparent.cxx
+++ b/vcl/source/outdev/transparent.cxx
@@ -327,7 +327,7 @@ void OutputDevice::EmulateDrawTransparent ( const tools::PolyPolygon& rPolyPoly,
// This is because the source is a polygon which when painted would not paint
// the rightmost and lowest pixel line(s), so use one pixel less for the
// rectangle, too.
- aPixelRect.getWidth(), aPixelRect.getHeight(),
+ aPixelRect.getOpenWidth(), aPixelRect.getOpenHeight(),
sal::static_int_cast<sal_uInt8>(nTransparencePercent),
*this );
}
diff --git a/vcl/source/treelist/svlbitm.cxx b/vcl/source/treelist/svlbitm.cxx
index 3e0243a8d944..75d2bb4cf03a 100644
--- a/vcl/source/treelist/svlbitm.cxx
+++ b/vcl/source/treelist/svlbitm.cxx
@@ -235,12 +235,12 @@ void SvLBoxString::Paint(
else if (mfAlign == 0.5)
{
nStyle |= DrawTextFlags::Center;
- aSize.setWidth(rDev.GetBoundingRect(&rEntry).getWidth());
+ aSize.setWidth(rDev.GetBoundingRect(&rEntry).getOpenWidth());
}
else if (mfAlign > 0.5)
{
nStyle |= DrawTextFlags::Right;
- aSize.setWidth(rDev.GetBoundingRect(&rEntry).getWidth());
+ aSize.setWidth(rDev.GetBoundingRect(&rEntry).getOpenWidth());
}
}
aSize.setHeight(GetHeight(&rDev, &rEntry));
diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx
index 406491ed1d65..d160e8aa73ef 100644
--- a/vcl/source/window/cursor.cxx
+++ b/vcl/source/window/cursor.cxx
@@ -76,7 +76,7 @@ static tools::Rectangle ImplCursorInvert(vcl::RenderContext* pRenderContext, Imp
Point pAry[7];
// Related system settings for "delta" could be:
// gtk cursor-aspect-ratio and windows SPI_GETCARETWIDTH
- int delta = (aRect.getHeight() * 4 / 100) + 1;
+ int delta = (aRect.getOpenHeight() * 4 / 100) + 1;
if( pData->mnDirection == CursorDirection::LTR )
{
// left-to-right
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 9f680b9071c1..811d4ea360fb 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -136,8 +136,8 @@ void lclDrawMoreIndicator(vcl::RenderContext& rRenderContext, const tools::Recta
tools::Long heightOrig = height;
- tools::Long x = rRect.Left() + (rRect.getWidth() - width)/2 + 1;
- tools::Long y = rRect.Top() + (rRect.getHeight() - height)/2 + 1;
+ tools::Long x = rRect.Left() + (rRect.getOpenWidth() - width)/2 + 1;
+ tools::Long y = rRect.Top() + (rRect.getOpenHeight() - height)/2 + 1;
while( height >= 1)
{
rRenderContext.DrawRect( tools::Rectangle( x, y, x + linewidth, y ) );
@@ -1679,7 +1679,7 @@ void Menu::ImplPaintMenuTitle(vcl::RenderContext& rRenderContext, const tools::R
tools::Rectangle aBgRect(rRect);
int nOuterSpaceX = ImplGetSVData()->maNWFData.mnMenuFormatBorderX;
aBgRect.Move(SPACE_AROUND_TITLE, SPACE_AROUND_TITLE);
- aBgRect.setWidth(aBgRect.getWidth() - 2 * SPACE_AROUND_TITLE - 2 * nOuterSpaceX);
+ aBgRect.setWidth(aBgRect.getOpenWidth() - 2 * SPACE_AROUND_TITLE - 2 * nOuterSpaceX);
aBgRect.setHeight(nTitleHeight - 2 * SPACE_AROUND_TITLE);
rRenderContext.DrawRect(aBgRect);
@@ -1687,7 +1687,7 @@ void Menu::ImplPaintMenuTitle(vcl::RenderContext& rRenderContext, const tools::R
Point aTextTopLeft(aBgRect.TopLeft());
tools::Rectangle aTextBoundRect;
rRenderContext.GetTextBoundRect( aTextBoundRect, aTitleText );
- aTextTopLeft.AdjustX((aBgRect.getWidth() - aTextBoundRect.GetSize().Width()) / 2 );
+ aTextTopLeft.AdjustX((aBgRect.getOpenWidth() - aTextBoundRect.GetSize().Width()) / 2 );
aTextTopLeft.AdjustY((aBgRect.GetHeight() - aTextBoundRect.GetSize().Height()) / 2
- aTextBoundRect.Top() );
rRenderContext.DrawText(aTextTopLeft, aTitleText, 0, aTitleText.getLength());
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 1cb8389fac99..6257e43ca208 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -1486,9 +1486,9 @@ void SplitWindow::ImplDrawGrip(vcl::RenderContext& rRenderContext, const tools::
AntialiasingFlags nAA = rRenderContext.GetAntialiasing();
rRenderContext.SetAntialiasing(nAA | AntialiasingFlags::PixelSnapHairline | AntialiasingFlags::Enable);
- tools::Long nWidth = rRect.getWidth();
+ tools::Long nWidth = rRect.getOpenWidth();
tools::Long nWidthHalf = nWidth / 2;
- tools::Long nHeight = rRect.getHeight();
+ tools::Long nHeight = rRect.getOpenHeight();
tools::Long nHeightHalf = nHeight / 2;
tools::Long nLeft = rRect.Left();
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 64879c682d2c..c2d42f51bf23 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -2374,8 +2374,8 @@ static void ImplDrawMoreIndicator(vcl::RenderContext& rRenderContext, const tool
{
const Image pImage(StockImage::Yes, CHEVRON);
Size aImageSize = pImage.GetSizePixel();
- tools::Long x = rRect.Left() + (rRect.getWidth() - aImageSize.Width())/2;
- tools::Long y = rRect.Top() + (rRect.getHeight() - aImageSize.Height())/2;
+ tools::Long x = rRect.Left() + (rRect.getOpenWidth() - aImageSize.Width())/2;
+ tools::Long y = rRect.Top() + (rRect.getOpenHeight() - aImageSize.Height())/2;
DrawImageFlags nImageStyle = DrawImageFlags::NONE;
rRenderContext.DrawImage(Point(x,y), pImage, nImageStyle);
@@ -2401,10 +2401,10 @@ static void ImplDrawDropdownArrow(vcl::RenderContext& rRenderContext, const tool
// the assumption is, that the width always specifies the size of the expected arrow.
const tools::Long nMargin = round(2 * rRenderContext.GetDPIScaleFactor());
- const tools::Long nSize = rDropDownRect.getWidth() - 2 * nMargin;
+ const tools::Long nSize = rDropDownRect.getOpenWidth() - 2 * nMargin;
const tools::Long nHalfSize = (nSize + 1) / 2;
- const tools::Long x = rDropDownRect.Left() + nMargin + (bRotate ? (rDropDownRect.getWidth() - nHalfSize) / 2 : 0);
- const tools::Long y = rDropDownRect.Top() + nMargin + (rDropDownRect.getHeight() - (bRotate ? nSize : nHalfSize)) / 2;
+ const tools::Long x = rDropDownRect.Left() + nMargin + (bRotate ? (rDropDownRect.getOpenWidth() - nHalfSize) / 2 : 0);
+ const tools::Long y = rDropDownRect.Top() + nMargin + (rDropDownRect.getOpenHeight() - (bRotate ? nSize : nHalfSize)) / 2;
aPoly.SetPoint(Point(x, y), 0);
if (bRotate) // >
@@ -2672,7 +2672,7 @@ void ToolBox::ImplDrawItem(vcl::RenderContext& rRenderContext, ImplToolItems::si
}
else
{
- nImageOffX += (nBtnWidth-(bDropDown ? aDropDownRect.getWidth() : 0)+SMALLBUTTON_OFF_NORMAL_X-aImageSize.Width())/2;
+ nImageOffX += (nBtnWidth-(bDropDown ? aDropDownRect.getOpenWidth() : 0)+SMALLBUTTON_OFF_NORMAL_X-aImageSize.Width())/2;
if ( meTextPosition == ToolBoxTextPosition::Right )
nImageOffY += (nBtnHeight-aImageSize.Height())/2;
}
@@ -2735,7 +2735,7 @@ void ToolBox::ImplDrawItem(vcl::RenderContext& rRenderContext, ImplToolItems::si
else
{
// center horizontally
- nTextOffX += (nBtnWidth-(bDropDown ? aDropDownRect.getWidth() : 0)+SMALLBUTTON_OFF_NORMAL_X-aTxtSize.Width() - TB_IMAGETEXTOFFSET)/2;
+ nTextOffX += (nBtnWidth-(bDropDown ? aDropDownRect.getOpenWidth() : 0)+SMALLBUTTON_OFF_NORMAL_X-aTxtSize.Width() - TB_IMAGETEXTOFFSET)/2;
// set vertical position
nTextOffY += nBtnHeight - aTxtSize.Height();
}
diff --git a/vcl/workben/minvcl.cxx b/vcl/workben/minvcl.cxx
index e6beb2f95b4a..2e5aa3c061bb 100644
--- a/vcl/workben/minvcl.cxx
+++ b/vcl/workben/minvcl.cxx
@@ -43,7 +43,7 @@ private:
void TheWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect)
{
- rRenderContext.DrawText(Point(rRect.GetWidth() / 2, rRect.getHeight() / 2),
+ rRenderContext.DrawText(Point(rRect.GetWidth() / 2, rRect.getOpenHeight() / 2),
OUString(u"VCL module in LibreOffice"));
}
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 98a225b972e6..e4f25210d2ee 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -670,8 +670,8 @@ public:
tools::Rectangle aSub(aRegions[i]);
tools::Rectangle aSmaller(aSub);
aSmaller.Move(10,10);
- aSmaller.setWidth(aSmaller.getWidth()-20);
- aSmaller.setHeight(aSmaller.getHeight()-24);
+ aSmaller.setWidth(aSmaller.getOpenWidth()-20);
+ aSmaller.setHeight(aSmaller.getOpenHeight()-24);
switch (i) {
case 0:
aRegion = vcl::Region(aSub);
@@ -1786,7 +1786,7 @@ public:
virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override
{
mrRenderer.SetSizePixel(GetSizePixel());
- fprintf(stderr, "DemoWin::Paint(%" SAL_PRIdINT64 ",%" SAL_PRIdINT64 ",%" SAL_PRIdINT64 ",%" SAL_PRIdINT64 ")\n", sal_Int64(rRect.Left()), sal_Int64(rRect.Top()), sal_Int64(rRect.getWidth()), sal_Int64(rRect.getHeight()));
+ fprintf(stderr, "DemoWin::Paint(%" SAL_PRIdINT64 ",%" SAL_PRIdINT64 ",%" SAL_PRIdINT64 ",%" SAL_PRIdINT64 ")\n", sal_Int64(rRect.Left()), sal_Int64(rRect.Top()), sal_Int64(rRect.getOpenWidth()), sal_Int64(rRect.getOpenHeight()));
if (mrRenderer.getIterCount() == 0)
mrRenderer.drawToDevice(rRenderContext, GetSizePixel(), false);
else