[Libreoffice-commits] .: 3 commits - binfilter/bf_svtools binfilter/bf_xmloff binfilter/filter binfilter/inc
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Mon Jan 31 03:41:19 PST 2011
binfilter/bf_svtools/source/config/svt_extendedsecurityoptions.cxx | 16
binfilter/bf_svtools/source/config/svt_moduleoptions.cxx | 21
binfilter/bf_svtools/source/config/svt_securityoptions.cxx | 34
binfilter/bf_svtools/source/config/svt_viewoptions.cxx | 11
binfilter/bf_svtools/source/filter.vcl/filter/svt_gradwrap.cxx | 577 ----------
binfilter/bf_xmloff/source/draw/ximpshap.hxx | 11
binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx | 39
binfilter/bf_xmloff/source/draw/xmloff_sdxmlimp.cxx | 21
binfilter/bf_xmloff/source/text/xmloff_XMLTrackedChangesImportContext.cxx | 10
binfilter/filter/source/bf_migrate/bf_migratefilter.cxx | 13
binfilter/inc/bf_svtools/gradwrap.hxx | 60 -
11 files changed, 17 insertions(+), 796 deletions(-)
New commits:
commit ef787e9c8bc849b85648f99b800a7157d3b73cee
Author: Kurosawa Takeshi <taken.spc at gmail.com>
Date: Sun Jan 30 17:47:11 2011 +0900
Remove GradientWrapper
These files are not compiled.
diff --git a/binfilter/bf_svtools/source/filter.vcl/filter/svt_gradwrap.cxx b/binfilter/bf_svtools/source/filter.vcl/filter/svt_gradwrap.cxx
deleted file mode 100644
index 75c94d9..0000000
--- a/binfilter/bf_svtools/source/filter.vcl/filter/svt_gradwrap.cxx
+++ /dev/null
@@ -1,577 +0,0 @@
-/* -*- 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 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-
-
-#include <math.h>
-#include <svgrad.hxx>
-#include <svbmpacc.hxx>
-#include <gradwrap.hxx>
-
-namespace binfilter
-{
-
-// -------------------
-// - GradientWrapper -
-// -------------------
-
-GradientWrapper::GradientWrapper(const Link& rDrawPolyRecordHdl,
- const Link& rDrawPolyPolyRecordHdl,
- const Link& rSetFillInBrushRecordHdl) :
- aDrawPolyRecordHdl (rDrawPolyRecordHdl),
- aDrawPolyPolyRecordHdl (rDrawPolyPolyRecordHdl),
- aSetFillInBrushRecordHdl(rSetFillInBrushRecordHdl)
-{
-}
-
-// ------------------------------------------------------------------------
-
-GradientWrapper::~GradientWrapper()
-{
-}
-
-// ------------------------------------------------------------------------
-
-void GradientWrapper::WriteLinearGradient(const Rectangle& rRect,
- const Gradient& rGradient)
-{
- USHORT nStepCount = 100;
-
- Rectangle aRect = rRect;
- aRect.Left()--;
- aRect.Top()--;
- aRect.Right()++;
- aRect.Bottom()++;
-
- // rotiertes BoundRect ausrechnen
- double fAngle = (rGradient.GetAngle() % 3600) * F_PI1800;
- double fWidth = aRect.GetWidth();
- double fHeight = aRect.GetHeight();
- double fDX = fWidth * fabs( cos( fAngle ) ) +
- fHeight * fabs( sin( fAngle ) );
- double fDY = fHeight * fabs( cos( fAngle ) ) +
- fWidth * fabs( sin( fAngle ) );
- fDX = (fDX - fWidth) * 0.5 + 0.5;
- fDY = (fDY - fHeight) * 0.5 + 0.5;
- aRect.Left() -= (long)fDX;
- aRect.Right() += (long)fDX;
- aRect.Top() -= (long)fDY;
- aRect.Bottom() += (long)fDY;
-
- // Rand berechnen und Rechteck neu setzen
- Point aCenter = rRect.Center();
- Rectangle aFullRect = aRect;
- long nBorder = (long)rGradient.GetBorder() * aRect.GetHeight() / 100;
- BOOL bLinear;
-
- // Rand berechnen und Rechteck neu setzen fuer linearen Farbverlauf
- if ( rGradient.GetStyle() == GRADIENT_LINEAR )
- {
- bLinear = TRUE;
- aRect.Top() += nBorder;
- }
- // Rand berechnen und Rechteck neu setzen fuer axiale Farbverlauf
- else
- {
- bLinear = FALSE;
- nBorder >>= 1;
-
- aRect.Top() += nBorder;
- aRect.Bottom() -= nBorder;
- }
-
- // Top darf nicht groesser als Bottom sein
- aRect.Top() = Min( aRect.Top(), (long)(aRect.Bottom() - 1) );
-
- long nMinRect = aRect.GetHeight();
-
- // Anzahl der Schritte berechnen, falls nichts uebergeben wurde
- if ( !nStepCount )
- {
- long nInc = ((nMinRect >> 9) + 1) << 3;
-
- if ( !nInc )
- nInc = 1;
-
- nStepCount = (USHORT)(nMinRect / nInc);
- }
- // minimal drei Schritte
- long nSteps = Max( nStepCount, (USHORT)3 );
-
- // Falls axialer Farbverlauf, muss die Schrittanzahl ungerade sein
- if ( !bLinear && !(nSteps & 1) )
- nSteps++;
-
- // Berechnung ueber Double-Addition wegen Genauigkeit
- double fScanLine = aRect.Top();
- double fScanInc = (double)aRect.GetHeight() / (double)nSteps;
-
- // Intensitaeten von Start- und Endfarbe ggf. aendern und
- // Farbschrittweiten berechnen
- long nFactor;
- const Color& rStartCol = rGradient.GetStartColor();
- const Color& rEndCol = rGradient.GetEndColor();
- long nRed = rStartCol.GetRed();
- long nGreen = rStartCol.GetGreen();
- long nBlue = rStartCol.GetBlue();
- long nEndRed = rEndCol.GetRed();
- long nEndGreen = rEndCol.GetGreen();
- long nEndBlue = rEndCol.GetBlue();
- nFactor = rGradient.GetStartIntensity();
- nRed = (nRed * nFactor) / 100;
- nGreen = (nGreen * nFactor) / 100;
- nBlue = (nBlue * nFactor) / 100;
- nFactor = rGradient.GetEndIntensity();
- nEndRed = (nEndRed * nFactor) / 100;
- nEndGreen = (nEndGreen * nFactor) / 100;
- nEndBlue = (nEndBlue * nFactor) / 100;
- long nStepRed = (nEndRed - nRed) / nSteps;
- long nStepGreen = (nEndGreen - nGreen) / nSteps;
- long nStepBlue = (nEndBlue - nBlue) / nSteps;
- long nSteps2;
-
- if ( bLinear )
- {
- // Um 1 erhoeht, um die Border innerhalb der Schleife
- // zeichnen zu koennen
- nSteps2 = nSteps + 1;
- }
- else
- {
- nStepRed <<= 1;
- nStepGreen <<= 1;
- nStepBlue <<= 1;
- nRed = nEndRed;
- nGreen = nEndGreen;
- nBlue = nEndBlue;
-
- // Um 2 erhoeht, um die Border innerhalb der Schleife
- // zeichnen zu koennen
- nSteps2 = nSteps + 2;
- }
- Color aCol( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue );
-
- // GDI-Objekte sichern und setzen
- aSetFillInBrushRecordHdl.Call(&aCol);
-
- // Startpolygon erzeugen (== Borderpolygon)
- Polygon aPoly( 4 );
- Polygon aTempPoly( 2 );
- aPoly[0] = aFullRect.TopLeft();
- aPoly[1] = aFullRect.TopRight();
- aPoly[2] = aRect.TopRight();
- aPoly[3] = aRect.TopLeft();
- aPoly.Rotate( aCenter, rGradient.GetAngle() );
-
- // Schleife, um rotierten Verlauf zu fuellen
- for ( long i = 0; i < nSteps2; i++ )
- {
- Polygon aTempPoly = aPoly;
- aTempPoly.Clip( rRect );
- aDrawPolyRecordHdl.Call(&aTempPoly);
- aTempPoly.SetSize( 2 );
-
- // neues Polygon berechnen
- aRect.Top() = (long)(fScanLine += fScanInc);
-
- // unteren Rand komplett fuellen
- if ( i == nSteps )
- {
- aTempPoly[0] = aFullRect.BottomLeft();
- aTempPoly[1] = aFullRect.BottomRight();
- }
- else
- {
- aTempPoly[0] = aRect.TopLeft();
- aTempPoly[1] = aRect.TopRight();
- }
- aTempPoly.Rotate( aCenter, rGradient.GetAngle() );
-
- aPoly[0] = aPoly[3];
- aPoly[1] = aPoly[2];
- aPoly[2] = aTempPoly[1];
- aPoly[3] = aTempPoly[0];
-
- // Farbintensitaeten aendern...
- // fuer lineare FV
- if ( bLinear )
- {
- nRed += nStepRed;
- nGreen += nStepGreen;
- nBlue += nStepBlue;
- }
- // fuer radiale FV
- else
- {
- if ( i <= (nSteps >> 1) )
- {
- nRed -= nStepRed;
- nGreen -= nStepGreen;
- nBlue -= nStepBlue;
- }
- // genau die Mitte und hoeher
- else
- {
- nRed += nStepRed;
- nGreen += nStepGreen;
- nBlue += nStepBlue;
- }
- }
-
- nRed = MinMax( nRed, 0, 255 );
- nGreen = MinMax( nGreen, 0, 255 );
- nBlue = MinMax( nBlue, 0, 255 );
-
- // fuer lineare FV ganz normale Bestimmung der Farbe
- if ( bLinear || (i <= nSteps) )
- {
- aCol = Color( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue );
- }
- // fuer axiale FV muss die letzte Farbe der ersten
- // Farbe entsprechen
- else
- {
- aCol = Color( (BYTE) nEndRed, (BYTE) nEndGreen, (BYTE) nEndBlue );
- }
-
- aSetFillInBrushRecordHdl.Call(&aCol);
- }
-}
-
-// ------------------------------------------------------------------------
-
-void GradientWrapper::WriteRadialGradient(const Rectangle& rRect,
- const Gradient& rGradient)
-{
- USHORT nStepCount = 100;
- Rectangle aClipRect = rRect;
- Rectangle aRect = rRect;
- long nZWidth = aRect.GetWidth() * (long)rGradient.GetOfsX() / 100;
- long nZHeight= aRect.GetHeight() * (long)rGradient.GetOfsY() / 100;
- Size aSize = aRect.GetSize();
- Point aCenter( aRect.Left() + nZWidth, aRect.Top() + nZHeight );
-
- // Radien-Berechnung fuer Kreisausgabe (Kreis schliesst Rechteck ein)
- if ( rGradient.GetStyle() == GRADIENT_RADIAL )
- {
- aSize.Width() = (long)(0.5 + sqrt((double)aSize.Width()*(double)aSize.Width() +
- (double)aSize.Height()*(double)aSize.Height()));
- aSize.Height() = aSize.Width();
- }
- // Radien-Berechnung fuer Ellipse
- else
- {
- aSize.Width() = (long)(0.5 + (double)aSize.Width() * 1.4142);
- aSize.Height() = (long)(0.5 + (double)aSize.Height() * 1.4142);
- }
-
- long nBorderX = (long)rGradient.GetBorder() * aSize.Width() / 100;
- long nBorderY = (long)rGradient.GetBorder() * aSize.Height() / 100;
- aSize.Width() -= nBorderX;
- aSize.Height() -= nBorderY;
- aRect.Left() = aCenter.X() - (aSize.Width() >> 1);
- aRect.Top() = aCenter.Y() - (aSize.Height() >> 1);
- aRect.SetSize( aSize );
-
- long nMinRect = Min( aRect.GetWidth(), aRect.GetHeight() );
-
- // Anzahl der Schritte berechnen, falls nichts uebergeben wurde
- if ( !nStepCount )
- {
- long nInc = ((nMinRect >> 9) + 1) << 3;
-
- if ( !nInc )
- nInc = 1;
-
- nStepCount = (USHORT)(nMinRect / nInc);
- }
- // minimal drei Schritte
- long nSteps = Max( nStepCount, (USHORT)3 );
-
- // Ausgabebegrenzungen und Schrittweite fuer jede Richtung festlegen
- double fScanLeft = aRect.Left();
- double fScanTop = aRect.Top();
- double fScanRight = aRect.Right();
- double fScanBottom = aRect.Bottom();
- double fScanInc = (double)nMinRect / (double)nSteps * 0.5;
-
- // Intensitaeten von Start- und Endfarbe ggf. aendern und
- // Farbschrittweiten berechnen
- long nFactor;
- const Color& rStartCol = rGradient.GetStartColor();
- const Color& rEndCol = rGradient.GetEndColor();
- long nRed = rStartCol.GetRed();
- long nGreen = rStartCol.GetGreen();
- long nBlue = rStartCol.GetBlue();
- long nEndRed = rEndCol.GetRed();
- long nEndGreen = rEndCol.GetGreen();
- long nEndBlue = rEndCol.GetBlue();
- nFactor = rGradient.GetStartIntensity();
- nRed = (nRed * nFactor) / 100;
- nGreen = (nGreen * nFactor) / 100;
- nBlue = (nBlue * nFactor) / 100;
- nFactor = rGradient.GetEndIntensity();
- nEndRed = (nEndRed * nFactor) / 100;
- nEndGreen = (nEndGreen * nFactor) / 100;
- nEndBlue = (nEndBlue * nFactor) / 100;
- long nStepRed = (nEndRed - nRed) / nSteps;
- long nStepGreen = (nEndGreen - nGreen) / nSteps;
- long nStepBlue = (nEndBlue - nBlue) / nSteps;
- Color aCol( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue );
-
- // GDI-Objekte sichern und setzen
- aSetFillInBrushRecordHdl.Call(&aCol);
-
- // Recteck erstmal ausgeben
- PolyPolygon aPolyPoly( 2 );
- Polygon aPoly( rRect );
-
- aPolyPoly.Insert( aPoly );
- aPoly = Polygon( aRect );
- aPoly.Rotate( aCenter, rGradient.GetAngle() );
- aPolyPoly.Insert( aPoly );
-
- // erstes Polygon zeichnen (entspricht Rechteck)
- PolyPolygon aTempPolyPoly = aPolyPoly;
- aTempPolyPoly.Clip( aClipRect );
- aDrawPolyPolyRecordHdl.Call(&aTempPolyPoly);
-
- for ( long i = 0; i < nSteps; i++ )
- {
- Color aCol( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue );
- aSetFillInBrushRecordHdl.Call(&aCol);
-
- // neues Polygon berechnen
- aRect.Left() = (long)(fScanLeft += fScanInc);
- aRect.Top() = (long)(fScanTop += fScanInc);
- aRect.Right() = (long)(fScanRight -= fScanInc);
- aRect.Bottom() = (long)(fScanBottom -= fScanInc);
-
- if ( (aRect.GetWidth() < 2) || (aRect.GetHeight() < 2) )
- break;
-
- aPoly = Polygon( aRect.Center(),
- aRect.GetWidth() >> 1, aRect.GetHeight() >> 1 );
- aPoly.Rotate( aCenter, rGradient.GetAngle() );
-
- aPolyPoly.Replace( aPolyPoly.GetObject( 1 ), 0 );
- aPolyPoly.Replace( aPoly, 1 );
-
- PolyPolygon aTempPolyPoly = aPolyPoly;
- aTempPolyPoly.Clip( aClipRect );
- aDrawPolyPolyRecordHdl.Call(&aTempPolyPoly);
-
- // Farbe entsprechend anpassen
- nRed += nStepRed;
- nGreen += nStepGreen;
- nBlue += nStepBlue;
-
- nRed = MinMax( nRed, 0, 0xFF );
- nGreen = MinMax( nGreen, 0, 0xFF );
- nBlue = MinMax( nBlue, 0, 0xFF );
- }
-
- // Falls PolyPolygon-Ausgabe, muessen wir noch ein letztes
- // inneres Polygon zeichnen
- aCol = Color( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue );
- aSetFillInBrushRecordHdl.Call(&aCol);
-
- aPoly = aPolyPoly.GetObject( 1 );
- if ( !aPoly.GetBoundRect().IsEmpty() )
- {
- aPoly.Clip( aClipRect );
- aDrawPolyRecordHdl.Call(&aPoly);
- }
-}
-
-// ------------------------------------------------------------------------
-
-void GradientWrapper::WriteRectGradient(const Rectangle& rRect,
- const Gradient& rGradient)
-{
- USHORT nStepCount = 100;
- Rectangle aClipRect = rRect;
- Rectangle aRect = rRect;
-
- aRect.Left()--;
- aRect.Top()--;
- aRect.Right()++;
- aRect.Bottom()++;
-
- // rotiertes BoundRect ausrechnen
- double fAngle = (rGradient.GetAngle() % 3600) * F_PI1800;
- double fWidth = aRect.GetWidth();
- double fHeight = aRect.GetHeight();
- double fDX = fWidth * fabs( cos( fAngle ) ) +
- fHeight * fabs( sin( fAngle ) );
- double fDY = fHeight * fabs( cos( fAngle ) ) +
- fWidth * fabs( sin( fAngle ) );
- fDX = (fDX - fWidth) * 0.5 + 0.5;
- fDY = (fDY - fHeight) * 0.5 + 0.5;
- aRect.Left() -= (long)fDX;
- aRect.Right() += (long)fDX;
- aRect.Top() -= (long)fDY;
- aRect.Bottom() += (long)fDY;
-
- // Quadratisch machen, wenn angefordert;
- Size aSize = aRect.GetSize();
- if ( rGradient.GetStyle() == GRADIENT_SQUARE )
- {
- if ( aSize.Width() > aSize.Height() )
- aSize.Height() = aSize.Width();
- else
- aSize.Width() = aSize.Height();
- }
-
- // neue Mittelpunkte berechnen
- long nZWidth = aRect.GetWidth() * (long)rGradient.GetOfsX() / 100;
- long nZHeight = aRect.GetHeight() * (long)rGradient.GetOfsY() / 100;
- long nBorderX = (long)rGradient.GetBorder() * aSize.Width() / 100;
- long nBorderY = (long)rGradient.GetBorder() * aSize.Height() / 100;
- Point aCenter( aRect.Left() + nZWidth, aRect.Top() + nZHeight );
-
- // Rand beruecksichtigen
- aSize.Width() -= nBorderX;
- aSize.Height() -= nBorderY;
-
- // Ausgaberechteck neu setzen
- aRect.Left() = aCenter.X() - (aSize.Width() >> 1);
- aRect.Top() = aCenter.Y() - (aSize.Height() >> 1);
- aRect.SetSize( aSize );
-
- long nMinRect = Min( aRect.GetWidth(), aRect.GetHeight() );
-
- // Anzahl der Schritte berechnen, falls nichts uebergeben wurde
- if ( !nStepCount )
- {
- long nInc = ((nMinRect >> 9) + 1) << 3;
-
- if ( !nInc )
- nInc = 1;
-
- nStepCount = (USHORT)(nMinRect / nInc);
- }
- // minimal drei Schritte
- long nSteps = Max( nStepCount, (USHORT)3 );
-
- // Ausgabebegrenzungen und Schrittweite fuer jede Richtung festlegen
- double fScanLeft = aRect.Left();
- double fScanTop = aRect.Top();
- double fScanRight = aRect.Right();
- double fScanBottom = aRect.Bottom();
- double fScanInc = (double)nMinRect / (double)nSteps * 0.5;
-
- // Intensitaeten von Start- und Endfarbe ggf. aendern und
- // Farbschrittweiten berechnen
- long nFactor;
- const Color& rStartCol = rGradient.GetStartColor();
- const Color& rEndCol = rGradient.GetEndColor();
- long nRed = rStartCol.GetRed();
- long nGreen = rStartCol.GetGreen();
- long nBlue = rStartCol.GetBlue();
- long nEndRed = rEndCol.GetRed();
- long nEndGreen = rEndCol.GetGreen();
- long nEndBlue = rEndCol.GetBlue();
- nFactor = rGradient.GetStartIntensity();
- nRed = (nRed * nFactor) / 100;
- nGreen = (nGreen * nFactor) / 100;
- nBlue = (nBlue * nFactor) / 100;
- nFactor = rGradient.GetEndIntensity();
- nEndRed = (nEndRed * nFactor) / 100;
- nEndGreen = (nEndGreen * nFactor) / 100;
- nEndBlue = (nEndBlue * nFactor) / 100;
- long nStepRed = (nEndRed - nRed) / nSteps;
- long nStepGreen = (nEndGreen - nGreen) / nSteps;
- long nStepBlue = (nEndBlue - nBlue) / nSteps;
- Color aCol( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue );
-
- // GDI-Objekte sichern und setzen
- aSetFillInBrushRecordHdl.Call(&aCol);
-
- // Recteck erstmal ausgeben
- PolyPolygon aPolyPoly( 2 );
- Polygon aPoly( rRect );
-
- aPolyPoly.Insert( aPoly );
- aPoly = Polygon( aRect );
- aPoly.Rotate( aCenter, rGradient.GetAngle() );
- aPolyPoly.Insert( aPoly );
-
- PolyPolygon aTempPolyPoly = aPolyPoly;
- aTempPolyPoly.Clip( aClipRect );
- aDrawPolyPolyRecordHdl.Call(&aTempPolyPoly);
-
- // Schleife, um nacheinander die Polygone/PolyPolygone auszugeben
- for ( long i = 0; i < nSteps; i++ )
- {
- Color aCol( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue );
- aSetFillInBrushRecordHdl.Call(&aCol);
-
- // neues Polygon berechnen
- aRect.Left() = (long)(fScanLeft += fScanInc);
- aRect.Top() = (long)(fScanTop += fScanInc);
- aRect.Right() = (long)(fScanRight -= fScanInc);
- aRect.Bottom() = (long)(fScanBottom-= fScanInc);
-
- if ( (aRect.GetWidth() < 2) || (aRect.GetHeight() < 2) )
- break;
-
- aPoly = Polygon( aRect );
- aPoly.Rotate( aCenter, rGradient.GetAngle() );
-
- aPolyPoly.Replace( aPolyPoly.GetObject( 1 ), 0 );
- aPolyPoly.Replace( aPoly, 1 );
-
- PolyPolygon aTempPolyPoly = aPolyPoly;
- aTempPolyPoly.Clip( aClipRect );
- aDrawPolyPolyRecordHdl.Call(&aTempPolyPoly);
-
- // Farben aendern
- nRed += nStepRed;
- nGreen += nStepGreen;
- nBlue += nStepBlue;
-
- nRed = MinMax( nRed, 0, 0xFF );
- nGreen = MinMax( nGreen, 0, 0xFF );
- nBlue = MinMax( nBlue, 0, 0xFF );
- }
-
- aCol = Color( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue );
- aSetFillInBrushRecordHdl.Call(&aCol);
-
- aPoly = aPolyPoly.GetObject( 1 );
- if ( !aPoly.GetBoundRect().IsEmpty() )
- {
- aPoly.Clip( aClipRect );
- aDrawPolyRecordHdl.Call(&aPoly);
- }
-}
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_svtools/gradwrap.hxx b/binfilter/inc/bf_svtools/gradwrap.hxx
deleted file mode 100644
index cf0bbe6..0000000
--- a/binfilter/inc/bf_svtools/gradwrap.hxx
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- 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 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.
- *
- ************************************************************************/
-
-
-#include <svgen.hxx>
-
-namespace binfilter
-{
-
-class GradientWrapper
-{
- Link aDrawPolyRecordHdl;
- Link aDrawPolyPolyRecordHdl;
- Link aSetFillInBrushRecordHdl;
-
- GradientWrapper() {};
-
-
-public:
- GradientWrapper(const Link& rDrawPolyRecordHdl,
- const Link& rDrawPolyPolyRecordHdl,
- const Link& rSetFillInBrushHdl);
- ~GradientWrapper();
-
-
- void WriteLinearGradient(const Rectangle& rRect,
- const Gradient& rGradient);
- void WriteRadialGradient(const Rectangle& rRect,
- const Gradient& rGradient);
- void WriteRectGradient(const Rectangle& rRect,
- const Gradient& rGradient);
-};
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit e89f2eb6f89c360e3abd5a3c3e3c5129afdfcb88
Author: Guillaume Fillol <guillaume.fillol at lello.fr>
Date: Sat Jan 29 00:14:19 2011 +0100
Easy hacks: remove double line spacing
diff --git a/binfilter/bf_xmloff/source/draw/ximpshap.hxx b/binfilter/bf_xmloff/source/draw/ximpshap.hxx
index 6001284..d5b5079 100644
--- a/binfilter/bf_xmloff/source/draw/ximpshap.hxx
+++ b/binfilter/bf_xmloff/source/draw/ximpshap.hxx
@@ -30,26 +30,17 @@
#define _XIMPSHAPE_HXX
#include <com/sun/star/io/XOutputStream.hpp>
-
#include <com/sun/star/document/XActionLockable.hpp>
-
#include <com/sun/star/container/XIdentifierContainer.hpp>
-
#include "xmlictxt.hxx"
-
#include "sdxmlimp_impl.hxx"
-
#include "nmspmap.hxx"
-
#include <com/sun/star/drawing/XShapes.hpp>
-
#include <com/sun/star/text/XTextCursor.hpp>
-
#include <com/sun/star/awt/Point.hpp>
-
#include <tools/rtti.hxx>
-
#include "xexptran.hxx"
+
namespace binfilter {
//////////////////////////////////////////////////////////////////////////////
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx b/binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx
index de2317a..9ed468c 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx
@@ -31,81 +31,44 @@
#endif
#include <com/sun/star/ucb/XAnyCompareFactory.hpp>
-
#include <com/sun/star/container/XIndexReplace.hpp>
-
#include <com/sun/star/drawing/LineStyle.hpp>
-
#include <com/sun/star/drawing/LineJoint.hpp>
-
#include <com/sun/star/drawing/FillStyle.hpp>
-
#include <com/sun/star/presentation/AnimationSpeed.hpp>
-
#include <com/sun/star/presentation/FadeEffect.hpp>
-
#include <com/sun/star/drawing/ConnectorType.hpp>
-
#include <com/sun/star/drawing/RectanglePoint.hpp>
-
#include <com/sun/star/drawing/CircleKind.hpp>
-
#include <com/sun/star/drawing/BitmapMode.hpp>
-
#include <com/sun/star/text/WritingMode.hpp>
-
#include <EnumPropertyHdl.hxx>
-
#include <NamedBoolPropertyHdl.hxx>
-
#include "numithdl.hxx"
-
#include "XMLBitmapRepeatOffsetPropertyHandler.hxx"
-
#include "XMLFillBitmapSizePropertyHandler.hxx"
-
#include "XMLBitmapLogicalSizePropertyHandler.hxx"
-
#include <com/sun/star/drawing/TextAnimationKind.hpp>
-
#include <com/sun/star/drawing/TextAnimationDirection.hpp>
-
#include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
-
#include <com/sun/star/drawing/TextVerticalAdjust.hpp>
-
#include <com/sun/star/drawing/TextFitToSizeType.hpp>
-
#include <com/sun/star/drawing/MeasureTextHorzPos.hpp>
-
#include <com/sun/star/drawing/MeasureTextVertPos.hpp>
-
#include "ControlBorderHandler.hxx"
-
-
#include "sdpropls.hxx"
-
#include "propimp0.hxx"
-
#include "xmlexp.hxx"
-
#include <xmlnmspe.hxx>
-
#include <com/sun/star/drawing/NormalsKind.hpp>
-
#include <com/sun/star/drawing/TextureProjectionMode.hpp>
-
#include <com/sun/star/drawing/TextureKind.hpp>
-
#include <com/sun/star/drawing/TextureMode.hpp>
-
#include "txtprmap.hxx"
-
#include "XMLClipPropertyHandler.hxx"
-
#include "XMLIsPercentagePropertyHandler.hxx"
-
#include "XMLPercentOrMeasurePropertyHandler.hxx"
+
namespace binfilter {
using namespace ::rtl;
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_sdxmlimp.cxx b/binfilter/bf_xmloff/source/draw/xmloff_sdxmlimp.cxx
index dd095da..95f5f8f 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_sdxmlimp.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_sdxmlimp.cxx
@@ -31,38 +31,19 @@
#endif
#include "xmlscripti.hxx"
-
-
-
#include "ximpbody.hxx"
-
#include "xmlmetai.hxx"
-
#include "ximpstyl.hxx"
-
#include "xmlnmspe.hxx"
-
-
#include "xmluconv.hxx"
-
#include "DocumentSettingsContext.hxx"
-
#include <com/sun/star/form/XFormsSupplier.hpp>
-
#include <com/sun/star/document/XDocumentInfoSupplier.hpp>
-
-
#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
-
#include <com/sun/star/drawing/XMasterPagesSupplier.hpp>
-
#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
-
-
-
#include "xmlerror.hxx"
-
namespace binfilter {
using namespace ::rtl;
@@ -956,7 +937,6 @@ OUString SAL_CALL SdXMLImport::getImplementationName() throw( uno::RuntimeExcept
if( IsDraw())
{
// Draw
-
switch( getImportFlags())
{
case IMPORT_ALL:
@@ -976,7 +956,6 @@ OUString SAL_CALL SdXMLImport::getImplementationName() throw( uno::RuntimeExcept
else
{
// Impress
-
switch( getImportFlags())
{
case IMPORT_ALL:
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLTrackedChangesImportContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLTrackedChangesImportContext.cxx
index 6dbb679..ebe446d 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLTrackedChangesImportContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLTrackedChangesImportContext.cxx
@@ -27,32 +27,22 @@
************************************************************************/
#include "XMLTrackedChangesImportContext.hxx"
-
#include "XMLChangedRegionImportContext.hxx"
-
#include <com/sun/star/uno/Reference.h>
-
#include <com/sun/star/uno/Sequence.h>
-
#include "xmlimp.hxx"
-
#include "xmlnmspe.hxx"
-
#include "nmspmap.hxx"
-
#include "xmluconv.hxx"
namespace binfilter {
-
using ::rtl::OUString;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::xml::sax::XAttributeList;
using namespace ::binfilter::xmloff::token;
-
-
TYPEINIT1( XMLTrackedChangesImportContext, SvXMLImportContext );
XMLTrackedChangesImportContext::XMLTrackedChangesImportContext(
commit 8130f14df00b58661bf176001353b949a1696065
Author: Christina Rossmanith <ChrRossmanith at web.de>
Date: Sun Jan 30 22:23:57 2011 +0100
Easy hacks: removed double line spacing
diff --git a/binfilter/bf_svtools/source/config/svt_extendedsecurityoptions.cxx b/binfilter/bf_svtools/source/config/svt_extendedsecurityoptions.cxx
index d0f40f0..54ff579 100644
--- a/binfilter/bf_svtools/source/config/svt_extendedsecurityoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_extendedsecurityoptions.cxx
@@ -34,27 +34,16 @@
//_________________________________________________________________________________________________________________
#include <bf_svtools/extendedsecurityoptions.hxx>
-
#include <unotools/configmgr.hxx>
-
#include <unotools/configitem.hxx>
-
#include <tools/debug.hxx>
-
#include <com/sun/star/uno/Any.hxx>
-
#include <com/sun/star/uno/Sequence.hxx>
-
#include <tools/urlobj.hxx>
-
#include <tools/wldcrd.hxx>
-
#include <rtl/ustrbuf.hxx>
-
#include <bf_svtools/pathoptions.hxx>
-
#include <hash_map>
-
#include <rtl/logfile.hxx>
#include "itemholder1.hxx"
@@ -75,14 +64,10 @@ namespace binfilter
//_________________________________________________________________________________________________________________
#define ROOTNODE_SECURITY OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Security"))
-
#define SECURE_EXTENSIONS_SET OUString(RTL_CONSTASCII_USTRINGPARAM("SecureExtensions"))
#define EXTENSION_PROPNAME OUString(RTL_CONSTASCII_USTRINGPARAM("/Extension"))
-
#define PROPERTYNAME_HYPERLINKS_OPEN OUString(RTL_CONSTASCII_USTRINGPARAM("Hyperlinks/Open"))
-
#define PROPERTYHANDLE_HYPERLINKS_OPEN 0
-
#define PROPERTYCOUNT 1
//_________________________________________________________________________________________________________________
@@ -201,7 +186,6 @@ class SvtExtendedSecurityOptions_Impl : public ConfigItem
private:
OUString m_aSecureExtensionsSetName;
OUString m_aExtensionPropName;
-
SvtExtendedSecurityOptions::OpenHyperlinkMode m_eOpenHyperlinkMode;
sal_Bool m_bROOpenHyperlinkMode;
ExtensionHashMap m_aExtensionHashMap;
diff --git a/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx b/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx
index 9fbcf51..1b450c2 100644
--- a/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx
@@ -28,42 +28,26 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-//_________________________________________________________________________________________________________________
+//_______________________________________________________________________
// includes
-//_________________________________________________________________________________________________________________
+//_______________________________________________________________________
#include <bf_svtools/moduleoptions.hxx>
-
#include <comphelper/sequenceashashmap.hxx>
-
#include <unotools/configmgr.hxx>
-
#include <unotools/configitem.hxx>
-
#include <unotools/processfactory.hxx>
-
#include <osl/diagnose.h>
-
#include <rtl/ustrbuf.hxx>
-
#include <rtl/logfile.hxx>
-
#include <com/sun/star/uno/Any.hxx>
-
#include <com/sun/star/uno/Sequence.hxx>
-
#include <com/sun/star/beans/PropertyValue.hpp>
-
#include <com/sun/star/container/XNameAccess.hpp>
-
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-
#include <com/sun/star/lang/XServiceInfo.hpp>
-
#include <com/sun/star/document/XTypeDetection.hpp>
-
#include <com/sun/star/util/XStringSubstitution.hpp>
-
#include "itemholder1.hxx"
//_________________________________________________________________________________________________________________
@@ -76,7 +60,6 @@ namespace css = ::com::sun::star;
namespace binfilter
{
-
//_________________________________________________________________________________________________________________
// const
//_________________________________________________________________________________________________________________
diff --git a/binfilter/bf_svtools/source/config/svt_securityoptions.cxx b/binfilter/bf_svtools/source/config/svt_securityoptions.cxx
index 478c7b5..7dc325e 100644
--- a/binfilter/bf_svtools/source/config/svt_securityoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_securityoptions.cxx
@@ -33,25 +33,15 @@
//_________________________________________________________________________________________________________________
#include <bf_svtools/securityoptions.hxx>
-
#include <unotools/configmgr.hxx>
-
#include <unotools/configitem.hxx>
-
#include <tools/debug.hxx>
-
#include <com/sun/star/uno/Any.hxx>
-
#include <com/sun/star/uno/Sequence.hxx>
-
#include <com/sun/star/beans/PropertyValue.hpp>
-
#include <tools/urlobj.hxx>
-
#include <tools/wldcrd.hxx>
-
#include <bf_svtools/pathoptions.hxx>
-
#include <rtl/logfile.hxx>
#include "itemholder1.hxx"
@@ -76,7 +66,7 @@ namespace binfilter
#define DEFAULT_SECLEVEL 3
#define DEFAULT_TRUSTEDAUTHORS Sequence< SvtSecurityOptions::Certificate >()
-// xmlsec05 depricated
+// xmlsec05 deprecated
#define DEFAULT_STAROFFICEBASIC eALWAYS_EXECUTE
#define CSTR_SECUREURL "SecureURL"
@@ -109,22 +99,22 @@ namespace binfilter
#define PROPERTYNAME_TRUSTEDAUTHOR_SERIALNUMBER OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_TRUSTEDAUTHOR_SERIALNUMBER))
#define PROPERTYNAME_TRUSTEDAUTHOR_RAWDATA OUString(RTL_CONSTASCII_USTRINGPARAM(CSTR_TRUSTEDAUTHOR_RAWDATA))
-// xmlsec05 depricated
+// xmlsec05 deprecated
#define PROPERTYNAME_STAROFFICEBASIC OUString(RTL_CONSTASCII_USTRINGPARAM("OfficeBasic" ))
#define PROPERTYNAME_EXECUTEPLUGINS OUString(RTL_CONSTASCII_USTRINGPARAM("ExecutePlugins" ))
#define PROPERTYNAME_WARNINGENABLED OUString(RTL_CONSTASCII_USTRINGPARAM("Warning" ))
#define PROPERTYNAME_CONFIRMATIONENABLED OUString(RTL_CONSTASCII_USTRINGPARAM("Confirmation" ))
-// xmlsec05 depricated
+// xmlsec05 deprecated
#define PROPERTYHANDLE_SECUREURL 0
-// xmlsec05 depricated
+// xmlsec05 deprecated
#define PROPERTYHANDLE_STAROFFICEBASIC 1
#define PROPERTYHANDLE_EXECUTEPLUGINS 2
#define PROPERTYHANDLE_WARNINGENABLED 3
#define PROPERTYHANDLE_CONFIRMATIONENABLED 4
-// xmlsec05 depricated
+// xmlsec05 deprecated
#define PROPERTYHANDLE_DOCWARN_SAVEORSEND 5
#define PROPERTYHANDLE_DOCWARN_SIGNING 6
@@ -250,7 +240,7 @@ private:
sal_Bool m_bRODisableMacros;
- // xmlsec05 depricated
+ // xmlsec05 deprecated
EBasicSecurityMode m_eBasicMode;
sal_Bool m_bExecutePlugins;
sal_Bool m_bWarning;
@@ -290,7 +280,7 @@ SvtSecurityOptions_Impl::SvtSecurityOptions_Impl()
,m_bROTrustedAuthors ( CFG_READONLY_DEFAULT )
,m_bRODisableMacros ( sal_True ) // currently is not intended to be changed
- // xmlsec05 depricated
+ // xmlsec05 deprecated
, m_eBasicMode ( DEFAULT_STAROFFICEBASIC )
, m_bExecutePlugins ( sal_True )
, m_bWarning ( sal_True )
@@ -299,7 +289,7 @@ SvtSecurityOptions_Impl::SvtSecurityOptions_Impl()
, m_bROWarning ( CFG_READONLY_DEFAULT )
, m_bROExecutePlugins ( CFG_READONLY_DEFAULT )
, m_bROBasicMode ( CFG_READONLY_DEFAULT )
- // xmlsec05 depricated
+ // xmlsec05 deprecated
{
Sequence< OUString > seqNames = GetPropertyNames ( );
@@ -522,7 +512,7 @@ sal_Int32 SvtSecurityOptions_Impl::GetHandle( const OUString& rName )
else if( rName.compareToAscii( CSTR_MACRO_DISABLE ) == 0 )
nHandle = PROPERTYHANDLE_MACRO_DISABLE;
- // xmlsec05 depricated
+ // xmlsec05 deprecated
else if( rName == PROPERTYNAME_STAROFFICEBASIC )
nHandle = PROPERTYHANDLE_STAROFFICEBASIC;
else if( rName == PROPERTYNAME_EXECUTEPLUGINS )
@@ -531,7 +521,7 @@ sal_Int32 SvtSecurityOptions_Impl::GetHandle( const OUString& rName )
nHandle = PROPERTYHANDLE_WARNINGENABLED;
else if( rName == PROPERTYNAME_CONFIRMATIONENABLED )
nHandle = PROPERTYHANDLE_CONFIRMATIONENABLED;
- // xmlsec05 depricated
+ // xmlsec05 deprecated
else
nHandle = PROPERTYHANDLE_INVALID;
@@ -699,7 +689,7 @@ void SvtSecurityOptions_Impl::Commit()
break;
- // xmlsec05 depricated
+ // xmlsec05 deprecated
case PROPERTYHANDLE_STAROFFICEBASIC:
{
bDone = !m_bROBasicMode;
@@ -728,7 +718,7 @@ void SvtSecurityOptions_Impl::Commit()
lValues[ nRealCount ] <<= m_bConfirmation;
}
break;
- // xmlsec05 depricated
+ // xmlsec05 deprecated
default:
diff --git a/binfilter/bf_svtools/source/config/svt_viewoptions.cxx b/binfilter/bf_svtools/source/config/svt_viewoptions.cxx
index 4088950..eb11c10 100644
--- a/binfilter/bf_svtools/source/config/svt_viewoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_viewoptions.cxx
@@ -33,27 +33,16 @@
//_________________________________________________________________________________________________________________
#include <bf_svtools/viewoptions.hxx>
-
#include <com/sun/star/uno/Any.hxx>
-
#include <hash_map>
-
#include <com/sun/star/beans/PropertyValue.hpp>
-
#include <com/sun/star/container/XNameContainer.hpp>
-
#include <com/sun/star/container/XNameAccess.hpp>
-
#include <com/sun/star/beans/XPropertySet.hpp>
-
#include <rtl/ustrbuf.hxx>
-
#include <unotools/configpathes.hxx>
-
#include <comphelper/configurationhelper.hxx>
-
#include <unotools/processfactory.hxx>
-
#include <itemholder1.hxx>
namespace binfilter
diff --git a/binfilter/filter/source/bf_migrate/bf_migratefilter.cxx b/binfilter/filter/source/bf_migrate/bf_migratefilter.cxx
index c201c03..e59f6a4 100644
--- a/binfilter/filter/source/bf_migrate/bf_migratefilter.cxx
+++ b/binfilter/filter/source/bf_migrate/bf_migratefilter.cxx
@@ -27,27 +27,16 @@
************************************************************************/
#include <bf_migratefilter.hxx>
-
#include <com/sun/star/util/XCloseable.hpp>
-
#include <com/sun/star/xml/sax/XParser.hpp>
-
#include <com/sun/star/frame/XStorable.hpp>
-
#include <com/sun/star/frame/XLoadable.hpp>
-
#include <com/sun/star/io/XSeekable.hpp>
-
#include <legacysmgr/legacy_binfilters_smgr.hxx>
-
#include <com/sun/star/task/XInteractionHandler.hpp>
-
#include <bf_sfx2/app.hxx>
-
#include <bf_sfx2/fcontnr.hxx>
-
#include <bf_sfx2/docfac.hxx>
-
#include <bf_so3/staticbaseurl.hxx>
namespace binfilter {
@@ -891,7 +880,7 @@ Sequence< OUString > SAL_CALL bf_MigrateFilter::getSupportedServiceNames()
return bf_MigrateFilter_getSupportedServiceNames();
}
-// eof
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list