mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:oncevar extend to tools/gen.hxx types

Browse Source 
Change-Id: I5c75875da44334569c02e2ff039b33c38397a0a2
Reviewed-on: https://gerrit.libreoffice.org/50283
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2018-02-24 13:47:25 +02:00
parent 9bc8714308
commit 08ab1f46b1
120 changed files with 165 additions and 297 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
basctl/source/dlged/dlged.cxx
View File

@ -472,8 +472,7 @@ void DlgEditor::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle
aPaintRect = rRect; aPaintRect = rRect;
mnPaintGuard++; mnPaintGuard++;
Size aMacSize; if (bFirstDraw && rWindow.IsVisible() && (rRenderContext.GetOutputSize() != Size()))
if (bFirstDraw && rWindow.IsVisible() && (rRenderContext.GetOutputSize() != aMacSize))
{ {
bFirstDraw = false; bFirstDraw = false;

3
basic/source/classes/sbunoobj.cxx
View File

@ -647,8 +647,7 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
SbxDimArray* pArray = nullptr; SbxDimArray* pArray = nullptr;
Sequence< sal_Int32 > indices; Sequence< sal_Int32 > indices;
Sequence< sal_Int32 > sizes; Sequence< sal_Int32 > sizes;
sal_Int32 dimension = 0; implSequenceToMultiDimArray( pArray, indices, sizes, aWrap.Array, /*dimension*/0, aWrap.IsZeroIndex, nullptr );
implSequenceToMultiDimArray( pArray, indices, sizes, aWrap.Array, dimension, aWrap.IsZeroIndex, nullptr );
if ( pArray ) if ( pArray )
{ {
SbxDimArrayRef xArray = pArray; SbxDimArrayRef xArray = pArray;

9
compilerplugins/clang/oncevar.cxx
View File

@ -334,7 +334,14 @@ bool OnceVar::VisitVarDecl( const VarDecl* varDecl )
&& !tc.Class("OString").Namespace("rtl").GlobalNamespace() && !tc.Class("OString").Namespace("rtl").GlobalNamespace()
&& !tc.Class("OUString").Namespace("rtl").GlobalNamespace() && !tc.Class("OUString").Namespace("rtl").GlobalNamespace()
&& !tc.Class("OStringBuffer").Namespace("rtl").GlobalNamespace() && !tc.Class("OStringBuffer").Namespace("rtl").GlobalNamespace()
&& !tc.Class("OUStringBuffer").Namespace("rtl").GlobalNamespace()) && !tc.Class("OUStringBuffer").Namespace("rtl").GlobalNamespace()
&& !tc.Class("Color").GlobalNamespace()
&& !tc.Class("Pair").GlobalNamespace()
&& !tc.Class("Point").GlobalNamespace()
&& !tc.Class("Size").GlobalNamespace()
&& !tc.Class("Range").GlobalNamespace()
&& !tc.Class("Selection").GlobalNamespace()
&& !tc.Class("Rectangle").Namespace("tools").GlobalNamespace())
{ {
return true; return true;
} }

2
cppuhelper/source/servicemanager.cxx
View File

@ -1999,7 +1999,7 @@ void cppuhelper::ServiceManager::preloadImplementations() {
const char *mpFrom; const char *mpFrom;
const char *mpTo; const char *mpTo;
const char *mpPurpose; const char *mpPurpose;
} aMappingLoad[] = { } const aMappingLoad[] = {
{ "gcc3", "uno", "" }, { "gcc3", "uno", "" },
{ "uno", "gcc3", "" }, { "uno", "gcc3", "" },
}; };

3
cui/source/dialogs/hlmarkwn.cxx
View File

@ -359,7 +359,6 @@ int SvxHlinkDlgMarkWnd::FillTree( const uno::Reference< container::XNameAccess >
const sal_uLong nLinks = aNames.getLength(); const sal_uLong nLinks = aNames.getLength();
const OUString* pNames = aNames.getConstArray(); const OUString* pNames = aNames.getConstArray();
Color aMaskColor( COL_LIGHTMAGENTA );
const OUString aProp_LinkDisplayName( "LinkDisplayName" ); const OUString aProp_LinkDisplayName( "LinkDisplayName" );
const OUString aProp_LinkTarget( "com.sun.star.document.LinkTarget" ); const OUString aProp_LinkTarget( "com.sun.star.document.LinkTarget" );
const OUString aProp_LinkDisplayBitmap( "LinkDisplayBitmap" ); const OUString aProp_LinkDisplayBitmap( "LinkDisplayBitmap" );
@ -410,7 +409,7 @@ int SvxHlinkDlgMarkWnd::FillTree( const uno::Reference< container::XNameAccess >
aXBitmap( xTarget->getPropertyValue( aProp_LinkDisplayBitmap ), uno::UNO_QUERY ); aXBitmap( xTarget->getPropertyValue( aProp_LinkDisplayBitmap ), uno::UNO_QUERY );
if( aXBitmap.is() ) if( aXBitmap.is() )
{ {
Image aBmp(BitmapEx(VCLUnoHelper::GetBitmap(aXBitmap).GetBitmap(), aMaskColor)); Image aBmp(BitmapEx(VCLUnoHelper::GetBitmap(aXBitmap).GetBitmap(), /*mask*/COL_LIGHTMAGENTA));
// insert Displayname into treelist with bitmaps // insert Displayname into treelist with bitmaps
pEntry = mpLbTree->InsertEntry ( aStrDisplayname, pEntry = mpLbTree->InsertEntry ( aStrDisplayname,
aBmp, aBmp, aBmp, aBmp,

3
cui/source/options/optcolor.cxx
View File

@ -547,8 +547,7 @@ void ColorConfigWindow_Impl::CreateEntries()
void ColorConfigWindow_Impl::SetAppearance () void ColorConfigWindow_Impl::SetAppearance ()
{ {
Color TempColor(COL_TRANSPARENT); Wallpaper const aTransparentWall(COL_TRANSPARENT);
Wallpaper const aTransparentWall(TempColor);
StyleSettings const& rStyleSettings = GetSettings().GetStyleSettings(); StyleSettings const& rStyleSettings = GetSettings().GetStyleSettings();
Color const aBackColor = rStyleSettings.GetHighContrastMode() ? Color const aBackColor = rStyleSettings.GetHighContrastMode() ?
rStyleSettings.GetShadowColor() : Color(COL_LIGHTGRAY); rStyleSettings.GetShadowColor() : Color(COL_LIGHTGRAY);

3
cui/source/tabpages/tptrans.cxx
View File

@ -374,8 +374,7 @@ bool SvxTransparenceTabPage::FillItemSet(SfxItemSet* rAttrs)
// disable unused XFillFloatTransparenceItem // disable unused XFillFloatTransparenceItem
if(bSwitchOffGradient && (bGradActive || bGradUsed)) if(bSwitchOffGradient && (bGradActive || bGradUsed))
{ {
Color aColor(COL_BLACK); XGradient aGrad(COL_BLACK, Color(COL_WHITE));
XGradient aGrad(aColor, Color(COL_WHITE));
aGrad.SetStartIntens(100); aGrad.SetStartIntens(100);
aGrad.SetEndIntens(100); aGrad.SetEndIntens(100);
XFillFloatTransparenceItem aItem(aGrad); XFillFloatTransparenceItem aItem(aGrad);

2
desktop/source/lib/init.cxx
View File

@ -3406,7 +3406,7 @@ unsigned char* doc_renderFont(SAL_UNUSED_PARAMETER LibreOfficeKitDocument* /*pTh
if (*pFontWidth > 0 && *pFontHeight > 0) if (*pFontWidth > 0 && *pFontHeight > 0)
{ {
DrawTextFlags nStyle = DrawTextFlags const nStyle =
DrawTextFlags::Center DrawTextFlags::Center
| DrawTextFlags::VCenter | DrawTextFlags::VCenter
| DrawTextFlags::MultiLine | DrawTextFlags::MultiLine

3
emfio/source/reader/mtftools.cxx
View File

@ -984,8 +984,7 @@ namespace emfio
void MtfTools::ImplSetNonPersistentLineColorTransparenz() void MtfTools::ImplSetNonPersistentLineColorTransparenz()
{ {
Color aColor( COL_TRANSPARENT); WinMtfLineStyle aTransparentLine( COL_TRANSPARENT, true );
WinMtfLineStyle aTransparentLine( aColor, true );
if ( ! ( maLatestLineStyle == aTransparentLine ) ) if ( ! ( maLatestLineStyle == aTransparentLine ) )
{ {
maLatestLineStyle = aTransparentLine; maLatestLineStyle = aTransparentLine;

3
extensions/source/bibliography/toolbar.cxx
View File

@ -508,8 +508,7 @@ IMPL_LINK_NOARG( BibToolBar, MenuHdl, ToolBox*, void)
SendDispatch(nTBC_BT_AUTOFILTER, aPropVal); SendDispatch(nTBC_BT_AUTOFILTER, aPropVal);
} }
Point aPoint; MouseEvent aLeave( Point(), 0, MouseEventModifiers::LEAVEWINDOW | MouseEventModifiers::SYNTHETIC );
MouseEvent aLeave( aPoint, 0, MouseEventModifiers::LEAVEWINDOW | MouseEventModifiers::SYNTHETIC );
MouseMove( aLeave ); MouseMove( aLeave );
SetItemDown(nTBC_BT_AUTOFILTER, false); SetItemDown(nTBC_BT_AUTOFILTER, false);

3
filter/source/graphicfilter/ipsd/ipsd.cxx
View File

@ -138,10 +138,9 @@ bool PSDReader::ReadPSD(Graphic & rGraphic )
if ( mnXResFixed && mnYResFixed ) if ( mnXResFixed && mnYResFixed )
{ {
Point aEmptyPoint;
Fraction aFractX( 1, mnXResFixed >> 16 ); Fraction aFractX( 1, mnXResFixed >> 16 );
Fraction aFractY( 1, mnYResFixed >> 16 ); Fraction aFractY( 1, mnYResFixed >> 16 );
MapMode aMapMode( MapUnit::MapInch, aEmptyPoint, aFractX, aFractY ); MapMode aMapMode( MapUnit::MapInch, Point(), aFractX, aFractY );
Size aPrefSize = OutputDevice::LogicToLogic(aBitmapSize, aMapMode, MapMode(MapUnit::Map100thMM)); Size aPrefSize = OutputDevice::LogicToLogic(aBitmapSize, aMapMode, MapMode(MapUnit::Map100thMM));
rGraphic.SetPrefSize( aPrefSize ); rGraphic.SetPrefSize( aPrefSize );
rGraphic.SetPrefMapMode( MapMode( MapUnit::Map100thMM ) ); rGraphic.SetPrefMapMode( MapMode( MapUnit::Map100thMM ) );

4
filter/source/msfilter/eschesdo.cxx
View File

@ -196,8 +196,6 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
} }
} }
Point aTextRefPoint;
if( rObj.GetType() == "drawing.Group" ) if( rObj.GetType() == "drawing.Group" )
{ {
Reference< XIndexAccess > xXIndexAccess( rObj.GetShapeRef(), UNO_QUERY ); Reference< XIndexAccess > xXIndexAccess( rObj.GetShapeRef(), UNO_QUERY );
@ -700,7 +698,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
if( bAdditionalText ) if( bAdditionalText )
{ {
mpEscherEx->EndShape( nShapeType, nShapeID ); mpEscherEx->EndShape( nShapeType, nShapeID );
ImplWriteAdditionalText( rObj, aTextRefPoint ); ImplWriteAdditionalText( rObj, Point() );
} }
} while ( false ); } while ( false );

3
filter/source/msfilter/msdffimp.cxx
View File

@ -2558,9 +2558,8 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt
void DffPropertyReader::ApplyAttributes( SvStream& rIn, SfxItemSet& rSet ) const void DffPropertyReader::ApplyAttributes( SvStream& rIn, SfxItemSet& rSet ) const
{ {
tools::Rectangle aEmptyRect;
DffRecordHeader aHdTemp; DffRecordHeader aHdTemp;
DffObjData aDffObjTemp( aHdTemp, aEmptyRect, 0 ); DffObjData aDffObjTemp( aHdTemp, tools::Rectangle(), 0 );
ApplyAttributes( rIn, rSet, aDffObjTemp ); ApplyAttributes( rIn, rSet, aDffObjTemp );
} }

3
filter/source/pdf/pdfexport.cxx
View File

@ -1007,8 +1007,7 @@ bool PDFExport::ImplExportPage( vcl::PDFWriter& rWriter, vcl::PDFExtOutDevData&
basegfx::B2DPolygon aSize(tools::Polygon(tools::Rectangle(Point(0, 0), rMtf.GetPrefSize())).getB2DPolygon()); basegfx::B2DPolygon aSize(tools::Polygon(tools::Rectangle(Point(0, 0), rMtf.GetPrefSize())).getB2DPolygon());
basegfx::B2DPolygon aSizePDF(OutputDevice::LogicToLogic(aSize, rMtf.GetPrefMapMode(), MapMode(MapUnit::MapPoint))); basegfx::B2DPolygon aSizePDF(OutputDevice::LogicToLogic(aSize, rMtf.GetPrefMapMode(), MapMode(MapUnit::MapPoint)));
basegfx::B2DRange aRangePDF(aSizePDF.getB2DRange()); basegfx::B2DRange aRangePDF(aSizePDF.getB2DRange());
Point aOrigin; tools::Rectangle aPageRect( Point(), rMtf.GetPrefSize() );
tools::Rectangle aPageRect( aOrigin, rMtf.GetPrefSize() );
rWriter.NewPage( aRangePDF.getWidth(), aRangePDF.getHeight() ); rWriter.NewPage( aRangePDF.getWidth(), aRangePDF.getHeight() );
rWriter.SetMapMode( rMtf.GetPrefMapMode() ); rWriter.SetMapMode( rMtf.GetPrefMapMode() );

3
filter/source/svg/svgwriter.cxx
View File

@ -2714,8 +2714,7 @@ void SVGActionWriter::ImplWriteBmp( const BitmapEx& rBmpEx,
if( !!rBmpEx ) if( !!rBmpEx )
{ {
BitmapEx aBmpEx( rBmpEx ); BitmapEx aBmpEx( rBmpEx );
Point aPoint; const tools::Rectangle aBmpRect( Point(), rBmpEx.GetSizePixel() );
const tools::Rectangle aBmpRect( aPoint, rBmpEx.GetSizePixel() );
const tools::Rectangle aSrcRect( rSrcPt, rSrcSz ); const tools::Rectangle aSrcRect( rSrcPt, rSrcSz );
if( aSrcRect != aBmpRect ) if( aSrcRect != aBmpRect )

3
framework/source/uielement/menubarmanager.cxx
View File

@ -252,9 +252,8 @@ void SAL_CALL MenuBarManager::elementInserted( const css::ui::ConfigurationEvent
return; return;
sal_Int16 nImageType = sal_Int16(); sal_Int16 nImageType = sal_Int16();
sal_Int16 nCurrentImageType = css::ui::ImageType::SIZE_LARGE;
if (( Event.aInfo >>= nImageType ) && if (( Event.aInfo >>= nImageType ) &&
( nImageType == nCurrentImageType )) ( nImageType == css::ui::ImageType::SIZE_LARGE ))
RequestImages(); RequestImages();
} }

4
package/source/zippackage/ZipPackage.cxx
View File

@ -1088,11 +1088,10 @@ void ZipPackage::WriteContentTypes( ZipOutputStream& aZipOut, const vector< uno:
// Convert vector into a uno::Sequence // Convert vector into a uno::Sequence
// TODO/LATER: use Default entries in future // TODO/LATER: use Default entries in future
uno::Sequence< beans::StringPair > aDefaultsSequence(aManList.size()); uno::Sequence< beans::StringPair > aDefaultsSequence(1);
// Add at least the application/xml default entry. // Add at least the application/xml default entry.
aDefaultsSequence[0].First = "xml"; aDefaultsSequence[0].First = "xml";
aDefaultsSequence[0].Second= "application/xml"; aDefaultsSequence[0].Second= "application/xml";
sal_Int32 nDefSeqLength = 1;
uno::Sequence< beans::StringPair > aOverridesSequence(aManList.size()); uno::Sequence< beans::StringPair > aOverridesSequence(aManList.size());
sal_Int32 nOverSeqLength = 0; sal_Int32 nOverSeqLength = 0;
@ -1117,7 +1116,6 @@ void ZipPackage::WriteContentTypes( ZipOutputStream& aZipOut, const vector< uno:
} }
} }
aOverridesSequence.realloc(nOverSeqLength); aOverridesSequence.realloc(nOverSeqLength);
aDefaultsSequence.realloc(nDefSeqLength);
::comphelper::OFOPXMLHelper::WriteContentSequence( ::comphelper::OFOPXMLHelper::WriteContentSequence(
xConTypeOutStream, aDefaultsSequence, aOverridesSequence, m_xContext ); xConTypeOutStream, aDefaultsSequence, aOverridesSequence, m_xContext );

3
reportdesign/source/ui/dlg/Condition.cxx
View File

@ -239,8 +239,7 @@ IMPL_LINK(Condition, DropdownClick, ToolBox*, pToolBox, void)
IMPL_LINK_NOARG( Condition, OnFormatAction, ToolBox*, void ) IMPL_LINK_NOARG( Condition, OnFormatAction, ToolBox*, void )
{ {
Color aCol(COL_AUTO); ApplyCommand(mapToolbarItemToSlotId(m_pActions->GetCurItemId()),COL_AUTO);
ApplyCommand(mapToolbarItemToSlotId(m_pActions->GetCurItemId()),aCol);
} }
IMPL_LINK( Condition, OnConditionAction, Button*, _pClickedButton, void ) IMPL_LINK( Condition, OnConditionAction, Button*, _pClickedButton, void )

3
sc/source/core/data/stlpool.cxx
View File

@ -214,7 +214,6 @@ void ScStyleSheetPool::CreateStandardStyles()
// Add new entries even for CopyStdStylesFrom // Add new entries even for CopyStdStylesFrom
Color aColBlack ( COL_BLACK ); Color aColBlack ( COL_BLACK );
Color aColGrey ( COL_LIGHTGRAY );
OUString aStr; OUString aStr;
sal_Int32 nStrLen; sal_Int32 nStrLen;
OUString aHelpFile;//which text??? OUString aHelpFile;//which text???
@ -338,7 +337,7 @@ void ScStyleSheetPool::CreateStandardStyles()
pHFSetItem = new SvxSetItem( pSet->Get( ATTR_PAGE_HEADERSET ) ); pHFSetItem = new SvxSetItem( pSet->Get( ATTR_PAGE_HEADERSET ) );
pHFSet = &(pHFSetItem->GetItemSet()); pHFSet = &(pHFSetItem->GetItemSet());
pHFSet->Put( SvxBrushItem( aColGrey, ATTR_BACKGROUND ) ); pHFSet->Put( SvxBrushItem( COL_LIGHTGRAY, ATTR_BACKGROUND ) );
pHFSet->Put( aBoxItem ); pHFSet->Put( aBoxItem );
pHFSet->Put( aBoxInfoItem ); pHFSet->Put( aBoxInfoItem );
pHFSetItem->SetWhich(ATTR_PAGE_HEADERSET); pHFSetItem->SetWhich(ATTR_PAGE_HEADERSET);

3
sc/source/core/tool/autoform.cxx
View File

@ -885,10 +885,9 @@ ScAutoFormat::ScAutoFormat() :
aBox.SetLine(&aLine, SvxBoxItemLine::BOTTOM); aBox.SetLine(&aLine, SvxBoxItemLine::BOTTOM);
Color aWhite(COL_WHITE); Color aWhite(COL_WHITE);
Color aBlue(COL_BLUE);
SvxColorItem aWhiteText( aWhite, ATTR_FONT_COLOR ); SvxColorItem aWhiteText( aWhite, ATTR_FONT_COLOR );
SvxColorItem aBlackText( aBlack, ATTR_FONT_COLOR ); SvxColorItem aBlackText( aBlack, ATTR_FONT_COLOR );
SvxBrushItem aBlueBack( aBlue, ATTR_BACKGROUND ); SvxBrushItem aBlueBack( COL_BLUE, ATTR_BACKGROUND );
SvxBrushItem aWhiteBack( aWhite, ATTR_BACKGROUND ); SvxBrushItem aWhiteBack( aWhite, ATTR_BACKGROUND );
SvxBrushItem aGray70Back( Color(0x4d, 0x4d, 0x4d), ATTR_BACKGROUND ); SvxBrushItem aGray70Back( Color(0x4d, 0x4d, 0x4d), ATTR_BACKGROUND );
SvxBrushItem aGray20Back( Color(0xcc, 0xcc, 0xcc), ATTR_BACKGROUND ); SvxBrushItem aGray20Back( Color(0xcc, 0xcc, 0xcc), ATTR_BACKGROUND );

9
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
View File

@ -1127,8 +1127,7 @@ ScPagePreviewCountData::ScPagePreviewCountData( const ScPreviewLocationData& rDa
Size aOutputSize; Size aOutputSize;
if ( pSizeWindow ) if ( pSizeWindow )
aOutputSize = pSizeWindow->GetOutputSizePixel(); aOutputSize = pSizeWindow->GetOutputSizePixel();
Point aPoint; aVisRect = tools::Rectangle( Point(), aOutputSize );
aVisRect = tools::Rectangle( aPoint, aOutputSize );
tools::Rectangle aObjRect; tools::Rectangle aObjRect;
@ -1236,8 +1235,7 @@ void ScAccessibleDocumentPagePreview::Notify( SfxBroadcaster& rBC, const SfxHint
vcl::Window* pSizeWindow = mpViewShell->GetWindow(); vcl::Window* pSizeWindow = mpViewShell->GetWindow();
if ( pSizeWindow ) if ( pSizeWindow )
aOutputSize = pSizeWindow->GetOutputSizePixel(); aOutputSize = pSizeWindow->GetOutputSizePixel();
Point aPoint; tools::Rectangle aVisRect( Point(), aOutputSize );
tools::Rectangle aVisRect( aPoint, aOutputSize );
GetNotesChildren()->DataChanged(aVisRect); GetNotesChildren()->DataChanged(aVisRect);
GetShapeChildren()->DataChanged(); GetShapeChildren()->DataChanged();
@ -1273,8 +1271,7 @@ void ScAccessibleDocumentPagePreview::Notify( SfxBroadcaster& rBC, const SfxHint
vcl::Window* pSizeWindow = mpViewShell->GetWindow(); vcl::Window* pSizeWindow = mpViewShell->GetWindow();
if ( pSizeWindow ) if ( pSizeWindow )
aOutputSize = pSizeWindow->GetOutputSizePixel(); aOutputSize = pSizeWindow->GetOutputSizePixel();
Point aPoint; tools::Rectangle aVisRect( Point(), aOutputSize );
tools::Rectangle aVisRect( aPoint, aOutputSize );
GetNotesChildren()->DataChanged(aVisRect); GetNotesChildren()->DataChanged(aVisRect);
GetShapeChildren()->VisAreaChanged(); GetShapeChildren()->VisAreaChanged();

3
sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
View File

@ -405,8 +405,7 @@ void ScAccessiblePreviewHeaderCell::FillTableInfo() const
vcl::Window* pWindow = mpViewShell->GetWindow(); vcl::Window* pWindow = mpViewShell->GetWindow();
if ( pWindow ) if ( pWindow )
aOutputSize = pWindow->GetOutputSizePixel(); aOutputSize = pWindow->GetOutputSizePixel();
Point aPoint; tools::Rectangle aVisRect( Point(), aOutputSize );
tools::Rectangle aVisRect( aPoint, aOutputSize );
mpTableInfo = new ScPreviewTableInfo; mpTableInfo = new ScPreviewTableInfo;
mpViewShell->GetLocationData().GetTableInfo( aVisRect, *mpTableInfo ); mpViewShell->GetLocationData().GetTableInfo( aVisRect, *mpTableInfo );

3
sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
View File

@ -636,8 +636,7 @@ void ScAccessiblePreviewTable::FillTableInfo() const
vcl::Window* pWindow = mpViewShell->GetWindow(); vcl::Window* pWindow = mpViewShell->GetWindow();
if ( pWindow ) if ( pWindow )
aOutputSize = pWindow->GetOutputSizePixel(); aOutputSize = pWindow->GetOutputSizePixel();
Point aPoint; tools::Rectangle aVisRect( Point(), aOutputSize );
tools::Rectangle aVisRect( aPoint, aOutputSize );
mpTableInfo = new ScPreviewTableInfo; mpTableInfo = new ScPreviewTableInfo;
mpViewShell->GetLocationData().GetTableInfo( aVisRect, *mpTableInfo ); mpViewShell->GetLocationData().GetTableInfo( aVisRect, *mpTableInfo );

12
sc/source/ui/Accessibility/AccessibleText.cxx
View File

@ -265,9 +265,8 @@ bool ScPreviewViewForwarder::IsValid() const
tools::Rectangle ScPreviewViewForwarder::GetVisArea() const tools::Rectangle ScPreviewViewForwarder::GetVisArea() const
{ {
tools::Rectangle aVisArea;
OSL_FAIL("should be implemented in an abrevated class"); OSL_FAIL("should be implemented in an abrevated class");
return aVisArea; return tools::Rectangle();
} }
Point ScPreviewViewForwarder::LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const Point ScPreviewViewForwarder::LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const
@ -325,8 +324,7 @@ tools::Rectangle ScPreviewViewForwarder::GetVisRect() const
vcl::Window* pWindow = mpViewShell->GetWindow(); vcl::Window* pWindow = mpViewShell->GetWindow();
if ( pWindow ) if ( pWindow )
aOutputSize = pWindow->GetOutputSizePixel(); aOutputSize = pWindow->GetOutputSizePixel();
Point aPoint; tools::Rectangle aVisRect( Point(), aOutputSize );
tools::Rectangle aVisRect( aPoint, aOutputSize );
return aVisRect; return aVisRect;
} }
return tools::Rectangle(); return tools::Rectangle();
@ -1274,8 +1272,7 @@ SvxTextForwarder* ScAccessiblePreviewHeaderCellTextData::GetTextForwarder()
vcl::Window* pWindow = mpViewShell->GetWindow(); vcl::Window* pWindow = mpViewShell->GetWindow();
if ( pWindow ) if ( pWindow )
aOutputSize = pWindow->GetOutputSizePixel(); aOutputSize = pWindow->GetOutputSizePixel();
Point aPoint; tools::Rectangle aVisRect( Point(), aOutputSize );
tools::Rectangle aVisRect( aPoint, aOutputSize );
Size aSize(mpViewShell->GetLocationData().GetHeaderCellOutputRect(aVisRect, aCellPos, mbColHeader).GetSize()); Size aSize(mpViewShell->GetLocationData().GetHeaderCellOutputRect(aVisRect, aCellPos, mbColHeader).GetSize());
if (pWindow) if (pWindow)
aSize = pWindow->PixelToLogic(aSize, pEditEngine->GetRefMapMode()); aSize = pWindow->PixelToLogic(aSize, pEditEngine->GetRefMapMode());
@ -1501,8 +1498,7 @@ SvxTextForwarder* ScAccessibleNoteTextData::GetTextForwarder()
vcl::Window* pWindow = mpViewShell->GetWindow(); vcl::Window* pWindow = mpViewShell->GetWindow();
if ( pWindow ) if ( pWindow )
aOutputSize = pWindow->GetOutputSizePixel(); aOutputSize = pWindow->GetOutputSizePixel();
Point aPoint; tools::Rectangle aVisRect( Point(), aOutputSize );
tools::Rectangle aVisRect( aPoint, aOutputSize );
Size aSize(mpViewShell->GetLocationData().GetNoteInRangeOutputRect(aVisRect, mbMarkNote, maCellPos).GetSize()); Size aSize(mpViewShell->GetLocationData().GetNoteInRangeOutputRect(aVisRect, mbMarkNote, maCellPos).GetSize());
if (pWindow) if (pWindow)
aSize = pWindow->PixelToLogic(aSize, mpEditEngine->GetRefMapMode()); aSize = pWindow->PixelToLogic(aSize, mpEditEngine->GetRefMapMode());

3
sc/source/ui/app/drwtrans.cxx
View File

@ -744,8 +744,7 @@ void ScDrawTransferObj::InitDocShell()
} }
} }
Point aTmpPoint; tools::Rectangle aDestArea( Point(), aSrcSize );
tools::Rectangle aDestArea( aTmpPoint, aSrcSize );
pDocSh->SetVisArea( aDestArea ); pDocSh->SetVisArea( aDestArea );
ScViewOptions aViewOpt( rDestDoc.GetViewOptions() ); ScViewOptions aViewOpt( rDestDoc.GetViewOptions() );

3
sc/source/ui/app/transobj.cxx
View File

@ -102,8 +102,7 @@ void ScTransferObj::PaintToDev( OutputDevice* pDev, ScDocument* pDoc, double nPr
if (!pDoc) if (!pDoc)
return; return;
Point aPoint; tools::Rectangle aBound( Point(), pDev->GetOutputSize() ); //! use size from clip area?
tools::Rectangle aBound( aPoint, pDev->GetOutputSize() ); //! use size from clip area?
ScViewData aViewData(nullptr,nullptr); ScViewData aViewData(nullptr,nullptr);
aViewData.InitData( pDoc ); aViewData.InitData( pDoc );

3
sc/source/ui/dbgui/csvgrid.cxx
View File

@ -988,8 +988,7 @@ void ScCsvGrid::Command( const CommandEvent& rCEvt )
break; break;
case CommandEventId::Wheel: case CommandEventId::Wheel:
{ {
Point aPoint; tools::Rectangle aRect( Point(), maWinSize );
tools::Rectangle aRect( aPoint, maWinSize );
if( aRect.IsInside( rCEvt.GetMousePosPixel() ) ) if( aRect.IsInside( rCEvt.GetMousePosPixel() ) )
{ {
const CommandWheelData* pData = rCEvt.GetWheelData(); const CommandWheelData* pData = rCEvt.GetWheelData();

3
sc/source/ui/dbgui/csvruler.cxx
View File

@ -410,8 +410,7 @@ void ScCsvRuler::MouseMove( const MouseEvent& rMEvt )
} }
else else
{ {
Point aPoint; tools::Rectangle aRect( Point(), maWinSize );
tools::Rectangle aRect( aPoint, maWinSize );
if( !IsVisibleSplitPos( nPos ) || !aRect.IsInside( rMEvt.GetPosPixel() ) ) if( !IsVisibleSplitPos( nPos ) || !aRect.IsInside( rMEvt.GetPosPixel() ) )
// if focused, keep old cursor position for key input // if focused, keep old cursor position for key input
nPos = HasFocus() ? GetRulerCursorPos() : CSV_POS_INVALID; nPos = HasFocus() ? GetRulerCursorPos() : CSV_POS_INVALID;

3
sc/source/ui/miscdlgs/autofmt.cxx
View File

@ -507,8 +507,7 @@ void ScAutoFmtPreview::DoPaint(vcl::RenderContext& rRenderContext)
Size aWndSize(GetSizePixel()); Size aWndSize(GetSizePixel());
vcl::Font aFont(aVD->GetFont()); vcl::Font aFont(aVD->GetFont());
Color aBackCol(rRenderContext.GetSettings().GetStyleSettings().GetWindowColor()); Color aBackCol(rRenderContext.GetSettings().GetStyleSettings().GetWindowColor());
Point aTmpPoint; tools::Rectangle aRect(Point(), aWndSize);
tools::Rectangle aRect(aTmpPoint, aWndSize);
aFont.SetTransparent( true ); aFont.SetTransparent( true );
aVD->SetFont(aFont); aVD->SetFont(aFont);

3
sc/source/ui/sidebar/CellLineStyleValueSet.cxx
View File

@ -92,11 +92,10 @@ void CellLineStyleValueSet::UserDraw( const UserDrawEvent& rUDEvt )
if( nSelItem == nItemId ) if( nSelItem == nItemId )
{ {
Color aBackColor(50,107,197);
tools::Rectangle aBackRect = aRect; tools::Rectangle aBackRect = aRect;
aBackRect.AdjustTop(3 ); aBackRect.AdjustTop(3 );
aBackRect.AdjustBottom( -2 ); aBackRect.AdjustBottom( -2 );
pDev->SetFillColor(aBackColor); pDev->SetFillColor(Color(50,107,197));
pDev->DrawRect(aBackRect); pDev->DrawRect(aBackRect);
} }
else else

6
sc/source/ui/unoobj/docuno.cxx
View File

@ -1905,8 +1905,7 @@ void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, const uno::Any& aSelec
{ {
// Similar to as in and when calling ScTransferObj::PaintToDev() // Similar to as in and when calling ScTransferObj::PaintToDev()
Point aPoint; tools::Rectangle aBound( Point(), pDev->GetOutputSize());
tools::Rectangle aBound( aPoint, pDev->GetOutputSize());
ScViewData aViewData(nullptr,nullptr); ScViewData aViewData(nullptr,nullptr);
aViewData.InitData( &rDoc ); aViewData.InitData( &rDoc );
@ -4496,11 +4495,10 @@ void SAL_CALL ScScenariosObj::addNewByName( const OUString& aName,
} }
} }
Color aColor( COL_LIGHTGRAY ); // Default
ScScenarioFlags const nFlags = ScScenarioFlags::ShowFrame | ScScenarioFlags::PrintFrame ScScenarioFlags const nFlags = ScScenarioFlags::ShowFrame | ScScenarioFlags::PrintFrame
| ScScenarioFlags::TwoWay | ScScenarioFlags::Protected; | ScScenarioFlags::TwoWay | ScScenarioFlags::Protected;
pDocShell->MakeScenario( nTab, aName, aComment, aColor, nFlags, aMarkData ); pDocShell->MakeScenario( nTab, aName, aComment, COL_LIGHTGRAY, nFlags, aMarkData );
} }
} }

3
sc/source/ui/vba/vbavalidation.cxx
View File

@ -301,7 +301,6 @@ ScVbaValidation::getFormula1()
ScRefFlags nFlags = ScRefFlags::ZERO; ScRefFlags nFlags = ScRefFlags::ZERO;
ScRangeList aCellRanges; ScRangeList aCellRanges;
formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_XL_A1;
ScDocShell* pDocSh = excel::GetDocShellFromRange( m_xRange ); ScDocShell* pDocSh = excel::GetDocShellFromRange( m_xRange );
// in calc validation formula is either a range or formula // in calc validation formula is either a range or formula
@ -309,7 +308,7 @@ ScVbaValidation::getFormula1()
// In VBA both formula and address can have a leading '=' // In VBA both formula and address can have a leading '='
// in result of getFormula1, however it *seems* that a named range or // in result of getFormula1, however it *seems* that a named range or
// real formula has to (or is expected to) have the '=' // real formula has to (or is expected to) have the '='
if ( pDocSh && !ScVbaRange::getCellRangesForAddress( nFlags, sString, pDocSh, aCellRanges, eConv, 0 ) ) if ( pDocSh && !ScVbaRange::getCellRangesForAddress( nFlags, sString, pDocSh, aCellRanges, formula::FormulaGrammar::CONV_XL_A1, 0 ) )
sString = "=" + sString; sString = "=" + sString;
return sString; return sString;
} }

3
sc/source/ui/view/drawview.cxx
View File

@ -264,9 +264,8 @@ void ScDrawView::UpdateWorkArea()
SdrPage* pPage = GetModel()->GetPage(static_cast<sal_uInt16>(nTab)); SdrPage* pPage = GetModel()->GetPage(static_cast<sal_uInt16>(nTab));
if (pPage) if (pPage)
{ {
Point aPos;
Size aPageSize( pPage->GetSize() ); Size aPageSize( pPage->GetSize() );
tools::Rectangle aNewArea( aPos, aPageSize ); tools::Rectangle aNewArea( Point(), aPageSize );
if ( aPageSize.Width() < 0 ) if ( aPageSize.Width() < 0 )
{ {
// RTL: from max.negative (left) to zero (right) // RTL: from max.negative (left) to zero (right)

6
sc/source/ui/view/hdrcont.cxx
View File

@ -258,9 +258,8 @@ void ScHeaderControl::Paint( vcl::RenderContext& /*rRenderContext*/, const tools
aBoldFont.SetColor( aSelTextColor ); aBoldFont.SetColor( aSelTextColor );
SetTextColor( ( bBoldSet && !bHighContrast ) ? aSelTextColor : aTextColor ); SetTextColor( ( bBoldSet && !bHighContrast ) ? aSelTextColor : aTextColor );
Color aBlack( COL_BLACK );
Color aSelLineColor = rStyleSettings.GetHighlightColor(); Color aSelLineColor = rStyleSettings.GetHighlightColor();
aSelLineColor.Merge( aBlack, 0xe0 ); // darken just a little bit aSelLineColor.Merge( COL_BLACK, 0xe0 ); // darken just a little bit
bool bLayoutRTL = IsLayoutRTL(); bool bLayoutRTL = IsLayoutRTL();
long nLayoutSign = bLayoutRTL ? -1 : 1; long nLayoutSign = bLayoutRTL ? -1 : 1;
@ -707,8 +706,7 @@ void ScHeaderControl::MouseButtonDown( const MouseEvent& rMEvt )
else else
{ {
pSelEngine->SetWindow( this ); pSelEngine->SetWindow( this );
Point aPoint; tools::Rectangle aVis( Point(), GetOutputSizePixel() );
tools::Rectangle aVis( aPoint,GetOutputSizePixel() );
if (bVertical) if (bVertical)
{ {
aVis.SetLeft( LONG_MIN ); aVis.SetLeft( LONG_MIN );

3
sc/source/ui/view/preview.cxx
View File

@ -514,8 +514,7 @@ void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation )
rDefPattern.FillEditItemSet(pEditDefaults); rDefPattern.FillEditItemSet(pEditDefaults);
pEditEng->SetDefaults(pEditDefaults); pEditEng->SetDefaults(pEditDefaults);
Color aTextColor(COL_LIGHTGRAY); pEditDefaults->Put(SvxColorItem(COL_LIGHTGRAY, EE_CHAR_COLOR));
pEditDefaults->Put(SvxColorItem(aTextColor, EE_CHAR_COLOR));
OUString aEmptyMsg; OUString aEmptyMsg;
if (mbHasEmptyRangeTable) if (mbHasEmptyRangeTable)

3
sccomp/source/solver/SwarmSolver.cxx
View File

@ -279,9 +279,8 @@ public:
OUString SwarmSolver::getResourceString(const char* pId) OUString SwarmSolver::getResourceString(const char* pId)
{ {
OUString sString;
if (!pId) if (!pId)
return sString; return OUString();
return Translate::get(pId, Translate::Create("scc")); return Translate::get(pId, Translate::Create("scc"));
} }

6
sd/source/core/drawdoc4.cxx
View File

@ -167,9 +167,8 @@ void SdDrawDocument::CreateLayoutTemplates()
rISet.Put( XFillGradientItem( aNullGrad) ); rISet.Put( XFillGradientItem( aNullGrad) );
rISet.Put(XFillHatchItem(aNullHatch)); rISet.Put(XFillHatchItem(aNullHatch));
Size aNullSize( 32, 32 ); Size aNullSize( 32, 32 );
Color aNullColor( COL_WHITE );
Bitmap aNullBmp( aNullSize, 8 ); Bitmap aNullBmp( aNullSize, 8 );
aNullBmp.Erase( aNullColor ); aNullBmp.Erase( COL_WHITE );
rISet.Put(XFillBitmapItem(Graphic(aNullBmp))); rISet.Put(XFillBitmapItem(Graphic(aNullBmp)));
// Shadow attributes (Drawing Engine) // Shadow attributes (Drawing Engine)
@ -401,8 +400,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// Don't get color from the color table, because the color might have been // Don't get color from the color table, because the color might have been
// deleted or changed there // deleted or changed there
Color aOrange4(255, 204, 153); pISet->Put(XFillColorItem(OUString(), Color(255, 204, 153))); // orange
pISet->Put(XFillColorItem(OUString(), aOrange4));
pISet->Put(makeSdrShadowItem(true)); pISet->Put(makeSdrShadowItem(true));
pISet->Put(makeSdrShadowColorItem(COL_GRAY)); pISet->Put(makeSdrShadowColorItem(COL_GRAY));

6
sd/source/filter/eppt/epptso.cxx
View File

@ -828,8 +828,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj )
{ {
case css::drawing::FillStyle_GRADIENT : case css::drawing::FillStyle_GRADIENT :
{ {
Point aEmptyPoint; ::tools::Rectangle aRect( Point(), Size( 28000, 21000 ) );
::tools::Rectangle aRect( aEmptyPoint, Size( 28000, 21000 ) );
EscherPropertyContainer aPropOpt( mpPptEscherEx->GetGraphicProvider(), mpPicStrm, aRect ); EscherPropertyContainer aPropOpt( mpPptEscherEx->GetGraphicProvider(), mpPicStrm, aRect );
aPropOpt.CreateGradientProperties( mXPropSet ); aPropOpt.CreateGradientProperties( mXPropSet );
aPropOpt.GetOpt( ESCHER_Prop_fillColor, nBackgroundColor ); aPropOpt.GetOpt( ESCHER_Prop_fillColor, nBackgroundColor );
@ -851,8 +850,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj )
{ {
case css::drawing::FillStyle_GRADIENT : case css::drawing::FillStyle_GRADIENT :
{ {
Point aEmptyPoint; ::tools::Rectangle aRect( Point(), Size( 28000, 21000 ) );
::tools::Rectangle aRect( aEmptyPoint, Size( 28000, 21000 ) );
EscherPropertyContainer aPropOpt( mpPptEscherEx->GetGraphicProvider(), mpPicStrm, aRect ); EscherPropertyContainer aPropOpt( mpPptEscherEx->GetGraphicProvider(), mpPicStrm, aRect );
aPropOpt.CreateGradientProperties( mXBackgroundPropSet ); aPropOpt.CreateGradientProperties( mXBackgroundPropSet );
aPropOpt.GetOpt( ESCHER_Prop_fillColor, nBackgroundColor ); aPropOpt.GetOpt( ESCHER_Prop_fillColor, nBackgroundColor );

3
sd/source/ui/annotations/annotationtag.cxx
View File

@ -450,8 +450,7 @@ void AnnotationTag::addCustomHandles( SdrHdlList& rHandlerList )
if( mxAnnotation.is() ) if( mxAnnotation.is() )
{ {
SmartTagReference xThis( this ); SmartTagReference xThis( this );
Point aPoint; AnnotationHdl* pHdl = new AnnotationHdl( xThis, mxAnnotation, Point() );
AnnotationHdl* pHdl = new AnnotationHdl( xThis, mxAnnotation, aPoint );
pHdl->SetObjHdlNum( SMART_TAG_HDL_NUM ); pHdl->SetObjHdlNum( SMART_TAG_HDL_NUM );
pHdl->SetPageView( mrView.GetSdrPageView() ); pHdl->SetPageView( mrView.GetSdrPageView() );

3
sd/source/ui/dlg/inspagob.cxx
View File

@ -82,10 +82,9 @@ void SdInsertPagesObjsDlg::Reset()
} }
else else
{ {
Color aColor( COL_WHITE );
BitmapEx aBmpText(BMP_DOC_TEXT); BitmapEx aBmpText(BMP_DOC_TEXT);
//to-do, check if this is already transparent and remove intermedia bitmapex if it is //to-do, check if this is already transparent and remove intermedia bitmapex if it is
Image aImgText(BitmapEx(aBmpText.GetBitmap(), aColor)); Image aImgText(BitmapEx(aBmpText.GetBitmap(), COL_WHITE));
m_pLbTree->InsertEntry( rName, aImgText, aImgText ); m_pLbTree->InsertEntry( rName, aImgText, aImgText );
} }

3
sd/source/ui/table/tablefunction.cxx
View File

@ -273,8 +273,7 @@ void CreateTableFromRTF( SvStream& rStream, SdDrawDocument* pModel )
if( pPage ) if( pPage )
{ {
Size aSize( 200, 200 ); Size aSize( 200, 200 );
Point aPos; ::tools::Rectangle aRect (Point(), aSize);
::tools::Rectangle aRect (aPos, aSize);
sdr::table::SdrTableObj* pObj = new sdr::table::SdrTableObj( pModel, aRect, 1, 1 ); sdr::table::SdrTableObj* pObj = new sdr::table::SdrTableObj( pModel, aRect, 1, 1 );
pObj->NbcSetStyleSheet( pModel->GetDefaultStyleSheet(), true ); pObj->NbcSetStyleSheet( pModel->GetDefaultStyleSheet(), true );
apply_table_style( pObj, pModel, OUString() ); apply_table_style( pObj, pModel, OUString() );

3
sd/source/ui/unoidl/unopage.cxx
View File

@ -1118,10 +1118,9 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName )
std::shared_ptr<GDIMetaFile> xMetaFile = pDocShell->GetPreviewMetaFile(); std::shared_ptr<GDIMetaFile> xMetaFile = pDocShell->GetPreviewMetaFile();
if (xMetaFile) if (xMetaFile)
{ {
Point aPoint;
Size aSize( GetPage()->GetSize() ); Size aSize( GetPage()->GetSize() );
xMetaFile->AddAction( static_cast<MetaAction*>(new MetaFillColorAction( COL_WHITE, true )), 0 ); xMetaFile->AddAction( static_cast<MetaAction*>(new MetaFillColorAction( COL_WHITE, true )), 0 );
xMetaFile->AddAction( static_cast<MetaAction*>(new MetaRectAction( ::tools::Rectangle( aPoint, aSize ) )), 1 ); xMetaFile->AddAction( static_cast<MetaAction*>(new MetaRectAction( ::tools::Rectangle( Point(), aSize ) )), 1 );
xMetaFile->SetPrefMapMode(MapMode(MapUnit::Map100thMM)); xMetaFile->SetPrefMapMode(MapMode(MapUnit::Map100thMM));
xMetaFile->SetPrefSize( aSize ); xMetaFile->SetPrefSize( aSize );

3
sd/source/ui/view/drviews9.cxx
View File

@ -647,8 +647,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
if (i >= nCounts) if (i >= nCounts)
{ {
Color aBlack (0, 0, 0); XHatch aHatch (Color(0), static_cast<css::drawing::HatchStyle>(pStyle->GetValue ()), pDistance->GetValue (),
XHatch aHatch (aBlack, static_cast<css::drawing::HatchStyle>(pStyle->GetValue ()), pDistance->GetValue (),
pAngle->GetValue () * 10); pAngle->GetValue () * 10);
pHatchList->Insert(o3tl::make_unique<XHatchEntry>(aHatch, pName->GetValue())); pHatchList->Insert(o3tl::make_unique<XHatchEntry>(aHatch, pName->GetValue()));

3
sd/source/ui/view/outlview.cxx
View File

@ -113,8 +113,7 @@ OutlineView::OutlineView( DrawDocShell& rDocSh, vcl::Window* pWindow, OutlineVie
} }
mpOutlinerView[0] = new OutlinerView(&mrOutliner, pWindow); mpOutlinerView[0] = new OutlinerView(&mrOutliner, pWindow);
::tools::Rectangle aNullRect; mpOutlinerView[0]->SetOutputArea(::tools::Rectangle());
mpOutlinerView[0]->SetOutputArea(aNullRect);
mrOutliner.SetUpdateMode(false); mrOutliner.SetUpdateMode(false);
mrOutliner.InsertView(mpOutlinerView[0], EE_APPEND); mrOutliner.InsertView(mpOutlinerView[0], EE_APPEND);

2
sfx2/source/appl/sfxhelp.cxx
View File

@ -689,7 +689,7 @@ static bool impl_showOnlineHelp( const OUString& rURL )
static bool impl_showOfflineHelp( const OUString& rURL ) static bool impl_showOfflineHelp( const OUString& rURL )
{ {
OUString aBaseInstallPath = getHelpRootURL(); OUString aBaseInstallPath = getHelpRootURL();
OUString aInternal( "vnd.sun.star.help://" ); OUString const aInternal( "vnd.sun.star.help://" );
OUString aHelpLink( aBaseInstallPath + "/" + utl::ConfigManager::getProductVersion() + "/index.html?" ); OUString aHelpLink( aBaseInstallPath + "/" + utl::ConfigManager::getProductVersion() + "/index.html?" );
aHelpLink += rURL.copy( aInternal.getLength() ); aHelpLink += rURL.copy( aInternal.getLength() );

3
sfx2/source/appl/workwin.cxx
View File

@ -2317,8 +2317,7 @@ void SfxWorkWindow::EndAutoShow_Impl( Point aPos )
if ( p && p->IsAutoHide(false) ) if ( p && p->IsAutoHide(false) )
{ {
Point aLocalPos = p->ScreenToOutputPixel( aPos ); Point aLocalPos = p->ScreenToOutputPixel( aPos );
Point aEmptyPoint; tools::Rectangle aRect( Point(), p->GetSizePixel() );
tools::Rectangle aRect( aEmptyPoint, p->GetSizePixel() );
if ( !aRect.IsInside( aLocalPos ) ) if ( !aRect.IsInside( aLocalPos ) )
p->FadeOut(); p->FadeOut();
} }

3
sfx2/source/control/thumbnailviewacc.cxx
View File

@ -825,8 +825,7 @@ awt::Rectangle SAL_CALL ThumbnailViewItemAcc::getBounds()
if( mpParent ) if( mpParent )
{ {
tools::Rectangle aRect( mpParent->getDrawArea() ); tools::Rectangle aRect( mpParent->getDrawArea() );
Point aOrigin; tools::Rectangle aParentRect( Point(), mpParent->mrParent.GetOutputSizePixel() );
tools::Rectangle aParentRect( aOrigin, mpParent->mrParent.GetOutputSizePixel() );
aRect.Intersection( aParentRect ); aRect.Intersection( aParentRect );

4
sfx2/source/doc/docfilt.cxx
View File

@ -175,9 +175,9 @@ OUString SfxFilter::GetTypeFromStorage(
SotClipboardFormatId nClipId = SotExchange::GetFormat( aDataFlavor ); SotClipboardFormatId nClipId = SotExchange::GetFormat( aDataFlavor );
if ( nClipId != SotClipboardFormatId::NONE ) if ( nClipId != SotClipboardFormatId::NONE )
{ {
SfxFilterFlags nMust = SfxFilterFlags::IMPORT; SfxFilterFlags const nMust = SfxFilterFlags::IMPORT;
// template filters shouldn't be detected if not explicitly asked for // template filters shouldn't be detected if not explicitly asked for
SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED | SfxFilterFlags::TEMPLATEPATH; SfxFilterFlags const nDont = SFX_FILTER_NOTINSTALLED | SfxFilterFlags::TEMPLATEPATH;
// get filter from storage MediaType // get filter from storage MediaType
std::shared_ptr<const SfxFilter> pFilter = aMatcher.GetFilter4ClipBoardId( nClipId, nMust, nDont ); std::shared_ptr<const SfxFilter> pFilter = aMatcher.GetFilter4ClipBoardId( nClipId, nMust, nDont );

9
sfx2/source/doc/new.cxx
View File

@ -69,8 +69,7 @@ Size SfxPreviewBase_Impl::GetOptimalSize() const
void SfxPreviewWin_Impl::ImpPaint(vcl::RenderContext& rRenderContext, GDIMetaFile* pFile) void SfxPreviewWin_Impl::ImpPaint(vcl::RenderContext& rRenderContext, GDIMetaFile* pFile)
{ {
rRenderContext.SetLineColor(); rRenderContext.SetLineColor();
Color aLightGrayCol(COL_LIGHTGRAY); rRenderContext.SetFillColor(COL_LIGHTGRAY);
rRenderContext.SetFillColor(aLightGrayCol);
rRenderContext.DrawRect(tools::Rectangle(Point(0,0), rRenderContext.GetOutputSize())); rRenderContext.DrawRect(tools::Rectangle(Point(0,0), rRenderContext.GetOutputSize()));
Size aTmpSize = pFile ? pFile->GetPrefSize() : Size(1, 1); Size aTmpSize = pFile ? pFile->GetPrefSize() : Size(1, 1);
@ -101,10 +100,8 @@ void SfxPreviewWin_Impl::ImpPaint(vcl::RenderContext& rRenderContext, GDIMetaFil
if (pFile) if (pFile)
{ {
Color aBlackCol(COL_BLACK); rRenderContext.SetLineColor(COL_BLACK);
Color aWhiteCol(COL_WHITE); rRenderContext.SetFillColor(COL_WHITE);
rRenderContext.SetLineColor(aBlackCol);
rRenderContext.SetFillColor(aWhiteCol);
rRenderContext.DrawRect(tools::Rectangle(aPoint + Point(FRAME, FRAME), bPoint + Point(FRAME, FRAME))); rRenderContext.DrawRect(tools::Rectangle(aPoint + Point(FRAME, FRAME), bPoint + Point(FRAME, FRAME)));
pFile->WindStart(); pFile->WindStart();
pFile->Play(&rRenderContext, aPoint + Point(FRAME, FRAME), aSize); pFile->Play(&rRenderContext, aPoint + Point(FRAME, FRAME), aSize);

3
sfx2/source/view/frame.cxx
View File

@ -599,8 +599,7 @@ void SfxFrame::SetToolSpaceBorderPixel_Impl( const SvBorder& rBorder )
tools::Rectangle SfxFrame::GetTopOuterRectPixel_Impl() const tools::Rectangle SfxFrame::GetTopOuterRectPixel_Impl() const
{ {
Size aSize( GetWindow().GetOutputSizePixel() ); Size aSize( GetWindow().GetOutputSizePixel() );
Point aPoint; return tools::Rectangle( Point(), aSize );
return ( tools::Rectangle ( aPoint, aSize ) );
} }
SfxWorkWindow* SfxFrame::GetWorkWindow_Impl() const SfxWorkWindow* SfxFrame::GetWorkWindow_Impl() const

3
sfx2/source/view/viewfrm.cxx
View File

@ -1168,8 +1168,7 @@ void SfxViewFrame::SetBorderPixelImpl
} }
else else
{ {
Point aPoint; tools::Rectangle aEditArea( Point(), GetWindow().GetOutputSizePixel() );
tools::Rectangle aEditArea( aPoint, GetWindow().GetOutputSizePixel() );
aEditArea.AdjustLeft(rBorder.Left() ); aEditArea.AdjustLeft(rBorder.Left() );
aEditArea.AdjustRight( -(rBorder.Right()) ); aEditArea.AdjustRight( -(rBorder.Right()) );
aEditArea.AdjustTop(rBorder.Top() ); aEditArea.AdjustTop(rBorder.Top() );

3
slideshow/source/engine/shapes/gdimtftools.cxx
View File

@ -140,11 +140,10 @@ public:
{ {
// wrap bitmap into GDIMetafile // wrap bitmap into GDIMetafile
GDIMetaFileSharedPtr xMtf(new GDIMetaFile); GDIMetaFileSharedPtr xMtf(new GDIMetaFile);
::Point aEmptyPoint;
::BitmapEx aBmpEx( aGraphic.GetBitmapEx() ); ::BitmapEx aBmpEx( aGraphic.GetBitmapEx() );
xMtf->AddAction( new MetaBmpExAction( aEmptyPoint, xMtf->AddAction( new MetaBmpExAction( Point(),
aBmpEx ) ); aBmpEx ) );
xMtf->SetPrefSize( aBmpEx.GetPrefSize() ); xMtf->SetPrefSize( aBmpEx.GetPrefSize() );
xMtf->SetPrefMapMode( aBmpEx.GetPrefMapMode() ); xMtf->SetPrefMapMode( aBmpEx.GetPrefMapMode() );

3
starmath/source/edit.cxx
View File

@ -554,8 +554,7 @@ IMPL_LINK( SmEditWindow, ScrollHdl, ScrollBar *, /*pScrollBar*/, void )
tools::Rectangle SmEditWindow::AdjustScrollBars() tools::Rectangle SmEditWindow::AdjustScrollBars()
{ {
const Size aOut( GetOutputSizePixel() ); const Size aOut( GetOutputSizePixel() );
Point aPoint; tools::Rectangle aRect( Point(), aOut );
tools::Rectangle aRect( aPoint, aOut );
if (pVScrollBar && pHScrollBar && pScrollBox) if (pVScrollBar && pHScrollBar && pScrollBox)
{ {

3
starmath/source/rect.cxx
View File

@ -73,8 +73,7 @@ bool SmGetGlyphBoundRect(const vcl::RenderContext &rDev,
pGlyphDev->SetFont(aFnt); pGlyphDev->SetFont(aFnt);
long nTextWidth = rDev.GetTextWidth(rText); long nTextWidth = rDev.GetTextWidth(rText);
Point aPoint; tools::Rectangle aResult (Point(), Size(nTextWidth, rDev.GetTextHeight())),
tools::Rectangle aResult (aPoint, Size(nTextWidth, rDev.GetTextHeight())),
aTmp; aTmp;
bool bSuccess = pGlyphDev->GetTextBoundRect(aTmp, rText); bool bSuccess = pGlyphDev->GetTextBoundRect(aTmp, rText);

3
starmath/source/unomodel.cxx
View File

@ -1015,8 +1015,7 @@ void SAL_CALL SmModel::render(
aPrtPageOffset = Point( static_cast<long>(aPrtPaperSize.Width() * 0.0250), aPrtPageOffset = Point( static_cast<long>(aPrtPaperSize.Width() * 0.0250),
static_cast<long>(aPrtPaperSize.Height() * 0.0214)); static_cast<long>(aPrtPaperSize.Height() * 0.0214));
} }
Point aZeroPoint; tools::Rectangle OutputRect( Point(), aOutputSize );
tools::Rectangle OutputRect( aZeroPoint, aOutputSize );
// set minimum top and bottom border // set minimum top and bottom border

6
starmath/source/view.cxx
View File

@ -809,8 +809,7 @@ IMPL_LINK_NOARG( SmCmdBoxWindow, InitialFocusTimerHdl, Timer *, void )
void SmCmdBoxWindow::AdjustPosition() void SmCmdBoxWindow::AdjustPosition()
{ {
Point aPt; const tools::Rectangle aRect( Point(), GetParent()->GetOutputSizePixel() );
const tools::Rectangle aRect( aPt, GetParent()->GetOutputSizePixel() );
Point aTopLeft( Point( aRect.Left(), Point aTopLeft( Point( aRect.Left(),
aRect.Bottom() - GetSizePixel().Height() ) ); aRect.Bottom() - GetSizePixel().Height() ) );
Point aPos( GetParent()->OutputToScreenPixel( aTopLeft ) ); Point aPos( GetParent()->OutputToScreenPixel( aTopLeft ) );
@ -2021,8 +2020,7 @@ void SmViewShell::ZoomByItemSet(const SfxItemSet *pSet)
{ {
const MapMode aMap( MapUnit::Map100thMM ); const MapMode aMap( MapUnit::Map100thMM );
SfxPrinter *pPrinter = GetPrinter( true ); SfxPrinter *pPrinter = GetPrinter( true );
Point aPoint; tools::Rectangle OutputRect(Point(), pPrinter->GetOutputSize());
tools::Rectangle OutputRect(aPoint, pPrinter->GetOutputSize());
Size OutputSize(pPrinter->LogicToPixel(Size(OutputRect.GetWidth(), Size OutputSize(pPrinter->LogicToPixel(Size(OutputRect.GetWidth(),
OutputRect.GetHeight()), aMap)); OutputRect.GetHeight()), aMap));
Size GraphicSize(pPrinter->LogicToPixel(GetDoc()->GetSize(), aMap)); Size GraphicSize(pPrinter->LogicToPixel(GetDoc()->GetSize(), aMap));

3
svtools/source/contnr/ivctrl.cxx
View File

@ -349,8 +349,7 @@ void SvtIconChoiceCtrl::SetBackground( const Wallpaper& rPaper )
WallpaperStyle eStyle = aBackground.GetStyle(); WallpaperStyle eStyle = aBackground.GetStyle();
Color aBack( aBackground.GetColor()); Color aBack( aBackground.GetColor());
Color aTrans( COL_TRANSPARENT ); if( aBack == COL_TRANSPARENT &&
if( aBack == aTrans &&
(!aBackground.IsBitmap() || (!aBackground.IsBitmap() ||
aBackground.GetBitmap().IsTransparent() || aBackground.GetBitmap().IsTransparent() ||
(eStyle != WallpaperStyle::Tile && eStyle != WallpaperStyle::Scale)) ) (eStyle != WallpaperStyle::Tile && eStyle != WallpaperStyle::Scale)) )

3
svtools/source/contnr/svtabbx.cxx
View File

@ -1143,8 +1143,7 @@ Reference< XAccessible > SvHeaderTabListBox::CreateAccessible()
tools::Rectangle SvHeaderTabListBox::GetFieldCharacterBounds(sal_Int32,sal_Int32,sal_Int32) tools::Rectangle SvHeaderTabListBox::GetFieldCharacterBounds(sal_Int32,sal_Int32,sal_Int32)
{ {
tools::Rectangle aRect; return tools::Rectangle();
return aRect;
} }
sal_Int32 SvHeaderTabListBox::GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) sal_Int32 SvHeaderTabListBox::GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint)

3
svtools/source/contnr/treelistbox.cxx
View File

@ -3472,8 +3472,7 @@ void SvTreeListBox::EnableAsyncDrag( bool b )
SvTreeListEntry* SvTreeListBox::GetFirstEntryInView() const SvTreeListEntry* SvTreeListBox::GetFirstEntryInView() const
{ {
Point aPos; return GetEntry( Point() );
return GetEntry( aPos );
} }
SvTreeListEntry* SvTreeListBox::GetNextEntryInView(SvTreeListEntry* pEntry ) const SvTreeListEntry* SvTreeListBox::GetNextEntryInView(SvTreeListEntry* pEntry ) const

4
svtools/source/control/calendar.cxx
View File

@ -220,7 +220,7 @@ void Calendar::ImplFormat()
if ( (aOutSize.Width() <= 1) || (aOutSize.Height() <= 1) ) if ( (aOutSize.Width() <= 1) || (aOutSize.Height() <= 1) )
return; return;
OUString a99Text("99"); OUString const a99Text("99");
vcl::Font aOldFont = GetFont(); vcl::Font aOldFont = GetFont();
@ -1577,7 +1577,7 @@ void Calendar::EndSelection()
Size Calendar::CalcWindowSizePixel() const Size Calendar::CalcWindowSizePixel() const
{ {
OUString a99Text("99"); OUString const a99Text("99");
vcl::Font aOldFont = GetFont(); vcl::Font aOldFont = GetFont();
Size aSize; Size aSize;

3
svtools/source/control/toolbarmenuacc.cxx
View File

@ -762,8 +762,7 @@ awt::Rectangle SAL_CALL ToolbarMenuEntryAcc::getBounds()
if( mpParent ) if( mpParent )
{ {
tools::Rectangle aRect( mpParent->maRect ); tools::Rectangle aRect( mpParent->maRect );
Point aOrigin; tools::Rectangle aParentRect( Point(), mpParent->mrMenu.GetOutputSizePixel() );
tools::Rectangle aParentRect( aOrigin, mpParent->mrMenu.GetOutputSizePixel() );
aRect.Intersection( aParentRect ); aRect.Intersection( aParentRect );

3
svtools/source/control/valueacc.cxx
View File

@ -951,8 +951,7 @@ awt::Rectangle SAL_CALL ValueItemAcc::getBounds()
if( mpParent ) if( mpParent )
{ {
tools::Rectangle aRect( mpParent->mrParent.GetItemRect(mpParent->mnId) ); tools::Rectangle aRect( mpParent->mrParent.GetItemRect(mpParent->mnId) );
Point aOrigin; tools::Rectangle aParentRect( Point(), mpParent->mrParent.GetOutputSizePixel() );
tools::Rectangle aParentRect( aOrigin, mpParent->mrParent.GetOutputSizePixel() );
aRect.Intersection( aParentRect ); aRect.Intersection( aParentRect );

3
svtools/source/graphic/grfmgr2.cxx
View File

@ -921,8 +921,7 @@ bool GraphicManager::ImplCreateOutput( OutputDevice* pOutputDevice,
// calculate output sizes // calculate output sizes
if( !pBmpEx ) if( !pBmpEx )
{ {
Point aPt; tools::Rectangle aOutRect( Point(), pOutputDevice->GetOutputSizePixel() );
tools::Rectangle aOutRect( aPt, pOutputDevice->GetOutputSizePixel() );
tools::Rectangle aBmpRect( aOutputPointPix, aOutputSizePix ); tools::Rectangle aBmpRect( aOutputPointPix, aOutputSizePix );
if( pOutputDevice->GetOutDevType() == OUTDEV_WINDOW ) if( pOutputDevice->GetOutDevType() == OUTDEV_WINDOW )

6
svtools/source/hatchwindow/ipwin.cxx
View File

@ -109,10 +109,8 @@ void SvResizeHelper::Draw(vcl::RenderContext& rRenderContext)
{ {
rRenderContext.Push(); rRenderContext.Push();
rRenderContext.SetMapMode( MapMode() ); rRenderContext.SetMapMode( MapMode() );
Color aColBlack;
Color aFillColor( COL_LIGHTGRAY );
rRenderContext.SetFillColor( aFillColor ); rRenderContext.SetFillColor( COL_LIGHTGRAY );
rRenderContext.SetLineColor(); rRenderContext.SetLineColor();
tools::Rectangle aMoveRects[ 4 ]; tools::Rectangle aMoveRects[ 4 ];
@ -121,7 +119,7 @@ void SvResizeHelper::Draw(vcl::RenderContext& rRenderContext)
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
rRenderContext.DrawRect(aMoveRects[i]); rRenderContext.DrawRect(aMoveRects[i]);
// draw handles // draw handles
rRenderContext.SetFillColor(aColBlack); rRenderContext.SetFillColor(Color()); // black
tools::Rectangle aRects[ 8 ]; tools::Rectangle aRects[ 8 ];
FillHandleRectsPixel(aRects); FillHandleRectsPixel(aRects);
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)

2
svtools/source/misc/langhelp.cxx
View File

@ -115,7 +115,7 @@ OUString getInstalledLocaleForSystemUILanguage(const css::uno::Sequence<OUString
{ {
// Get the list of langpacks that this build was configured to include // Get the list of langpacks that this build was configured to include
std::vector<OUString> aPackages; std::vector<OUString> aPackages;
OUString sAvailableLocales(WITH_LANG); OUString const sAvailableLocales(WITH_LANG);
std::vector<OUString> aAvailable; std::vector<OUString> aAvailable;
sal_Int32 nIndex = 0; sal_Int32 nIndex = 0;
do do

3
svx/source/accessibility/charmapacc.cxx
View File

@ -738,8 +738,7 @@ awt::Rectangle SvxShowCharSetItemAcc::implGetBounds( )
if( mpParent ) if( mpParent )
{ {
tools::Rectangle aRect( mpParent->maRect ); tools::Rectangle aRect( mpParent->maRect );
Point aOrigin; tools::Rectangle aParentRect( Point(), mpParent->mrParent.GetOutputSizePixel() );
tools::Rectangle aParentRect( aOrigin, mpParent->mrParent.GetOutputSizePixel() );
aRect.Intersection( aParentRect ); aRect.Intersection( aParentRect );

3
svx/source/dialog/connctrl.cxx
View File

@ -134,8 +134,7 @@ void SvxXConnectionPreview::AdaptSize()
aDisplayMap.SetOrigin( aNewPos ); aDisplayMap.SetOrigin( aNewPos );
SetMapMode( aDisplayMap ); SetMapMode( aDisplayMap );
Point aPos; MouseEvent aMEvt( Point(), 1, MouseEventModifiers::NONE, MOUSE_RIGHT );
MouseEvent aMEvt( aPos, 1, MouseEventModifiers::NONE, MOUSE_RIGHT );
MouseButtonDown( aMEvt ); MouseButtonDown( aMEvt );
} }

3
svx/source/dialog/contwnd.cxx
View File

@ -174,8 +174,7 @@ void ContourWindow::MouseMove( const MouseEvent& rMEvt )
void ContourWindow::MouseButtonUp(const MouseEvent& rMEvt) void ContourWindow::MouseButtonUp(const MouseEvent& rMEvt)
{ {
Point aTmpPoint; const tools::Rectangle aGraphRect( Point(), GetGraphicSize() );
const tools::Rectangle aGraphRect( aTmpPoint, GetGraphicSize() );
const Point aLogPt( PixelToLogic( rMEvt.GetPosPixel() ) ); const Point aLogPt( PixelToLogic( rMEvt.GetPosPixel() ) );
bClickValid = aGraphRect.IsInside( aLogPt ); bClickValid = aGraphRect.IsInside( aLogPt );

3
svx/source/dialog/imapwnd.cxx
View File

@ -182,8 +182,7 @@ void IMapWindow::SetTargetList( TargetList& rTargetList )
SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj ) SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj )
{ {
Point aPoint; tools::Rectangle aClipRect( Point(), GetGraphicSize() );
tools::Rectangle aClipRect( aPoint, GetGraphicSize() );
SdrObject* pSdrObj = nullptr; SdrObject* pSdrObj = nullptr;
IMapObjectPtr pCloneIMapObj; IMapObjectPtr pCloneIMapObj;

3
svx/source/sidebar/line/LineWidthValueSet.cxx
View File

@ -129,11 +129,10 @@ void LineWidthValueSet::UserDraw( const UserDrawEvent& rUDEvt )
{ {
if( nSelItem == nItemId ) if( nSelItem == nItemId )
{ {
Color aBackColor(50,107,197);
tools::Rectangle aBackRect = aRect; tools::Rectangle aBackRect = aRect;
aBackRect.AdjustTop(3 ); aBackRect.AdjustTop(3 );
aBackRect.AdjustBottom( -2 ); aBackRect.AdjustBottom( -2 );
pDev->SetFillColor(aBackColor); pDev->SetFillColor(Color(50,107,197));
pDev->DrawRect(aBackRect); pDev->DrawRect(aBackRect);
} }
else else

3
svx/source/svdraw/svdhdl.cxx
View File

@ -585,7 +585,6 @@ void SdrHdl::CreateB2dIAObject()
float fScalingFactor = rOutDev.GetDPIScaleFactor(); float fScalingFactor = rOutDev.GetDPIScaleFactor();
basegfx::B2DSize aB2DSize(fSize * fScalingFactor, fSize * fScalingFactor); basegfx::B2DSize aB2DSize(fSize * fScalingFactor, fSize * fScalingFactor);
Color aHandleStrokeColor(COL_BLACK);
Color aHandleFillColor(COL_LIGHTGREEN); Color aHandleFillColor(COL_LIGHTGREEN);
switch (eColIndex) switch (eColIndex)
{ {
@ -607,7 +606,7 @@ void SdrHdl::CreateB2dIAObject()
default: default:
break; break;
} }
pNewOverlayObject = new sdr::overlay::OverlayHandle(aPosition, aB2DSize, aHandleStrokeColor, aHandleFillColor); pNewOverlayObject = new sdr::overlay::OverlayHandle(aPosition, aB2DSize, /*HandleStrokeColor*/COL_BLACK, aHandleFillColor);
} }
else else
{ {

3
svx/source/svdraw/svdoashp.cxx
View File

@ -2957,13 +2957,12 @@ void SdrObjCustomShape::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix,
} }
// build and set BaseRect (use scale) // build and set BaseRect (use scale)
Point aPoint;
Size aSize(FRound(aScale.getX()), FRound(aScale.getY())); Size aSize(FRound(aScale.getX()), FRound(aScale.getY()));
// fdo#47434 We need a valid rectangle here // fdo#47434 We need a valid rectangle here
if( !aSize.Height() ) aSize.setHeight( 1 ); if( !aSize.Height() ) aSize.setHeight( 1 );
if( !aSize.Width() ) aSize.setWidth( 1 ); if( !aSize.Width() ) aSize.setWidth( 1 );
tools::Rectangle aBaseRect(aPoint, aSize); tools::Rectangle aBaseRect(Point(), aSize);
SetSnapRect(aBaseRect); SetSnapRect(aBaseRect);
// shear? // shear?

3
svx/source/svdraw/svdotext.cxx
View File

@ -1204,9 +1204,8 @@ void SdrTextObj::ImpInitDrawOutliner( SdrOutliner& rOutl ) const
EEControlBits nStat=rOutl.GetControlWord(); EEControlBits nStat=rOutl.GetControlWord();
nStat &= ~EEControlBits(EEControlBits::STRETCHING|EEControlBits::AUTOPAGESIZE); nStat &= ~EEControlBits(EEControlBits::STRETCHING|EEControlBits::AUTOPAGESIZE);
rOutl.SetControlWord(nStat); rOutl.SetControlWord(nStat);
Size aNullSize;
Size aMaxSize(100000,100000); Size aMaxSize(100000,100000);
rOutl.SetMinAutoPaperSize(aNullSize); rOutl.SetMinAutoPaperSize(Size());
rOutl.SetMaxAutoPaperSize(aMaxSize); rOutl.SetMaxAutoPaperSize(aMaxSize);
rOutl.SetPaperSize(aMaxSize); rOutl.SetPaperSize(aMaxSize);
rOutl.ClearPolygon(); rOutl.ClearPolygon();

3
svx/source/svdraw/svdoutl.cxx
View File

@ -56,9 +56,8 @@ void SdrOutliner::SetTextObj( const SdrTextObj* pObj )
nStat &= ~EEControlBits( EEControlBits::STRETCHING | EEControlBits::AUTOPAGESIZE ); nStat &= ~EEControlBits( EEControlBits::STRETCHING | EEControlBits::AUTOPAGESIZE );
SetControlWord(nStat); SetControlWord(nStat);
Size aNullSize;
Size aMaxSize( 100000,100000 ); Size aMaxSize( 100000,100000 );
SetMinAutoPaperSize( aNullSize ); SetMinAutoPaperSize( Size() );
SetMaxAutoPaperSize( aMaxSize ); SetMaxAutoPaperSize( aMaxSize );
SetPaperSize( aMaxSize ); SetPaperSize( aMaxSize );
ClearPolygon(); ClearPolygon();

3
svx/source/table/svdotable.cxx
View File

@ -1393,10 +1393,9 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, too
SdrTextVertAdjust eVAdj=xCell->GetTextVerticalAdjust(); SdrTextVertAdjust eVAdj=xCell->GetTextVerticalAdjust();
EEControlBits nStat0=rOutliner.GetControlWord(); EEControlBits nStat0=rOutliner.GetControlWord();
Size aNullSize;
nStat0 |= EEControlBits::AUTOPAGESIZE; nStat0 |= EEControlBits::AUTOPAGESIZE;
rOutliner.SetControlWord(nStat0); rOutliner.SetControlWord(nStat0);
rOutliner.SetMinAutoPaperSize(aNullSize); rOutliner.SetMinAutoPaperSize(Size());
rOutliner.SetMaxAutoPaperSize(aAnkRect.GetSize()); rOutliner.SetMaxAutoPaperSize(aAnkRect.GetSize());
rOutliner.SetPaperSize(aAnkRect.GetSize()); rOutliner.SetPaperSize(aAnkRect.GetSize());

7
svx/source/uitest/sdrobject.cxx
View File

@ -148,14 +148,11 @@ void SdrUIObject::execute(const OUString& rAction,
} }
else if (rAction == "Mirror") else if (rAction == "Mirror")
{ {
Point aPos; pObj->Mirror(Point(), Point());
Point aPos2;
pObj->Mirror(aPos, aPos2);
} }
else if (rAction == "SHEAR") else if (rAction == "SHEAR")
{ {
Point aPos; pObj->Shear(Point(), 0.0/*nAngle*/, 0, false);
pObj->Shear(aPos, 0.0/*nAngle*/, 0, false);
} }
} }

3
svx/source/xml/xmlgrhlp.cxx
View File

@ -1060,9 +1060,8 @@ OUString SAL_CALL SvXMLGraphicHelper::saveGraphicByName(css::uno::Reference<css:
OUString SAL_CALL SvXMLGraphicHelper::saveGraphic(css::uno::Reference<css::graphic::XGraphic> const & rxGraphic) OUString SAL_CALL SvXMLGraphicHelper::saveGraphic(css::uno::Reference<css::graphic::XGraphic> const & rxGraphic)
{ {
OUString aEmpty;
OUString aOutMimeType; OUString aOutMimeType;
return implSaveGraphic(rxGraphic, aOutMimeType, aEmpty); return implSaveGraphic(rxGraphic, aOutMimeType, OUString());
} }
OUString SvXMLGraphicHelper::implSaveGraphic(css::uno::Reference<css::graphic::XGraphic> const & rxGraphic, OUString SvXMLGraphicHelper::implSaveGraphic(css::uno::Reference<css::graphic::XGraphic> const & rxGraphic,

3
svx/source/xoutdev/_xoutbmp.cxx
View File

@ -532,8 +532,7 @@ tools::Polygon XOutBitmap::GetContour( const Bitmap& rBmp, const XOutFlags nFlag
{ {
Bitmap aWorkBmp; Bitmap aWorkBmp;
tools::Polygon aRetPoly; tools::Polygon aRetPoly;
Point aTmpPoint; tools::Rectangle aWorkRect( Point(), rBmp.GetSizePixel() );
tools::Rectangle aWorkRect( aTmpPoint, rBmp.GetSizePixel() );
if( pWorkRectPixel ) if( pWorkRectPixel )
aWorkRect.Intersection( *pWorkRectPixel ); aWorkRect.Intersection( *pWorkRectPixel );

3
sw/source/core/access/acccontext.cxx
View File

@ -1369,9 +1369,8 @@ bool SwAccessibleContext::Select( SwPaM *pPaM, SdrObject *pObj,
{ {
if( pFEShell ) if( pFEShell )
{ {
Point aDummy;
sal_uInt8 nFlags = bAdd ? SW_ADD_SELECT : 0; sal_uInt8 nFlags = bAdd ? SW_ADD_SELECT : 0;
pFEShell->SelectObj( aDummy, nFlags, pObj ); pFEShell->SelectObj( Point(), nFlags, pObj );
bRet = true; bRet = true;
} }
} }

9
sw/source/core/doc/DocumentStylePoolManager.cxx
View File

@ -1504,8 +1504,7 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool( sal_uInt16 nId )
case RES_POOLCHR_INET_NORMAL: case RES_POOLCHR_INET_NORMAL:
{ {
Color aCol( COL_BLUE ); aSet.Put( SvxColorItem( COL_BLUE, RES_CHRATR_COLOR ) );
aSet.Put( SvxColorItem( aCol, RES_CHRATR_COLOR ) );
aSet.Put( SvxUnderlineItem( LINESTYLE_SINGLE, RES_CHRATR_UNDERLINE ) ); aSet.Put( SvxUnderlineItem( LINESTYLE_SINGLE, RES_CHRATR_UNDERLINE ) );
// i40133: patch submitted by rail: set language to 'none' to prevent spell checking: // i40133: patch submitted by rail: set language to 'none' to prevent spell checking:
aSet.Put( SvxLanguageItem( LANGUAGE_NONE, RES_CHRATR_LANGUAGE ) ); aSet.Put( SvxLanguageItem( LANGUAGE_NONE, RES_CHRATR_LANGUAGE ) );
@ -1515,8 +1514,7 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool( sal_uInt16 nId )
break; break;
case RES_POOLCHR_INET_VISIT: case RES_POOLCHR_INET_VISIT:
{ {
Color aCol( COL_RED ); aSet.Put( SvxColorItem( COL_RED, RES_CHRATR_COLOR ) );
aSet.Put( SvxColorItem( aCol, RES_CHRATR_COLOR ) );
aSet.Put( SvxUnderlineItem( LINESTYLE_SINGLE, RES_CHRATR_UNDERLINE ) ); aSet.Put( SvxUnderlineItem( LINESTYLE_SINGLE, RES_CHRATR_UNDERLINE ) );
aSet.Put( SvxLanguageItem( LANGUAGE_NONE, RES_CHRATR_LANGUAGE ) ); aSet.Put( SvxLanguageItem( LANGUAGE_NONE, RES_CHRATR_LANGUAGE ) );
aSet.Put( SvxLanguageItem( LANGUAGE_NONE, RES_CHRATR_CJK_LANGUAGE ) ); aSet.Put( SvxLanguageItem( LANGUAGE_NONE, RES_CHRATR_CJK_LANGUAGE ) );
@ -1525,8 +1523,7 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool( sal_uInt16 nId )
break; break;
case RES_POOLCHR_JUMPEDIT: case RES_POOLCHR_JUMPEDIT:
{ {
Color aCol( COL_CYAN ); aSet.Put( SvxColorItem( COL_CYAN, RES_CHRATR_COLOR ) );
aSet.Put( SvxColorItem( aCol, RES_CHRATR_COLOR ) );
aSet.Put( SvxUnderlineItem( LINESTYLE_DOTTED, RES_CHRATR_UNDERLINE ) ); aSet.Put( SvxUnderlineItem( LINESTYLE_DOTTED, RES_CHRATR_UNDERLINE ) );
aSet.Put( SvxCaseMapItem( SvxCaseMap::SmallCaps, RES_CHRATR_CASEMAP ) ); aSet.Put( SvxCaseMapItem( SvxCaseMap::SmallCaps, RES_CHRATR_CASEMAP ) );
} }

3
sw/source/core/frmedt/fefly1.cxx
View File

@ -1116,8 +1116,7 @@ bool SwFEShell::SetDrawingAttr( SfxItemSet& rSet )
if( GetDoc()->SetFlyFrameAttr( *pFormat, rSet )) if( GetDoc()->SetFlyFrameAttr( *pFormat, rSet ))
{ {
bRet = true; bRet = true;
Point aTmp; SelectObj( Point(), 0, pObj );
SelectObj( aTmp, 0, pObj );
} }
EndAllActionAndCall(); EndAllActionAndCall();
EndUndo(); EndUndo();

4
sw/source/core/text/inftxt.cxx
View File

@ -993,12 +993,10 @@ void SwTextPaintInfo::DrawRedArrow( const SwLinePortion &rPor ) const
if ( GetTextFrame()->IsVertical() ) if ( GetTextFrame()->IsVertical() )
GetTextFrame()->SwitchHorizontalToVertical( aRect ); GetTextFrame()->SwitchHorizontalToVertical( aRect );
Color aCol( COL_LIGHTRED );
if( aRect.HasArea() ) if( aRect.HasArea() )
{ {
const sal_uInt8 nOptions = 0; const sal_uInt8 nOptions = 0;
lcl_DrawSpecial( *this, rPor, aRect, aCol, cChar, nOptions ); lcl_DrawSpecial( *this, rPor, aRect, COL_LIGHTRED, cChar, nOptions );
} }
} }

6
sw/source/core/txtnode/fntcap.cxx
View File

@ -134,8 +134,7 @@ Size SwSubFont::GetCapitalSize( SwDrawTextInfo& rInf )
// Start: // Start:
const long nOldKern = rInf.GetKern(); const long nOldKern = rInf.GetKern();
rInf.SetKern( CheckKerning() ); rInf.SetKern( CheckKerning() );
Point aPos; rInf.SetPos( Point() );
rInf.SetPos( aPos );
rInf.SetSpace( 0 ); rInf.SetSpace( 0 );
rInf.SetDrawSpace( false ); rInf.SetDrawSpace( false );
SwDoGetCapitalSize aDo( rInf ); SwDoGetCapitalSize aDo( rInf );
@ -377,8 +376,7 @@ sal_Int32 SwSubFont::GetCapitalCursorOfst( SwDrawTextInfo& rInf )
const long nOldKern = rInf.GetKern(); const long nOldKern = rInf.GetKern();
rInf.SetKern( CheckKerning() ); rInf.SetKern( CheckKerning() );
SwDoCapitalCursorOfst aDo( rInf, rInf.GetOfst() ); SwDoCapitalCursorOfst aDo( rInf, rInf.GetOfst() );
Point aPos; rInf.SetPos( Point() );
rInf.SetPos( aPos );
rInf.SetDrawSpace( false ); rInf.SetDrawSpace( false );
DoOnCapitals( aDo ); DoOnCapitals( aDo );
rInf.SetKern( nOldKern ); rInf.SetKern( nOldKern );

3
sw/source/filter/writer/wrtswtbl.cxx
View File

@ -193,8 +193,7 @@ void SwWriteTable::MergeBorders( const SvxBorderLine* pBorderLine,
{ {
if( sal_uInt32(-1) == m_nBorderColor ) if( sal_uInt32(-1) == m_nBorderColor )
{ {
Color aGrayColor( COL_GRAY ); if( !pBorderLine->GetColor().IsRGBEqual( COL_GRAY ) )
if( !pBorderLine->GetColor().IsRGBEqual( aGrayColor ) )
m_nBorderColor = pBorderLine->GetColor().GetColor(); m_nBorderColor = pBorderLine->GetColor().GetColor();
} }

2
sw/source/filter/ww8/wrtw8sty.cxx
View File

@ -674,7 +674,7 @@ void MSWordStyles::OutputStylesTable()
// and refuses to load .docx with more, even though the spec seems to allow that; // and refuses to load .docx with more, even though the spec seems to allow that;
// so simply if there are more styles, don't export those // so simply if there are more styles, don't export those
// Implementing check for all exports DOCX, DOC, RTF // Implementing check for all exports DOCX, DOC, RTF
sal_uInt16 nLimit = MSWORD_MAX_STYLES_LIMIT; sal_uInt16 const nLimit = MSWORD_MAX_STYLES_LIMIT;
m_nUsedSlots = std::min(nLimit, m_nUsedSlots); m_nUsedSlots = std::min(nLimit, m_nUsedSlots);
for ( n = 0; n < m_nUsedSlots; n++ ) for ( n = 0; n < m_nUsedSlots; n++ )

6
sw/source/filter/ww8/wrtww8gr.cxx
View File

@ -131,17 +131,15 @@ bool WW8Export::TestOleNeedsGraphic(const SwAttrSet& rSet,
{ {
// bGraphicNeeded set to true is right / fixes #i51670#. // bGraphicNeeded set to true is right / fixes #i51670#.
bGraphicNeeded = true; bGraphicNeeded = true;
Point aTmpPoint; tools::Rectangle aRect( Point(), Size( nX, nY ) );
tools::Rectangle aRect( aTmpPoint, Size( nX, nY ) );
Graphic aGraph(aWMF); Graphic aGraph(aWMF);
ErrCode nErr = ERRCODE_NONE; ErrCode nErr = ERRCODE_NONE;
tools::Rectangle aVisArea;
sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT; sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT;
if ( pOLENd ) if ( pOLENd )
nAspect = pOLENd->GetAspect(); nAspect = pOLENd->GetAspect();
SdrOle2Obj *pRet = SvxMSDffManager::CreateSdrOLEFromStorage( SdrOle2Obj *pRet = SvxMSDffManager::CreateSdrOLEFromStorage(
rStorageName,xObjStg,m_pDoc->GetDocStorage(),aGraph,aRect,aVisArea,nullptr,nErr,0,nAspect, m_pWriter->GetBaseURL()); rStorageName,xObjStg,m_pDoc->GetDocStorage(),aGraph,aRect,tools::Rectangle(),nullptr,nErr,0,nAspect, m_pWriter->GetBaseURL());
if (pRet) if (pRet)
{ {

3
sw/source/filter/ww8/ww8graf.cxx
View File

@ -1783,8 +1783,7 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject const * pSdrObj,
rFlySet.Put( aShadow ); rFlySet.Put( aShadow );
} }
Color Temp(COL_WHITE); SvxBrushItem aBrushItem(COL_WHITE, RES_BACKGROUND);
SvxBrushItem aBrushItem(Temp, RES_BACKGROUND);
bool bBrushItemOk = false; bool bBrushItemOk = false;
sal_uInt8 nTrans = 0; sal_uInt8 nTrans = 0;

3
sw/source/filter/ww8/ww8graf2.cxx
View File

@ -561,10 +561,9 @@ SwFrameFormat* SwWW8ImplReader::ImportGraf(SdrTextObj const * pTextObj,
m_pDataStream->SeekRel( nNameLen ); m_pDataStream->SeekRel( nNameLen );
} }
tools::Rectangle aChildRect;
tools::Rectangle aClientRect( 0,0, aPD.nWidth, aPD.nHeight); tools::Rectangle aClientRect( 0,0, aPD.nWidth, aPD.nHeight);
SvxMSDffImportData aData( aClientRect ); SvxMSDffImportData aData( aClientRect );
pObject = m_xMSDffManager->ImportObj(*m_pDataStream, &aData, aClientRect, aChildRect, /*nCalledByGroup*/0, /*pShapeId*/nullptr ); pObject = m_xMSDffManager->ImportObj(*m_pDataStream, &aData, aClientRect, tools::Rectangle(), /*nCalledByGroup*/0, /*pShapeId*/nullptr );
if (pObject) if (pObject)
{ {
// for the frame // for the frame

2
sw/source/uibase/dialog/SignatureLineDialog.cxx
View File

@ -179,7 +179,7 @@ void SignatureLineDialog::Apply()
OUString SignatureLineDialog::getSignatureImage() OUString SignatureLineDialog::getSignatureImage()
{ {
OUString svg( OUString const svg(
"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?><svg " "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?><svg "
"xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:cc=\"http://creativecommons.org/ns#\" " "xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:cc=\"http://creativecommons.org/ns#\" "
"xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\" " "xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\" "

3
sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
View File

@ -774,9 +774,8 @@ bool SwSpellDialogChildWindow::FindNextDrawTextError_Impl(SwWrtShell& rSh)
std::unique_ptr<OutlinerView> pOutlView( new OutlinerView( &aTmpOutliner, &(rView.GetEditWin()) ) ); std::unique_ptr<OutlinerView> pOutlView( new OutlinerView( &aTmpOutliner, &(rView.GetEditWin()) ) );
pOutlView->GetOutliner()->SetRefDevice( rSh.getIDocumentDeviceAccess().getPrinter( false ) ); pOutlView->GetOutliner()->SetRefDevice( rSh.getIDocumentDeviceAccess().getPrinter( false ) );
aTmpOutliner.InsertView( pOutlView.get() ); aTmpOutliner.InsertView( pOutlView.get() );
Point aPt;
Size aSize(1,1); Size aSize(1,1);
tools::Rectangle aRect( aPt, aSize ); tools::Rectangle aRect( Point(), aSize );
pOutlView->SetOutputArea( aRect ); pOutlView->SetOutputArea( aRect );
aTmpOutliner.SetText( *pParaObj ); aTmpOutliner.SetText( *pParaObj );
aTmpOutliner.ClearModifyFlag(); aTmpOutliner.ClearModifyFlag();

3
sw/source/uibase/docvw/edtdd.cxx
View File

@ -338,8 +338,7 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt )
// If the cursor is near the inner boundary // If the cursor is near the inner boundary
// we attempt to scroll towards the desired direction. // we attempt to scroll towards the desired direction.
Point aPoint; tools::Rectangle aWin(Point(), GetOutputSizePixel());
tools::Rectangle aWin(aPoint,GetOutputSizePixel());
const int nMargin = 10; const int nMargin = 10;
aWin.AdjustLeft(nMargin ); aWin.AdjustLeft(nMargin );
aWin.AdjustTop(nMargin ); aWin.AdjustTop(nMargin );

3
sw/source/uibase/shells/annotsh.cxx
View File

@ -602,9 +602,8 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
aNewAttr.Put(*pNewItem); aNewAttr.Put(*pNewItem);
} }
tools::Rectangle aNullRect;
tools::Rectangle aOutRect = pOLV->GetOutputArea(); tools::Rectangle aOutRect = pOLV->GetOutputArea();
if (aNullRect != aOutRect) if (tools::Rectangle() != aOutRect)
pOLV->SetAttribs(aNewAttr); pOLV->SetAttribs(aNewAttr);
rView.GetViewFrame()->GetBindings().InvalidateAll(false); rView.GetViewFrame()->GetBindings().InvalidateAll(false);

3
sw/source/uibase/shells/drwtxtsh.cxx
View File

@ -160,11 +160,10 @@ void SwDrawTextShell::StateDisableItems( SfxItemSet &rSet )
void SwDrawTextShell::SetAttrToMarked(const SfxItemSet& rAttr) void SwDrawTextShell::SetAttrToMarked(const SfxItemSet& rAttr)
{ {
tools::Rectangle aNullRect;
OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView(); OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView();
tools::Rectangle aOutRect = pOLV->GetOutputArea(); tools::Rectangle aOutRect = pOLV->GetOutputArea();
if (aNullRect != aOutRect) if (tools::Rectangle() != aOutRect)
{ {
GetShell().GetDrawView()->SetAttributes(rAttr); GetShell().GetDrawView()->SetAttributes(rAttr);
} }

2
sw/source/uibase/uiview/view.cxx
View File

@ -1648,7 +1648,7 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
break; break;
case SfxHintId::RedlineChanged: case SfxHintId::RedlineChanged:
{ {
sal_uInt16 aSlotRedLine[] = { static sal_uInt16 const aSlotRedLine[] = {
FN_REDLINE_NEXT_CHANGE, FN_REDLINE_NEXT_CHANGE,
FN_REDLINE_PREV_CHANGE, FN_REDLINE_PREV_CHANGE,
FN_REDLINE_ACCEPT_DIRECT, FN_REDLINE_ACCEPT_DIRECT,

3
sw/source/uibase/utlui/content.cxx
View File

@ -3575,8 +3575,7 @@ void SwContentLBoxString::Paint(const Point& rPos, SvTreeListBox& rDev, vcl::Ren
{ {
vcl::Font aOldFont(rRenderContext.GetFont()); vcl::Font aOldFont(rRenderContext.GetFont());
vcl::Font aFont(aOldFont); vcl::Font aFont(aOldFont);
Color aCol(COL_LIGHTGRAY); aFont.SetColor(COL_LIGHTGRAY);
aFont.SetColor(aCol);
rRenderContext.SetFont(aFont ); rRenderContext.SetFont(aFont );
rRenderContext.DrawText(rPos, GetText()); rRenderContext.DrawText(rPos, GetText());
rRenderContext.SetFont(aOldFont); rRenderContext.SetFont(aOldFont);

3
sw/source/uibase/utlui/glbltree.cxx
View File

@ -1258,8 +1258,7 @@ void SwLBoxString::Paint(const Point& rPos, SvTreeListBox& rDev, vcl::RenderCont
rRenderContext.Push(PushFlags::FONT); rRenderContext.Push(PushFlags::FONT);
vcl::Font aOldFont(rRenderContext.GetFont()); vcl::Font aOldFont(rRenderContext.GetFont());
vcl::Font aFont(rRenderContext.GetFont()); vcl::Font aFont(rRenderContext.GetFont());
Color aCol(COL_LIGHTRED); aFont.SetColor(COL_LIGHTRED);
aFont.SetColor(aCol);
rRenderContext.SetFont(aFont); rRenderContext.SetFont(aFont);
rRenderContext.DrawText(rPos, GetText()); rRenderContext.DrawText(rPos, GetText());
rRenderContext.Pop(); rRenderContext.Pop();

3
vcl/source/app/help.cxx
View File

@ -340,7 +340,6 @@ void HelpTextWindow::SetHelpText( const OUString& rHelpText )
} }
else // HELPWINSTYLE_BALLOON else // HELPWINSTYLE_BALLOON
{ {
Point aTmpPoint;
sal_Int32 nCharsInLine = 35 + ((maHelpText.getLength()/100)*5); sal_Int32 nCharsInLine = 35 + ((maHelpText.getLength()/100)*5);
// average width to have all windows consistent // average width to have all windows consistent
OUStringBuffer aBuf; OUStringBuffer aBuf;
@ -348,7 +347,7 @@ void HelpTextWindow::SetHelpText( const OUString& rHelpText )
OUString aXXX = aBuf.makeStringAndClear(); OUString aXXX = aBuf.makeStringAndClear();
long nWidth = GetTextWidth( aXXX ); long nWidth = GetTextWidth( aXXX );
Size aTmpSize( nWidth, 0x7FFFFFFF ); Size aTmpSize( nWidth, 0x7FFFFFFF );
tools::Rectangle aTry1( aTmpPoint, aTmpSize ); tools::Rectangle aTry1( Point(), aTmpSize );
DrawTextFlags nDrawFlags = DrawTextFlags::MultiLine | DrawTextFlags::WordBreak | DrawTextFlags nDrawFlags = DrawTextFlags::MultiLine | DrawTextFlags::WordBreak |
DrawTextFlags::Left | DrawTextFlags::Top; DrawTextFlags::Left | DrawTextFlags::Top;
if ( mnStyle & QuickHelpFlags::CtrlText ) if ( mnStyle & QuickHelpFlags::CtrlText )

9
vcl/source/control/button.cxx
View File

@ -750,8 +750,7 @@ void PushButton::ImplDrawPushButtonFrame(vcl::RenderContext& rRenderContext,
bool PushButton::ImplHitTestPushButton( vcl::Window const * pDev, bool PushButton::ImplHitTestPushButton( vcl::Window const * pDev,
const Point& rPos ) const Point& rPos )
{ {
Point aTempPoint; tools::Rectangle aTestRect( Point(), pDev->GetOutputSizePixel() );
tools::Rectangle aTestRect( aTempPoint, pDev->GetOutputSizePixel() );
return aTestRect.IsInside( rPos ); return aTestRect.IsInside( rPos );
} }
@ -934,9 +933,8 @@ void PushButton::ImplDrawPushButton(vcl::RenderContext& rRenderContext)
HideFocus(); HideFocus();
DrawButtonFlags nButtonStyle = ImplGetButtonState(); DrawButtonFlags nButtonStyle = ImplGetButtonState();
Point aPoint;
Size aOutSz(GetOutputSizePixel()); Size aOutSz(GetOutputSizePixel());
tools::Rectangle aRect(aPoint, aOutSz); tools::Rectangle aRect(Point(), aOutSz);
tools::Rectangle aInRect = aRect; tools::Rectangle aInRect = aRect;
bool bNativeOK = false; bool bNativeOK = false;
@ -1517,8 +1515,7 @@ bool PushButton::PreNotify( NotifyEvent& rNEvt )
if(aCtrlType == ControlType::Combobox) if(aCtrlType == ControlType::Combobox)
{ {
// only paint the button part to avoid flickering of the combobox text // only paint the button part to avoid flickering of the combobox text
Point aPt; tools::Rectangle aClipRect( Point(), GetOutputSizePixel() );
tools::Rectangle aClipRect( aPt, GetOutputSizePixel() );
aClipRect.SetPos(pBorder->ScreenToOutputPixel(OutputToScreenPixel(aClipRect.TopLeft()))); aClipRect.SetPos(pBorder->ScreenToOutputPixel(OutputToScreenPixel(aClipRect.TopLeft())));
pBorder->Invalidate( aClipRect ); pBorder->Invalidate( aClipRect );
} }

3
vcl/source/control/combobox.cxx
View File

@ -1002,11 +1002,10 @@ long ComboBox::getMaxWidthScrollBarAndDownButton() const
vcl::Window *pBorder = GetWindow( GetWindowType::Border ); vcl::Window *pBorder = GetWindow( GetWindowType::Border );
ImplControlValue aControlValue; ImplControlValue aControlValue;
Point aPoint;
tools::Rectangle aContent, aBound; tools::Rectangle aContent, aBound;
// use the full extent of the control // use the full extent of the control
tools::Rectangle aArea( aPoint, pBorder->GetOutputSizePixel() ); tools::Rectangle aArea( Point(), pBorder->GetOutputSizePixel() );
if ( GetNativeControlRegion(ControlType::Combobox, ControlPart::ButtonDown, if ( GetNativeControlRegion(ControlType::Combobox, ControlPart::ButtonDown,
aArea, ControlState::NONE, aControlValue, aBound, aContent) ) aArea, ControlState::NONE, aControlValue, aBound, aContent) )

6
vcl/source/control/edit.cxx
View File

@ -985,8 +985,7 @@ void Edit::ImplClearBackground(vcl::RenderContext& rRenderContext, const tools::
/* /*
* note: at this point the cursor must be switched off already * note: at this point the cursor must be switched off already
*/ */
Point aTmpPoint; tools::Rectangle aRect(Point(), GetOutputSizePixel());
tools::Rectangle aRect(aTmpPoint, GetOutputSizePixel());
aRect.SetLeft( nXStart ); aRect.SetLeft( nXStart );
aRect.SetRight( nXEnd ); aRect.SetRight( nXEnd );
@ -1007,8 +1006,7 @@ void Edit::ImplPaintBorder(vcl::RenderContext const & rRenderContext, long nXSta
if (SupportsDoubleBuffering()) if (SupportsDoubleBuffering())
return; return;
Point aTmpPoint; tools::Rectangle aRect(Point(), GetOutputSizePixel());
tools::Rectangle aRect(aTmpPoint, GetOutputSizePixel());
aRect.SetLeft( nXStart ); aRect.SetLeft( nXStart );
aRect.SetRight( nXEnd ); aRect.SetRight( nXEnd );

Some files were not shown because too many files have changed in this diff Show More