summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2023-01-09 12:47:57 +0000
committerCaolán McNamara <caolanm@redhat.com>2023-02-01 19:31:49 +0000
commit0eaad910442a1bbb0c6a89a8887322ea3d6906e0 (patch)
treec03fc63172ced9ad29db4022f5008b28ae2d4bca /sfx2
parent9274d41bd72c5310491d81c6d8d938e44ed9d223 (diff)
Resolves: tdf#152845 AutoText preview not readable in high contrast mode
if its a high contrast mode with white text on black background. Reuse isOutputToWindow to distinguish between the case we are outputting to screen but not using a vcl::Window (and want to use the appropiate color for autocolor) vs the cases we are printing or exporting to pdf and not using a vcl::Window where the color should be black. Change-Id: Ib688892a6315fe88ba585613539088611d3995ad Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145234 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/doc/objembed.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/sfx2/source/doc/objembed.cxx b/sfx2/source/doc/objembed.cxx
index 91e886c8ac3c..f2e91cef821e 100644
--- a/sfx2/source/doc/objembed.cxx
+++ b/sfx2/source/doc/objembed.cxx
@@ -122,12 +122,12 @@ void SfxObjectShell::FillTransferableObjectDescriptor( TransferableObjectDescrip
rDesc.maDisplayName.clear();
}
-
void SfxObjectShell::DoDraw( OutputDevice* pDev,
const Point & rObjPos,
const Size & rSize,
const JobSetup & rSetup,
- sal_uInt16 nAspect )
+ sal_uInt16 nAspect,
+ bool bOutputForScreen )
{
if (!rSize.Width() || !rSize.Height())
return;
@@ -141,17 +141,17 @@ void SfxObjectShell::DoDraw( OutputDevice* pDev,
Fraction aXF( rSize.Width(), aSize.Width() );
Fraction aYF( rSize.Height(), aSize.Height() );
- DoDraw_Impl( pDev, rObjPos, aXF, aYF, rSetup, nAspect );
+ DoDraw_Impl(pDev, rObjPos, aXF, aYF, rSetup, nAspect, bOutputForScreen);
}
}
-
void SfxObjectShell::DoDraw_Impl( OutputDevice* pDev,
const Point & rViewPos,
const Fraction & rScaleX,
const Fraction & rScaleY,
const JobSetup & rSetup,
- sal_uInt16 nAspect )
+ sal_uInt16 nAspect,
+ bool bOutputForScreen )
{
tools::Rectangle aVisArea = GetVisArea( nAspect );
// MapUnit of the target
@@ -194,7 +194,7 @@ void SfxObjectShell::DoDraw_Impl( OutputDevice* pDev,
if( pMtf )
pMtf->Record( pDev );
- Draw( pDev, rSetup, nAspect );
+ Draw( pDev, rSetup, nAspect, bOutputForScreen );
// Restore Device settings
pDev->Pop();