summaryrefslogtreecommitdiff
path: root/sw/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui')
-rw-r--r--sw/source/ui/docvw/HeaderFooterWin.cxx19
-rw-r--r--sw/source/ui/docvw/PageBreakWin.cxx17
-rw-r--r--sw/source/ui/shells/grfsh.cxx40
3 files changed, 32 insertions, 44 deletions
diff --git a/sw/source/ui/docvw/HeaderFooterWin.cxx b/sw/source/ui/docvw/HeaderFooterWin.cxx
index 6b96627f3005..82c663833284 100644
--- a/sw/source/ui/docvw/HeaderFooterWin.cxx
+++ b/sw/source/ui/docvw/HeaderFooterWin.cxx
@@ -74,7 +74,6 @@
using namespace basegfx;
using namespace basegfx::tools;
using namespace drawinglayer::attribute;
-using namespace drawinglayer::primitive2d;
namespace
{
@@ -265,7 +264,7 @@ bool SwHeaderFooterWin::Contains( const Point &rDocPt ) const
void SwHeaderFooterWin::Paint( const Rectangle& )
{
const Rectangle aRect( Rectangle( Point( 0, 0 ), PixelToLogic( GetSizePixel() ) ) );
- Primitive2DSequence aSeq( 3 );
+ drawinglayer::primitive2d::Primitive2DSequence aSeq( 3 );
B2DPolygon aPolygon = lcl_GetPolygon( aRect, m_bIsHeader );
@@ -282,7 +281,7 @@ void SwHeaderFooterWin::Paint( const Rectangle& )
aFillColor = rSettings.GetDialogColor( ).getBColor();
aLineColor = rSettings.GetDialogTextColor( ).getBColor();
- aSeq[0] = Primitive2DReference( new PolyPolygonColorPrimitive2D(
+ aSeq[0] = drawinglayer::primitive2d::Primitive2DReference( new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(
B2DPolyPolygon( aPolygon ), aFillColor ) );
}
else
@@ -293,17 +292,17 @@ void SwHeaderFooterWin::Paint( const Rectangle& )
nAngle = 0;
FillGradientAttribute aFillAttrs( GRADIENTSTYLE_LINEAR, 0.0, 0.0, 0.0, nAngle,
aLighterColor, aFillColor, 10 );
- aSeq[0] = Primitive2DReference( new FillGradientPrimitive2D(
+ aSeq[0] = drawinglayer::primitive2d::Primitive2DReference( new drawinglayer::primitive2d::FillGradientPrimitive2D(
aGradientRect, aFillAttrs ) );
}
// Create the border lines primitive
- aSeq[1] = Primitive2DReference( new PolygonHairlinePrimitive2D(
+ aSeq[1] = drawinglayer::primitive2d::Primitive2DReference( new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(
aPolygon, aLineColor ) );
// Create the text primitive
B2DVector aFontSize;
- FontAttribute aFontAttr = getFontAttributeFromVclFont(
+ FontAttribute aFontAttr = drawinglayer::primitive2d::getFontAttributeFromVclFont(
aFontSize, GetFont(), false, false );
Rectangle aTextRect;
@@ -317,7 +316,7 @@ void SwHeaderFooterWin::Paint( const Rectangle& )
aFontSize.getX(), aFontSize.getY(),
double( aTextPos.X() ), double( aTextPos.Y() ) ) );
- aSeq[2] = Primitive2DReference( new TextSimplePortionPrimitive2D(
+ aSeq[2] = drawinglayer::primitive2d::Primitive2DReference( new drawinglayer::primitive2d::TextSimplePortionPrimitive2D(
aTextMatrix,
String( m_sLabel ), 0, m_sLabel.getLength(),
std::vector< double >( ),
@@ -371,7 +370,7 @@ void SwHeaderFooterWin::Paint( const Rectangle& )
aSignColor = Color( COL_WHITE ).getBColor( );
aSeq.realloc( aSeq.getLength() + 1 );
- aSeq[ aSeq.getLength() - 1 ] = Primitive2DReference( new PolyPolygonColorPrimitive2D(
+ aSeq[ aSeq.getLength() - 1 ] = drawinglayer::primitive2d::Primitive2DReference( new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(
B2DPolyPolygon( aSign ), aSignColor ) );
// Create the processor and process the primitives
@@ -381,9 +380,9 @@ void SwHeaderFooterWin::Paint( const Rectangle& )
*this, aNewViewInfos );
// TODO Ghost it all if needed
- Primitive2DSequence aGhostedSeq( 1 );
+ drawinglayer::primitive2d::Primitive2DSequence aGhostedSeq( 1 );
double nFadeRate = double( m_nFadeRate ) / 100.0;
- aGhostedSeq[0] = Primitive2DReference( new ModifiedColorPrimitive2D(
+ aGhostedSeq[0] = drawinglayer::primitive2d::Primitive2DReference( new drawinglayer::primitive2d::ModifiedColorPrimitive2D(
aSeq, BColorModifier( Color( COL_WHITE ).getBColor(), 1.0 - nFadeRate, BCOLORMODIFYMODE_INTERPOLATE ) ) );
pProcessor->process( aGhostedSeq );
diff --git a/sw/source/ui/docvw/PageBreakWin.cxx b/sw/source/ui/docvw/PageBreakWin.cxx
index 56e42b47bc5e..f945467a3ff3 100644
--- a/sw/source/ui/docvw/PageBreakWin.cxx
+++ b/sw/source/ui/docvw/PageBreakWin.cxx
@@ -25,6 +25,7 @@
* in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
* instead of those above.
*/
+
#include <globals.hrc>
#include <popup.hrc>
#include <utlui.hrc>
@@ -53,18 +54,18 @@
#include <drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx>
#include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
+#include <drawinglayer/processor2d/processorfromoutputdevice.hxx>
#include <editeng/brkitem.hxx>
#include <sfx2/dispatch.hxx>
-#include <drawinglayer/processor2d/processorfromoutputdevice.hxx>
#include <vcl/svapp.hxx>
+
#define BUTTON_WIDTH 30
#define BUTTON_HEIGHT 19
#define ARROW_WIDTH 9
using namespace basegfx;
using namespace basegfx::tools;
-using namespace drawinglayer::primitive2d;
namespace
{
@@ -163,15 +164,15 @@ void SwPageBreakWin::Paint( const Rectangle& )
bool bRtl = Application::GetSettings().GetLayoutRTL();
- Primitive2DSequence aSeq( 3 );
+ drawinglayer::primitive2d::Primitive2DSequence aSeq( 3 );
B2DRectangle aBRect( double( aRect.Left() ), double( aRect.Top( ) ),
double( aRect.Right() ), double( aRect.Bottom( ) ) );
B2DPolygon aPolygon = createPolygonFromRect( aBRect, 3.0 / BUTTON_WIDTH, 3.0 / BUTTON_HEIGHT );
// Create the polygon primitives
- aSeq[0] = Primitive2DReference( new PolyPolygonColorPrimitive2D(
+ aSeq[0] = Primitive2DReference( new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(
B2DPolyPolygon( aPolygon ), aOtherColor ) );
- aSeq[1] = Primitive2DReference( new PolygonHairlinePrimitive2D(
+ aSeq[1] = Primitive2DReference( new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(
aPolygon, aColor ) );
// Create the primitive for the image
@@ -179,7 +180,7 @@ void SwPageBreakWin::Paint( const Rectangle& )
double nImgOfstX = 3.0;
if ( bRtl )
nImgOfstX = aRect.Right() - aImg.GetSizePixel().Width() - 3.0;
- aSeq[2] = Primitive2DReference( new DiscreteBitmapPrimitive2D(
+ aSeq[2] = Primitive2DReference( new drawinglayer::primitive2d::DiscreteBitmapPrimitive2D(
aImg.GetBitmapEx(), B2DPoint( nImgOfstX, 1.0 ) ) );
double nTop = double( aRect.getHeight() ) / 2.0;
@@ -200,12 +201,12 @@ void SwPageBreakWin::Paint( const Rectangle& )
aTriangleColor = Color( COL_WHITE ).getBColor( );
aSeq.realloc( aSeq.getLength() + 1 );
- aSeq[ aSeq.getLength() - 1 ] = Primitive2DReference( new PolyPolygonColorPrimitive2D(
+ aSeq[ aSeq.getLength() - 1 ] = Primitive2DReference( new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(
B2DPolyPolygon( aTriangle ), aTriangleColor ) );
Primitive2DSequence aGhostedSeq( 1 );
double nFadeRate = double( m_nFadeRate ) / 100.0;
- aGhostedSeq[0] = Primitive2DReference( new ModifiedColorPrimitive2D(
+ aGhostedSeq[0] = Primitive2DReference( new drawinglayer::primitive2d::ModifiedColorPrimitive2D(
aSeq, BColorModifier( Color( COL_WHITE ).getBColor(), 1.0 - nFadeRate, BCOLORMODIFYMODE_INTERPOLATE ) ) );
// Create the processor and process the primitives
diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx
index 20dd85f52a82..e9872370c616 100644
--- a/sw/source/ui/shells/grfsh.cxx
+++ b/sw/source/ui/shells/grfsh.cxx
@@ -1,30 +1,21 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 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/.
*
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
*
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * 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.
- *
- * 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 <cmdid.h>
#include <hintids.hxx>
@@ -535,9 +526,6 @@ void SwGrfShell::GetAttrState(SfxItemSet &rSet)
rSh.GetCurAttr( aCoreSet );
sal_Bool bParentCntProt = 0 != rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT );
sal_Bool bIsGrfCntnt = CNT_GRF == GetShell().GetCntType();
-// const GraphicObject* pGrfObj = ( bIsGrfCntnt ? rSh.GetGraphicObj() : NULL );
-// sal_Bool bIsRenderGraphicGrfCntnt = ( pGrfObj && pGrfObj->IsRenderGraphic() );
-
SetGetStateSet( &rSet );