summaryrefslogtreecommitdiff
path: root/sw/source/core/doc/notxtfrm.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core/doc/notxtfrm.cxx')
-rw-r--r--sw/source/core/doc/notxtfrm.cxx277
1 files changed, 208 insertions, 69 deletions
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index a3ae6922aefc..a62026c6c6a1 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -1,30 +1,21 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
+/*
+ * This file is part of the LibreOffice project.
*
- * This file is part of OpenOffice.org.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
+ * This file incorporates work covered by the following license notice:
*
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
#include <hintids.hxx>
#include <tools/urlobj.hxx>
@@ -75,9 +66,14 @@
#include <com/sun/star/embed/EmbedStates.hpp>
#include <svtools/embedhlp.hxx>
-#include <svtools/chartprettypainter.hxx>
+#include <svx/charthelper.hxx>
#include <dview.hxx> // #i99665#
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <drawinglayer/processor2d/processorfromoutputdevice.hxx>
+#include <drawinglayer/processor2d/baseprocessor2d.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
+
using namespace com::sun::star;
extern void ClrContourCache( const SdrObject *pObj ); // TxtFly.Cxx
@@ -774,6 +770,92 @@ static void lcl_correctlyAlignRect( SwRect& rAlignedGrfArea, const SwRect& rInAr
}
}
+bool paintUsingPrimitivesHelper(
+ OutputDevice& rOutputDevice,
+ const drawinglayer::primitive2d::Primitive2DSequence& rSequence,
+ const basegfx::B2DRange& rSourceRange,
+ const basegfx::B2DRange& rTargetRange,
+ const sal_Int32 nLeftCrop = 0,
+ const sal_Int32 nTopCrop = 0,
+ const sal_Int32 nRightCrop = 0,
+ const sal_Int32 nBottomCrop = 0,
+ const bool bMirrorX = false,
+ const bool bMirrorY = false)
+{
+ const double fSourceWidth(rSourceRange.getWidth());
+ const double fSourceHeight(rSourceRange.getHeight());
+
+ if(rSequence.hasElements() && !basegfx::fTools::equalZero(fSourceWidth) && !basegfx::fTools::equalZero(fSourceHeight))
+ {
+ // copy target range and apply evtl. cropping
+ basegfx::B2DRange aTargetRange(rTargetRange);
+
+ if(nLeftCrop || nTopCrop || nRightCrop || nBottomCrop)
+ {
+ // calculate original TargetRange
+ const double fFactor100thmmToTwips(72.0 / 127.0);
+
+ aTargetRange = basegfx::B2DRange(
+ aTargetRange.getMinX() - (nLeftCrop * fFactor100thmmToTwips),
+ aTargetRange.getMinY() - (nTopCrop * fFactor100thmmToTwips),
+ aTargetRange.getMaxX() + (nRightCrop * fFactor100thmmToTwips),
+ aTargetRange.getMaxY() + (nBottomCrop * fFactor100thmmToTwips));
+ }
+
+ const double fTargetWidth(aTargetRange.getWidth());
+ const double fTargetHeight(aTargetRange.getHeight());
+
+ if(!basegfx::fTools::equalZero(fTargetWidth) && !basegfx::fTools::equalZero(fTargetHeight))
+ {
+ // map graphic range to target range. This will automatically include
+ // tme mapping from Svg 1/100th mm content to twips since the target
+ // range is twips already
+ basegfx::B2DHomMatrix aMappingTransform(
+ basegfx::tools::createTranslateB2DHomMatrix(
+ -rSourceRange.getMinX(),
+ -rSourceRange.getMinY()));
+
+ aMappingTransform.scale(fTargetWidth / fSourceWidth, fTargetHeight / fSourceHeight);
+ aMappingTransform.translate(aTargetRange.getMinX(), aTargetRange.getMinY());
+
+ // apply mirrorings
+ if(bMirrorX || bMirrorY)
+ {
+ aMappingTransform.translate(-aTargetRange.getCenterX(), -aTargetRange.getCenterY());
+ aMappingTransform.scale(bMirrorX ? -1.0 : 1.0, bMirrorY ? -1.0 : 1.0); // #119176# small typo with X/Y
+ aMappingTransform.translate(aTargetRange.getCenterX(), aTargetRange.getCenterY());
+ }
+
+ // Fill ViewInformation. Use MappingTransform here, so there is no need to
+ // embed the primitives to it. Use original TargetRange here so there is also
+ // no need to embed the primitives to a MaskPrimitive for cropping. This works
+ // only in this case where the graphic object cannot be rotated, though.
+ const drawinglayer::geometry::ViewInformation2D aViewInformation2D(
+ aMappingTransform,
+ rOutputDevice.GetViewTransformation(),
+ aTargetRange,
+ 0,
+ 0.0,
+ uno::Sequence< beans::PropertyValue >());
+
+ // get a primitive processor for rendering
+ drawinglayer::processor2d::BaseProcessor2D* pProcessor2D =
+ drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice(
+ rOutputDevice, aViewInformation2D);
+
+ if(pProcessor2D)
+ {
+ // render and cleanup
+ pProcessor2D->process(rSequence);
+ delete pProcessor2D;
+ return true;
+ }
+ }
+ }
+
+ return false;
+}
+
// Paint the graphic.
// We require either a QuickDraw-Bitmap or a graphic here. If we do not have
// either, we return a replacement.
@@ -791,7 +873,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons
const sal_Bool bPrn = pOut == rNoTNd.getIDocumentDeviceAccess()->getPrinter( false ) ||
pOut->GetConnectMetaFile();
- const bool bIsChart = pOLENd && ChartPrettyPainter::IsChart( pOLENd->GetOLEObj().GetObject() );
+ const bool bIsChart = pOLENd && ChartHelper::IsChart( pOLENd->GetOLEObj().GetObject() );
// calculate aligned rectangle from parameter <rGrfArea>.
// Use aligned rectangle <aAlignedGrfArea> instead of <rGrfArea> in
@@ -902,9 +984,37 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons
0, GRFMGR_DRAW_STANDARD, pVout );
}
else
- rGrfObj.DrawWithPDFHandling( *pOut,
- aAlignedGrfArea.Pos(), aAlignedGrfArea.SSize(),
- &aGrfAttr );
+ {
+ const SvgDataPtr& rSvgDataPtr = rGrfObj.GetGraphic().getSvgData();
+ bool bDone(false);
+
+ if(rSvgDataPtr.get())
+ {
+ // Graphic is Svg and can be painted as primitives (vector graphic)
+ const basegfx::B2DRange aTargetRange(
+ aAlignedGrfArea.Left(), aAlignedGrfArea.Top(),
+ aAlignedGrfArea.Right(), aAlignedGrfArea.Bottom());
+ const bool bCropped(aGrfAttr.IsCropped());
+
+ bDone = paintUsingPrimitivesHelper(
+ *pOut,
+ rSvgDataPtr->getPrimitive2DSequence(),
+ rSvgDataPtr->getRange(),
+ aTargetRange,
+ bCropped ? aGrfAttr.GetLeftCrop() : 0,
+ bCropped ? aGrfAttr.GetTopCrop() : 0,
+ bCropped ? aGrfAttr.GetRightCrop() : 0,
+ bCropped ? aGrfAttr.GetBottomCrop() : 0,
+ aGrfAttr.GetMirrorFlags() & BMP_MIRROR_HORZ,
+ aGrfAttr.GetMirrorFlags() & BMP_MIRROR_VERT);
+ }
+
+ if(!bDone)
+ {
+ // fallback paint, uses replacement image
+ rGrfObj.DrawWithPDFHandling(*pOut, aAlignedGrfArea.Pos(), aAlignedGrfArea.SSize(), &aGrfAttr);
+ }
+ }
}
else
{
@@ -941,16 +1051,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons
if ( pShell->Imp()->GetDrawView()->IsAntiAliasing() )
pOut->SetAntialiasing( nFormerAntialiasingAtOutput );
}
- else if( bIsChart
- // Charts must be painted resolution dependent!! #i82893#, #i75867#
- && ChartPrettyPainter::ShouldPrettyPaintChartOnThisDevice( pOut )
- && svt::EmbeddedObjectRef::TryRunningState( pOLENd->GetOLEObj().GetOleRef() )
- && ChartPrettyPainter::DoPrettyPaintChart( uno::Reference< frame::XModel >(
- pOLENd->GetOLEObj().GetOleRef()->getComponent(), uno::UNO_QUERY), pOut, aAlignedGrfArea.SVRect() ) )
- {
- (void)(0);// all was done in if statement
- }
- else if( pOLENd )
+ else // bIsChart || pOLENd
{
// Fix for bug fdo#33781
const sal_uInt16 nFormerAntialiasingAtOutput( pOut->GetAntialiasing() );
@@ -966,49 +1067,87 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons
pOut->SetAntialiasing( nNewAntialiasingAtOutput );
}
- Point aPosition(aAlignedGrfArea.Pos());
- Size aSize(aAlignedGrfArea.SSize());
+ bool bDone(false);
- // We do not have a printer in the BrowseMode and thus no JobSetup, so we create one ...
- const JobSetup* pJobSetup = pOLENd->getIDocumentDeviceAccess()->getJobsetup();
- bool bDummyJobSetup = 0 == pJobSetup;
- if( bDummyJobSetup )
- pJobSetup = new JobSetup();
+ if(bIsChart)
+ {
+ const uno::Reference< frame::XModel > aXModel(pOLENd->GetOLEObj().GetOleRef()->getComponent(), uno::UNO_QUERY);
- // #i42323#
- //TODO/LATER: is it a problem that the JopSetup isn't used?
- //xRef->DoDraw( pOut, aAlignedGrfArea.Pos(), aAlignedGrfArea.SSize(), *pJobSetup );
+ if(aXModel.is())
+ {
+ basegfx::B2DRange aSourceRange;
- Graphic* pGraphic = pOLENd->GetGraphic();
+ const drawinglayer::primitive2d::Primitive2DSequence aSequence(
+ ChartHelper::tryToGetChartContentAsPrimitive2DSequence(
+ aXModel,
+ aSourceRange));
- if ( pGraphic && pGraphic->GetType() != GRAPHIC_NONE )
- {
- pGraphic->Draw( pOut, aPosition, aSize );
+ if(aSequence.hasElements() && !aSourceRange.isEmpty())
+ {
+ const basegfx::B2DRange aTargetRange(
+ aAlignedGrfArea.Left(), aAlignedGrfArea.Top(),
+ aAlignedGrfArea.Right(), aAlignedGrfArea.Bottom());
+
+ bDone = paintUsingPrimitivesHelper(
+ *pOut,
+ aSequence,
+ aSourceRange,
+ aTargetRange);
+ }
+ }
+ }
- // shade the representation if the object is activated outplace
- uno::Reference < embed::XEmbeddedObject > xObj = pOLENd->GetOLEObj().GetOleRef();
- if ( xObj.is() && xObj->getCurrentState() == embed::EmbedStates::ACTIVE )
+ if(!bDone && pOLENd)
+ {
+ Point aPosition(aAlignedGrfArea.Pos());
+ Size aSize(aAlignedGrfArea.SSize());
+
+ // Im BrowseModus gibt es nicht unbedingt einen Drucker und
+ // damit kein JobSetup, also legen wir eines an ...
+ const JobSetup* pJobSetup = pOLENd->getIDocumentDeviceAccess()->getJobsetup();
+ sal_Bool bDummyJobSetup = 0 == pJobSetup;
+ if( bDummyJobSetup )
+ pJobSetup = new JobSetup();
+
+ // #i42323#
+ // The reason for #114233# is gone, so i remove it again
+ //TODO/LATER: is it a problem that the JobSetup isn't used?
+ //xRef->DoDraw( pOut, aAlignedGrfArea.Pos(), aAlignedGrfArea.SSize(), *pJobSetup );
+
+ Graphic* pGraphic = pOLENd->GetGraphic();
+ if ( pGraphic && pGraphic->GetType() != GRAPHIC_NONE )
{
- ::svt::EmbeddedObjectRef::DrawShading( Rectangle( aPosition, aSize ), pOut );
+ pGraphic->Draw( pOut, aPosition, aSize );
+
+ // shade the representation if the object is activated outplace
+ uno::Reference < embed::XEmbeddedObject > xObj = pOLENd->GetOLEObj().GetOleRef();
+ if ( xObj.is() && xObj->getCurrentState() == embed::EmbedStates::ACTIVE )
+ {
+ ::svt::EmbeddedObjectRef::DrawShading( Rectangle( aPosition, aSize ), pOut );
+ }
}
- }
- else
- ::svt::EmbeddedObjectRef::DrawPaintReplacement( Rectangle( aPosition, aSize ), pOLENd->GetOLEObj().GetCurrentPersistName(), pOut );
+ else
+ ::svt::EmbeddedObjectRef::DrawPaintReplacement( Rectangle( aPosition, aSize ), pOLENd->GetOLEObj().GetCurrentPersistName(), pOut );
- if( bDummyJobSetup )
- delete pJobSetup; // ... and clean it up again
+ if( bDummyJobSetup )
+ delete pJobSetup;
- sal_Int64 nMiscStatus = pOLENd->GetOLEObj().GetOleRef()->getStatus( pOLENd->GetAspect() );
- if ( !bPrn && pShell->ISA( SwCrsrShell ) &&
- nMiscStatus & embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE )
- {
- const SwFlyFrm *pFly = FindFlyFrm();
- OSL_ENSURE( pFly, "OLE not in FlyFrm" );
- ((SwFEShell*)pShell)->ConnectObj( pOLENd->GetOLEObj().GetObject(), pFly->Prt(), pFly->Frm());
+ sal_Int64 nMiscStatus = pOLENd->GetOLEObj().GetOleRef()->getStatus( pOLENd->GetAspect() );
+ if ( !bPrn && pShell->ISA( SwCrsrShell ) &&
+ nMiscStatus & embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE )
+ {
+ const SwFlyFrm *pFly = FindFlyFrm();
+ assert( pFly != NULL );
+ ((SwFEShell*)pShell)->ConnectObj( pOLENd->GetOLEObj().GetObject(), pFly->Prt(), pFly->Frm());
+ }
}
- if ( pShell->Imp()->GetDrawView()->IsAntiAliasing() )
+ // see #i99665#
+ if ( pOLENd->IsChart() &&
+ pShell->Imp()->GetDrawView()->IsAntiAliasing() )
+ {
pOut->SetAntialiasing( nFormerAntialiasingAtOutput );
+ }
}
}