summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
Diffstat (limited to 'svx')
-rw-r--r--svx/Library_svx.mk1
-rw-r--r--svx/source/engine3d/obj3d.cxx1
-rw-r--r--svx/source/inc/svdoimp.hxx105
-rw-r--r--svx/source/svdraw/impgrfll.cxx258
-rw-r--r--svx/source/svdraw/svdoattr.cxx1
-rw-r--r--svx/source/svdraw/svdobj.cxx1
-rw-r--r--svx/source/svdraw/svdocirc.cxx1
-rw-r--r--svx/source/svdraw/svdoedge.cxx1
-rw-r--r--svx/source/svdraw/svdomeas.cxx1
-rw-r--r--svx/source/svdraw/svdopath.cxx1
-rw-r--r--svx/source/svdraw/svdorect.cxx1
11 files changed, 0 insertions, 372 deletions
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index aba2265aea43..44b11513f1e5 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -184,7 +184,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/stbctrls/zoomctrl \
svx/source/svdraw/ActionDescriptionProvider \
svx/source/smarttags/SmartTagMgr \
- svx/source/svdraw/impgrfll \
svx/source/table/accessiblecell \
svx/source/table/accessibletableshape \
svx/source/table/celleditsource \
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index a31523b47ebd..68996657aa26 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -70,7 +70,6 @@
#include <svtools/colorcfg.hxx>
#include <editeng/eeitem.hxx>
#include <svx/xgrscit.hxx>
-#include "svdoimp.hxx"
#include <svx/sdr/properties/e3dproperties.hxx>
#include <svx/sdr/properties/e3dcompoundproperties.hxx>
#include <basegfx/polygon/b3dpolypolygontools.hxx>
diff --git a/svx/source/inc/svdoimp.hxx b/svx/source/inc/svdoimp.hxx
deleted file mode 100644
index 4f4187d7f272..000000000000
--- a/svx/source/inc/svdoimp.hxx
+++ /dev/null
@@ -1,105 +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.
- *
- ************************************************************************/
-
-#ifndef _SVX_SVDOIMP_HXX
-#define _SVX_SVDOIMP_HXX
-
-#include <vcl/mapmod.hxx>
-
-#include <svx/rectenum.hxx>
-
-
-class Bitmap;
-
-///////////////////////////////////////////////////////////////////////////////
-
-// #104609# Extracted from old XOutDev's ImpCalcBmpFillStartValues
-
-/** Calc offset and size for bitmap fill
-
- This method calculates the size and the offset from the left, top
- position of a shape in logical coordinates
-
- @param rStartOffset
- The offset from the left, top position of the output rectangle is returned
-
- @param rBmpOutputSize
- The output size of the bitmap is returned herein
-
- @param rOutputRect
- Specifies the output rectangle into which the bitmap should be tiled into
-
- @param rOutputMapMode
- Specifies the logical coordinate system the output rectangle is in
-
- @param rFillBitmap
- Specifies the bitmap to fill with
-
- @param rBmpSize
- The desired destination bitmap size. If null, size is taken from the bitmap
-
- @param rBmpPerCent
- Percentage of bitmap size, relative to the output rectangle
-
- @param rBmpOffPerCent
- Offset for bitmap tiling, in percentage relative to bitmap output size
-
- @param bBmpLogSize
- True when using the preferred bitmap size, False when using the percentage value
-
- @param bBmpTile
- True for tiling. False only paints one instance of the bitmap
-
- @param bBmpStretch
- True if bitmap should be stretched to output rect dimension
-
- @param eBmpRectPoint
- Position of the start point relative to the bitmap
-
- */
-void ImpCalcBmpFillSizes( Size& rStartOffset,
- Size& rBmpOutputSize,
- const Rectangle& rOutputRect,
- const MapMode& rOutputMapMode,
- const Bitmap& rFillBitmap,
- const Size& rBmpSize,
- const Size& rBmpPerCent,
- const Size& rBmpOffPerCent,
- sal_Bool bBmpLogSize,
- sal_Bool bBmpTile,
- sal_Bool bBmpStretch,
- RECT_POINT eBmpRectPoint );
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#endif // _SVX_SVDOIMP_HXX
-
-// eof
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/impgrfll.cxx b/svx/source/svdraw/impgrfll.cxx
deleted file mode 100644
index 55d221386d23..000000000000
--- a/svx/source/svdraw/impgrfll.cxx
+++ /dev/null
@@ -1,258 +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 "precompiled_svx.hxx"
-#include <svx/rectenum.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/outdev.hxx>
-#include <vcl/bitmap.hxx>
-
-///////////////////////////////////////////////////////////////////////////////
-
-void ImpCalcBmpFillSizes( Size& rStartOffset,
- Size& rBmpOutputSize,
- const Rectangle& rOutputRect,
- const MapMode& rOutputMapMode,
- const Bitmap& rFillBitmap,
- const Size& rBmpSize,
- const Size& rBmpPerCent,
- const Size& rBmpOffPerCent,
- sal_Bool bBmpLogSize,
- sal_Bool bBmpTile,
- sal_Bool bBmpStretch,
- RECT_POINT eBmpRectPoint )
-{
- sal_Bool bOriginalSize = sal_False, bScaleSize = sal_False;
-
- // Falls keine Groessen gegeben sind ( z.B. alte Dokumente )
- // berechnen wir uns die Groesse selber aus der Bitmap
- // ==> altes Verhalten;
- // wenn nur eine Groesse gegeben ist, wird die andere
- // Groesse angepasst berechnet
- if( bBmpLogSize )
- {
- if( !rBmpSize.Width() && !rBmpSize.Height() )
- bOriginalSize = sal_True;
- else if( !rBmpSize.Width() || !rBmpSize.Height() )
- bScaleSize = sal_True;
- }
- else
- {
- if( !rBmpPerCent.Width() && !rBmpPerCent.Height() )
- bOriginalSize = sal_True;
- else if( !rBmpPerCent.Width() || !rBmpPerCent.Height() )
- bScaleSize = sal_True;
- }
-
- // entweder Originalgroesse oder angepasste Groesse
- if( bOriginalSize || bScaleSize )
- {
- MapMode aBmpPrefMapMode( rFillBitmap.GetPrefMapMode() );
- Size aBmpPrefSize( rFillBitmap.GetPrefSize() );
-
- // Falls keine gesetzt ist, nehmen wir Pixel
- if( !aBmpPrefSize.Width() || !aBmpPrefSize.Height() )
- {
- aBmpPrefSize = rFillBitmap.GetSizePixel();
- aBmpPrefMapMode = MAP_PIXEL;
- }
-
- if( bOriginalSize )
- {
- if( MAP_PIXEL == aBmpPrefMapMode.GetMapUnit() )
- rBmpOutputSize = Application::GetDefaultDevice()->PixelToLogic( aBmpPrefSize, rOutputMapMode );
- else
- rBmpOutputSize = OutputDevice::LogicToLogic( aBmpPrefSize, aBmpPrefMapMode, rOutputMapMode );
- }
- else
- {
- if( bBmpLogSize )
- {
- rBmpOutputSize = rBmpSize;
-
- if( !rBmpSize.Width() )
- rBmpOutputSize.Width() = basegfx::fround( (double) rBmpSize.Height() * aBmpPrefSize.Width() / aBmpPrefSize.Height() );
- else
- rBmpOutputSize.Height() = basegfx::fround( (double) rBmpSize.Width() * aBmpPrefSize.Height() / aBmpPrefSize.Width() );
- }
- else
- {
- if( !rBmpPerCent.Width() )
- {
- rBmpOutputSize.Height() = basegfx::fround( (double) rOutputRect.GetHeight() * rBmpPerCent.Height() / 100. );
- rBmpOutputSize.Width() = basegfx::fround( (double) rBmpOutputSize.Height() * aBmpPrefSize.Width() / aBmpPrefSize.Height() );
- }
- else
- {
- rBmpOutputSize.Width() = basegfx::fround( (double) rOutputRect.GetWidth() * rBmpPerCent.Width() / 100. );
- rBmpOutputSize.Height() = basegfx::fround( (double) rBmpOutputSize.Width() * aBmpPrefSize.Height() / aBmpPrefSize.Width() );
- }
- }
- }
- }
- // ansonsten koennen wir die Groesse leicht selber berechnen
- else
- {
- if( bBmpLogSize )
- rBmpOutputSize = rBmpSize;
- else
- {
- rBmpOutputSize.Width() = basegfx::fround( (double) rOutputRect.GetWidth() * rBmpPerCent.Width() / 100. );
- rBmpOutputSize.Height() = basegfx::fround( (double) rOutputRect.GetHeight() * rBmpPerCent.Height() / 100. );
- }
- }
-
- // nur bei Kachelung die anderen Positionen berechnen
- if( bBmpTile )
- {
- Point aStartPoint;
-
- // Grundposition der ersten Kachel berechen;
- // Diese Position wird spaeter zur Berechnung der absoluten
- // Startposition links oberhalb des Objektes benutzt
- switch( eBmpRectPoint )
- {
- case( RP_MT ):
- {
- aStartPoint.X() = rOutputRect.Left() + ( ( rOutputRect.GetWidth() - rBmpOutputSize.Width() ) >> 1 );
- aStartPoint.Y() = rOutputRect.Top();
- }
- break;
-
- case( RP_RT ):
- {
- aStartPoint.X() = rOutputRect.Right() - rBmpOutputSize.Width();
- aStartPoint.Y() = rOutputRect.Top();
- }
- break;
-
- case( RP_LM ):
- {
- aStartPoint.X() = rOutputRect.Left();
- aStartPoint.Y() = rOutputRect.Top() + ( ( rOutputRect.GetHeight() - rBmpOutputSize.Height() ) >> 1 );
- }
- break;
-
- case( RP_MM ):
- {
- aStartPoint.X() = rOutputRect.Left() + ( ( rOutputRect.GetWidth() - rBmpOutputSize.Width() ) >> 1 );
- aStartPoint.Y() = rOutputRect.Top() + ( ( rOutputRect.GetHeight() - rBmpOutputSize.Height() ) >> 1 );
- }
- break;
-
- case( RP_RM ):
- {
- aStartPoint.X() = rOutputRect.Right() - rBmpOutputSize.Width();
- aStartPoint.Y() = rOutputRect.Top() + ( ( rOutputRect.GetHeight() - rBmpOutputSize.Height() ) >> 1 );
- }
- break;
-
- case( RP_LB ):
- {
- aStartPoint.X() = rOutputRect.Left();
- aStartPoint.Y() = rOutputRect.Bottom() - rBmpOutputSize.Height();
- }
- break;
-
- case( RP_MB ):
- {
- aStartPoint.X() = rOutputRect.Left() + ( ( rOutputRect.GetWidth() - rBmpOutputSize.Width() ) >> 1 );
- aStartPoint.Y() = rOutputRect.Bottom() - rBmpOutputSize.Height();
- }
- break;
-
- case( RP_RB ):
- {
- aStartPoint.X() = rOutputRect.Right() - rBmpOutputSize.Width();
- aStartPoint.Y() = rOutputRect.Bottom() - rBmpOutputSize.Height();
- }
- break;
-
- // default linke obere Ecke
- default:
- aStartPoint = rOutputRect.TopLeft();
- break;
- }
-
- // X- oder Y-Positionsoffset beruecksichtigen
- if( rBmpOffPerCent.Width() )
- aStartPoint.X() += ( rBmpOutputSize.Width() * rBmpOffPerCent.Width() / 100 );
-
- if( rBmpOffPerCent.Height() )
- aStartPoint.Y() += ( rBmpOutputSize.Height() * rBmpOffPerCent.Height() / 100 );
-
- // echten Startpunkt berechnen ( links oben )
- if( rBmpOutputSize.Width() && rBmpOutputSize.Height() )
- {
- const long nDiffX = aStartPoint.X() - rOutputRect.Left();
- const long nDiffY = aStartPoint.Y() - rOutputRect.Top();
-
- if ( nDiffX )
- {
- long nCount = nDiffX / rBmpOutputSize.Width() + 1;
-
- if ( rBmpOffPerCent.Height() && ( nCount & 1L ) )
- nCount++;
-
- aStartPoint.X() -= ( nCount * rBmpOutputSize.Width() );
- }
-
- if ( nDiffY )
- {
- long nCount = nDiffY / rBmpOutputSize.Height() + 1;
-
- if ( rBmpOffPerCent.Width() && ( nCount & 1L ) )
- nCount++;
-
- aStartPoint.Y() -= ( nCount * rBmpOutputSize.Height() );
- }
- }
-
- rStartOffset = Size( aStartPoint.X() - rOutputRect.Left(),
- aStartPoint.Y() - rOutputRect.Top() );
- }
- else
- {
- if( bBmpStretch )
- {
- rStartOffset = Size(0, 0);
- rBmpOutputSize = rOutputRect.GetSize();
- }
- else
- {
- rStartOffset = Size( ( rOutputRect.GetWidth() - rBmpOutputSize.Width() ) >> 1,
- ( rOutputRect.GetHeight() - rBmpOutputSize.Height() ) >> 1 );
- }
- }
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// eof
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx
index 23b7eccc40d6..b32b528989a8 100644
--- a/svx/source/svdraw/svdoattr.cxx
+++ b/svx/source/svdraw/svdoattr.cxx
@@ -85,7 +85,6 @@
#include <svx/sdr/properties/attributeproperties.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include "svx/xlinjoit.hxx"
-#include <svdoimp.hxx>
//////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 174ed5d9a0e1..3cea9733a202 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -96,7 +96,6 @@
#include <svx/fmmodel.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/objface.hxx>
-#include "svdoimp.hxx"
#include <vcl/graphictools.hxx>
#include <svtools/colorcfg.hxx>
#include <svx/sdr/properties/emptyproperties.hxx>
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index 3ba41752417d..b8ab00494604 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -51,7 +51,6 @@
#include "svx/svdglob.hxx" // StringCache
#include "svx/svdstr.hrc" // Objektname
#include <editeng/eeitem.hxx>
-#include "svdoimp.hxx"
#include <svx/sdr/properties/circleproperties.hxx>
#include <svx/sdr/contact/viewcontactofsdrcircobj.hxx>
#include <basegfx/point/b2dpoint.hxx>
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index b1b9c9064e67..98a318c1b04d 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -49,7 +49,6 @@
#include <svl/style.hxx>
#include <svl/smplhint.hxx>
#include <editeng/eeitem.hxx>
-#include "svdoimp.hxx"
#include <svx/sdr/properties/connectorproperties.hxx>
#include <svx/sdr/contact/viewcontactofsdredgeobj.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index f53d09e25941..a95f7041d4a9 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -62,7 +62,6 @@
#include <svx/svdopath.hxx>
#include <svx/svdpage.hxx>
#include <unotools/syslocale.hxx>
-#include "svdoimp.hxx"
#include <svx/sdr/properties/measureproperties.hxx>
#include <svx/sdr/contact/viewcontactofsdrmeasureobj.hxx>
#include <basegfx/point/b2dpoint.hxx>
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index e907b7103110..2ccedbb1a9c8 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -57,7 +57,6 @@
#include <svx/polypolygoneditor.hxx>
#include <svx/xlntrit.hxx>
#include <vcl/salbtype.hxx> // FRound
-#include "svdoimp.hxx"
#include <svx/sdr/contact/viewcontactofsdrpathobj.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index e34e389cf146..d1c97c26dc5d 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -51,7 +51,6 @@
#include <svx/xflclit.hxx>
#include <svx/xlnclit.hxx>
#include <svx/xlnwtit.hxx>
-#include "svdoimp.hxx"
#include <svx/sdr/properties/rectangleproperties.hxx>
#include <svx/sdr/contact/viewcontactofsdrrectobj.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
generated by cgit (git 2.34.1) at 2025-01-01 20:29:24 +0000