[Libreoffice-commits] .: 2 commits - binfilter/bf_sch binfilter/bf_svx binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Thu Jan 20 21:19:09 PST 2011
binfilter/bf_sch/source/core/sch_calculat.cxx | 42 ++++----
binfilter/bf_svx/source/inc/svdoimp.hxx | 20 +--
binfilter/bf_svx/source/svdraw/svx_svdetc.cxx | 112 +++++++++++-----------
binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx | 89 +++++------------
binfilter/bf_svx/source/svdraw/svx_svdtrans.cxx | 25 +---
binfilter/bf_svx/source/xoutdev/svx_xfontmac.cxx | 7 -
binfilter/bf_svx/source/xoutdev/svx_xout.cxx | 117 +++++++++++------------
binfilter/inc/bf_starmath/xchar.hxx | 109 ---------------------
binfilter/inc/bf_svx/outliner.hxx | 52 +---------
binfilter/inc/bf_svx/svdedtv.hxx | 4
binfilter/inc/bf_svx/svdhdl.hxx | 8 -
binfilter/inc/bf_svx/svdobj.hxx | 22 +---
binfilter/inc/bf_svx/svdopath.hxx | 21 ----
binfilter/inc/bf_svx/svdosmrt.hxx | 8 -
binfilter/inc/bf_svx/unoshape.hxx | 5
binfilter/inc/bf_svx/xlineit.hxx | 30 +----
binfilter/inc/bf_svx/xlnedit.hxx | 2
binfilter/inc/bf_svx/xoutx.hxx | 29 +----
binfilter/inc/bf_svx/xpolyimp.hxx | 2
binfilter/inc/bf_svx/xtable.hxx | 2
20 files changed, 232 insertions(+), 474 deletions(-)
New commits:
commit ccef78320b1a4f553566e8ae9974521d7629ea8b
Author: Joseph Powers <jpowers27 at cox.net>
Date: Thu Jan 20 21:18:46 2011 -0800
Code cleanup with #include removal
Mostly whitespace and commented code removal.
diff --git a/binfilter/bf_sch/source/core/sch_calculat.cxx b/binfilter/bf_sch/source/core/sch_calculat.cxx
index e4c0dc4..398b1b7 100644
--- a/binfilter/bf_sch/source/core/sch_calculat.cxx
+++ b/binfilter/bf_sch/source/core/sch_calculat.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -51,31 +51,31 @@ namespace binfilter {
using namespace ::std;
-
+
/*N*/ void SchCalculationHelper::IntersectPolygonWithRectangle( const XPolygon& rPolygon, const Rectangle& rRectangle, XPolyPolygon& aResult )
/*N*/ {
/*N*/ RTL_LOGFILE_CONTEXT_AUTHOR( context, "sch", "bm93744", "SchCalculationHelper::IntersectPolygonWithRectangle");
-/*N*/
+/*N*/
/*N*/ aResult.Clear();
-/*N*/
+/*N*/
/*N*/ if( rRectangle.IsInside( rPolygon.GetBoundRect() ) )
/*N*/ {
/*N*/ aResult.Insert( rPolygon );
/*N*/ OSL_TRACE( "IntersectPolygonWithRectangle: result has %d polygons", aResult.Count() );
/*N*/ return;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ Point aFrom;
/*N*/ Point aTo;
/*N*/ USHORT nCount = rPolygon.GetPointCount();
-/*N*/
+/*N*/
/*N*/ // set last point to a position outside the rectangle, such that the first
/*N*/ // time clip2d returns true, the comparison to last will always yield false
/*N*/ Point aLast (rRectangle.TopLeft());
/*N*/ aLast.Move (-1, -1);
/*N*/ XPolygon aCurrentPoly;
/*N*/ USHORT nIdx = 0;
-/*N*/
+/*N*/
/*N*/ for (USHORT i=1; i<nCount; i++)
/*N*/ {
/*N*/ aFrom = rPolygon[i-1];
@@ -93,7 +93,7 @@ using namespace ::std;
/*N*/ // create an XPolygon and put it into the XPolyPolygon
/*N*/ if (aCurrentPoly.GetPointCount() > 0)
/*N*/ aResult.Insert (aCurrentPoly, XPOLYPOLY_APPEND);
-/*N*/
+/*N*/
/*N*/ // start new sequence
/*N*/ aCurrentPoly.SetPointCount (0);
/*N*/ aCurrentPoly.Insert (0, aFrom, XPOLY_NORMAL);
@@ -101,13 +101,13 @@ using namespace ::std;
/*N*/ if (aTo != aFrom)
/*N*/ aCurrentPoly.Insert (nIdx++, aTo, XPOLY_NORMAL);
/*N*/ }
-/*N*/
+/*N*/
/*N*/ aLast = aTo;
/*N*/ }
/*N*/ }
/*N*/ if (aCurrentPoly.GetPointCount() > 0)
/*N*/ aResult.Insert (aCurrentPoly, XPOLYPOLY_APPEND);
-/*N*/
+/*N*/
/*N*/ OSL_TRACE( "IntersectPolygonWithRectangle: result has %d polygons", aResult.Count() );
/*N*/ }
@@ -115,13 +115,13 @@ using namespace ::std;
-/*N*/ BOOL SchCalculationHelper::clip2d (Point & rPoint0,
+/*N*/ BOOL SchCalculationHelper::clip2d (Point & rPoint0,
/*N*/ Point & rPoint1,
/*N*/ const Rectangle & rRectangle)
/*N*/ {
-/*N*/ // Direction vector of the line.
+/*N*/ // Direction vector of the line.
/*N*/ Point aD = rPoint1 - rPoint0;
-/*N*/
+/*N*/
/*N*/ if (aD.X()==0 && aD.Y()==0 && rRectangle.IsInside (rPoint0))
/*N*/ {
/*N*/ // Degenerate case of a zero length line.
@@ -132,8 +132,8 @@ using namespace ::std;
/*N*/ // Values of the line parameter where the line enters resp. leaves the rectangle.
/*N*/ double fTE = 0,
/*N*/ fTL = 1;
-/*N*/
-/*N*/ // Test wether at least a part lies in the four half-planes with respect to
+/*N*/
+/*N*/ // Test wether at least a part lies in the four half-planes with respect to
/*N*/ // the rectangles four edges.
/*N*/ if (CLIPt (aD.X(), rRectangle.Left() - rPoint0.X(), fTE, fTL))
/*N*/ if (CLIPt (-aD.X(), rPoint0.X() - rRectangle.Right(), fTE, fTL))
@@ -155,7 +155,7 @@ using namespace ::std;
/*N*/ }
/*N*/ return TRUE;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // Line is not visible.
/*N*/ return FALSE;
/*N*/ }
@@ -164,13 +164,13 @@ using namespace ::std;
-/*N*/ BOOL SchCalculationHelper::CLIPt (double fDenom,
-/*N*/ double fNum,
-/*N*/ double & fTE,
+/*N*/ BOOL SchCalculationHelper::CLIPt (double fDenom,
+/*N*/ double fNum,
+/*N*/ double & fTE,
/*N*/ double & fTL)
/*N*/ {
/*N*/ double fT;
-/*N*/
+/*N*/
/*N*/ if (fDenom > 0) // Intersection enters: PE
/*N*/ {
/*N*/ fT = fNum / fDenom; // Parametric value at the intersection.
@@ -189,7 +189,7 @@ using namespace ::std;
/*N*/ }
/*N*/ else if (fNum > 0)
/*N*/ return FALSE; // Line lies on the outside of the edge.
-/*N*/
+/*N*/
/*N*/ return TRUE;
/*N*/ }
diff --git a/binfilter/bf_svx/source/inc/svdoimp.hxx b/binfilter/bf_svx/source/inc/svdoimp.hxx
index a182dd3..2df5b6f 100644
--- a/binfilter/bf_svx/source/inc/svdoimp.hxx
+++ b/binfilter/bf_svx/source/inc/svdoimp.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -48,8 +48,6 @@
#include "xdash.hxx"
-#include "xpoly.hxx"
-
#include "poly3d.hxx"
#include "xenum.hxx"
@@ -67,7 +65,7 @@ class XPolygon;
///////////////////////////////////////////////////////////////////////////////
// #100127# Bracket filled shapes with a comment, if recording a Mtf
-class ImpGraphicFill
+class ImpGraphicFill
{
public:
ImpGraphicFill( const SdrObject& rObj, const ExtOutputDevice& rXOut, const SfxItemSet& rFillItemSet, bool bIsShadow=false );
@@ -123,19 +121,19 @@ private:
@param eBmpRectPoint
Position of the start point relative to the bitmap
-
+
*/
void ImpCalcBmpFillSizes( Size& rStartOffset,
Size& rBmpOutputSize,
- const Rectangle& rOutputRect,
+ const Rectangle& rOutputRect,
const MapMode& rOutputMapMode,
const Bitmap& rFillBitmap,
- const Size& rBmpSize,
- const Size& rBmpPerCent,
+ const Size& rBmpSize,
+ const Size& rBmpPerCent,
const Size& rBmpOffPerCent,
- BOOL bBmpLogSize,
- BOOL bBmpTile,
- BOOL bBmpStretch,
+ BOOL bBmpLogSize,
+ BOOL bBmpTile,
+ BOOL bBmpStretch,
RECT_POINT eBmpRectPoint );
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdetc.cxx b/binfilter/bf_svx/source/svdraw/svx_svdetc.cxx
index b9fa9cd..ad198c1 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdetc.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdetc.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -64,7 +64,7 @@
#include <bf_svtools/syslocale.hxx>
-// #97870#
+// #97870#
#include "xflbckit.hxx"
#include <bf_goodies/b3dcolor.hxx>
@@ -103,15 +103,15 @@ namespace binfilter {
/*N*/ : Container( 0 )
/*N*/ {
/*N*/ SvtCacheOptions aCacheOptions;
-/*N*/
+/*N*/
/*N*/ nSize = aCacheOptions.GetDrawingEngineOLE_Objects();
/*N*/ pTimer = new AutoTimer();
/*N*/ Link aLink = LINK(this, OLEObjCache, UnloadCheckHdl);
-/*N*/
+/*N*/
/*N*/ pTimer->SetTimeoutHdl(aLink);
/*N*/ pTimer->SetTimeout(20000);
/*N*/ pTimer->Start();
-/*N*/
+/*N*/
/*N*/ aLink.Call(pTimer);
/*N*/ }
@@ -130,19 +130,19 @@ namespace binfilter {
/*N*/ {
/*?*/ // Eintraege reduzieren
/*?*/ ULONG nIndex = Count() - 1;
-/*?*/
+/*?*/
/*?*/ for (ULONG i = nIndex; i + 1 >= nSize; i--)
/*?*/ {
/*?*/ // Pruefen, ob Objekte entfernt werden koennen
/*?*/ SdrOle2Obj* pCacheObj = (SdrOle2Obj*) GetObject(i);
-/*?*/
+/*?*/
/*?*/ if ( pCacheObj != pObj && UnloadObj(pCacheObj) )
/*?*/ {
/*?*/ Remove(i);
/*?*/ }
/*?*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // Objekt ggf. entfernen und an erster Position einfuegen
/*N*/ Remove(pObj);
/*N*/ Insert(pObj, (ULONG) 0L);
@@ -156,25 +156,25 @@ namespace binfilter {
/*N*/ BOOL OLEObjCache::UnloadObj(SdrOle2Obj* pObj)
/*N*/ {
/*N*/ BOOL bUnloaded = FALSE;
-/*N*/
+/*N*/
/*N*/ if (pObj)
/*N*/ {
/*N*/ BOOL bVisible = FALSE;
/*N*/ SdrViewIter aIter(pObj);
/*N*/ SdrView* pView = aIter.FirstView();
-/*N*/
+/*N*/
/*N*/ while (!bVisible && pView!=NULL)
/*N*/ {
/*?*/ bVisible = !pView->IsGrafDraft();
-/*?*/
+/*?*/
/*?*/ if (!bVisible)
/*?*/ pView = aIter.NextView();
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if (!bVisible)
/*N*/ bUnloaded = pObj->Unload();
/*N*/ }
-/*N*/
+/*N*/
/*N*/ return bUnloaded;
/*N*/ }
@@ -184,17 +184,17 @@ namespace binfilter {
/*N*/ {
/*?*/ // Eintraege reduzieren
/*?*/ ULONG nIndex = Count() - 1;
-/*?*/
+/*?*/
/*?*/ for (ULONG i = nIndex; i + 1 >= nSize; i--)
/*?*/ {
/*?*/ // Pruefen, ob Objekte entfernt werden koennen
/*?*/ SdrOle2Obj* pCacheObj = (SdrOle2Obj*) GetObject(i);
-/*?*/
+/*?*/
/*?*/ if ( UnloadObj(pCacheObj) )
/*?*/ Remove(i);
/*?*/ }
/*?*/ }
-/*N*/
+/*N*/
/*N*/ return 0;
/*N*/ }
@@ -257,7 +257,7 @@ namespace binfilter {
/*?*/ if (pMtf!=NULL) pMtf->Pause(FALSE);
/*?*/ }
/*?*/ };
-/*?*/
+/*?*/
/*?*/ class ImpColorMerk {
/*?*/ Color aLineColor;
/*?*/ Color aFillColor;
@@ -269,27 +269,27 @@ namespace binfilter {
/*?*/ aFillColor( rOut.GetFillColor() ),
/*?*/ aBckgrdColor( rOut.GetBackground().GetColor() ),
/*?*/ aFont (rOut.GetFont()) {}
-/*?*/
+/*?*/
/*?*/ ImpColorMerk(const OutputDevice& rOut, USHORT nMode)
/*?*/ {
/*?*/ if ( (nMode & SDRHDC_SAVEPEN) == SDRHDC_SAVEPEN )
/*?*/ aLineColor = rOut.GetLineColor();
-/*?*/
+/*?*/
/*?*/ if ( (nMode & SDRHDC_SAVEBRUSH) == SDRHDC_SAVEBRUSH)
/*?*/ {
/*?*/ aFillColor = rOut.GetFillColor();
/*?*/ aBckgrdColor = rOut.GetBackground().GetColor();
/*?*/ }
-/*?*/
+/*?*/
/*?*/ if ( (nMode & SDRHDC_SAVEFONT) == SDRHDC_SAVEFONT)
/*?*/ aFont=rOut.GetFont();
/*?*/ }
-/*?*/
+/*?*/
/*?*/ void Restore(OutputDevice& rOut, USHORT nMode=SDRHDC_SAVEPENANDBRUSHANDFONT)
/*?*/ {
/*?*/ if ( (nMode & SDRHDC_SAVEPEN) == SDRHDC_SAVEPEN)
/*?*/ rOut.SetLineColor( aLineColor );
-/*?*/
+/*?*/
/*?*/ if ( (nMode & SDRHDC_SAVEBRUSH) == SDRHDC_SAVEBRUSH)
/*?*/ {
/*?*/ rOut.SetFillColor( aFillColor );
@@ -303,7 +303,7 @@ namespace binfilter {
/*?*/ }
/*?*/ }
/*?*/ }
-/*?*/
+/*?*/
/*?*/ const Color& GetLineColor() const { return aLineColor; }
/*?*/ };
@@ -342,9 +342,9 @@ namespace binfilter {
/*N*/ }
/*N*/ if ((nMode & SDRHDC_SAVECLIPPING) ==SDRHDC_SAVECLIPPING)
/*N*/ pClipMerk=new ImpClipMerk(rOut);
-/*N*/
+/*N*/
/*N*/ USHORT nCol=nMode & SDRHDC_SAVEPENANDBRUSHANDFONT;
-/*N*/
+/*N*/
/*N*/ if (nCol==SDRHDC_SAVEPEN)
/*N*/ pLineColorMerk=new Color( rOut.GetLineColor() );
/*N*/ else if (nCol==SDRHDC_SAVEPENANDBRUSHANDFONT)
@@ -356,12 +356,12 @@ namespace binfilter {
/*N*/ void ImpSdrHdcMerk::Restore(OutputDevice& rOut, USHORT nMask) const
/*N*/ {
/*N*/ nMask&=nMode; // nur restaurieren, was auch gesichert wurde
-/*N*/
+/*N*/
/*N*/ if ((nMask & SDRHDC_SAVECLIPPING) ==SDRHDC_SAVECLIPPING && pClipMerk!=NULL)
/*N*/ pClipMerk->Restore(rOut);
-/*N*/
+/*N*/
/*N*/ USHORT nCol=nMask & SDRHDC_SAVEPENANDBRUSHANDFONT;
-/*N*/
+/*N*/
/*N*/ if (nCol==SDRHDC_SAVEPEN)
/*N*/ {
/*N*/ if (pLineColorMerk!=NULL)
@@ -405,7 +405,7 @@ namespace binfilter {
/*N*/ DBG_ERROR("SdrLinkList::InsertLink(): Link schon vorhanden");
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ void SdrLinkList::RemoveLink(const Link& rLink)
/*N*/ {
/*N*/ unsigned nFnd=FindEntry(rLink);
@@ -424,31 +424,31 @@ namespace binfilter {
/*N*/ {
/*N*/ XFillStyle eFill=((XFillStyleItem&)rSet.Get(XATTR_FILLSTYLE)).GetValue();
/*N*/ bool bRetval(FALSE);
-/*N*/
-/*N*/ switch(eFill)
+/*N*/
+/*N*/ switch(eFill)
/*N*/ {
-/*N*/ case XFILL_SOLID:
+/*N*/ case XFILL_SOLID:
/*N*/ {
-/*N*/ rCol = ((XFillColorItem&)rSet.Get(XATTR_FILLCOLOR)).GetValue();
+/*N*/ rCol = ((XFillColorItem&)rSet.Get(XATTR_FILLCOLOR)).GetValue();
/*N*/ bRetval = TRUE;
-/*N*/
+/*N*/
/*N*/ break;
/*N*/ }
-/*N*/ case XFILL_HATCH:
+/*N*/ case XFILL_HATCH:
/*N*/ {
/*?*/ Color aCol1(((XFillHatchItem&)rSet.Get(XATTR_FILLHATCH)).GetValue().GetColor());
/*?*/ Color aCol2(COL_WHITE);
-/*?*/
+/*?*/
/*?*/ // #97870# when hatch background is activated, use object fill color as hatch color
/*?*/ sal_Bool bFillHatchBackground = ((const XFillBackgroundItem&)(rSet.Get(XATTR_FILLBACKGROUND))).GetValue();
/*?*/ if(bFillHatchBackground)
/*?*/ {
/*?*/ aCol2 = ((const XFillColorItem&)(rSet.Get(XATTR_FILLCOLOR))).GetValue();
/*?*/ }
-/*?*/
+/*?*/
/*?*/ ((B3dColor&)rCol).CalcMiddle(aCol1, aCol2);
/*?*/ bRetval = TRUE;
-/*?*/
+/*?*/
/*?*/ break;
/*N*/ }
/*N*/ case XFILL_GRADIENT: {
@@ -457,10 +457,10 @@ namespace binfilter {
/*N*/ Color aCol2(rGrad.GetEndColor());
/*N*/ ((B3dColor&)rCol).CalcMiddle(aCol1, aCol2);
/*N*/ bRetval = TRUE;
-/*N*/
+/*N*/
/*N*/ break;
/*N*/ }
-/*N*/ case XFILL_BITMAP:
+/*N*/ case XFILL_BITMAP:
/*N*/ {
/*?*/ const Bitmap& rBitmap = ((XFillBitmapItem&)rSet.Get(XATTR_FILLBITMAP)).GetValue().GetBitmap();
/*?*/ const Size aSize(rBitmap.GetSizePixel());
@@ -468,7 +468,7 @@ namespace binfilter {
/*?*/ const sal_uInt32 nHeight = aSize.Height();
/*?*/ Bitmap aBitmap(rBitmap);
/*?*/ BitmapReadAccess* pAccess = aBitmap.AcquireReadAccess();
-/*?*/
+/*?*/
/*?*/ if(pAccess && nWidth > 0 && nHeight > 0)
/*?*/ {
/*?*/ sal_uInt32 nRt(0L);
@@ -478,7 +478,7 @@ namespace binfilter {
/*?*/ const sal_uInt32 nXStep((nWidth > nMaxSteps) ? nWidth / nMaxSteps : 1L);
/*?*/ const sal_uInt32 nYStep((nHeight > nMaxSteps) ? nHeight / nMaxSteps : 1L);
/*?*/ sal_uInt32 nAnz(0L);
-/*?*/
+/*?*/
/*?*/ for(sal_uInt32 nY(0L); nY < nHeight; nY += nYStep)
/*?*/ {
/*?*/ for(sal_uInt32 nX(0L); nX < nWidth; nX += nXStep)
@@ -486,32 +486,34 @@ namespace binfilter {
/*?*/ const BitmapColor& rCol = (pAccess->HasPalette())
/*?*/ ? pAccess->GetPaletteColor((BYTE)pAccess->GetPixel(nY, nX))
/*?*/ : pAccess->GetPixel(nY, nX);
-/*?*/
-/*?*/ nRt += rCol.GetRed();
-/*?*/ nGn += rCol.GetGreen();
+/*?*/
+/*?*/ nRt += rCol.GetRed();
+/*?*/ nGn += rCol.GetGreen();
/*?*/ nBl += rCol.GetBlue();
/*?*/ nAnz++;
/*?*/ }
/*?*/ }
-/*?*/
+/*?*/
/*?*/ nRt /= nAnz;
/*?*/ nGn /= nAnz;
/*?*/ nBl /= nAnz;
-/*?*/
+/*?*/
/*?*/ rCol = Color(UINT8(nRt), UINT8(nGn), UINT8(nBl));
-/*?*/
+/*?*/
/*?*/ bRetval = TRUE;
/*?*/ }
-/*?*/
+/*?*/
/*?*/ if(pAccess)
/*?*/ {
/*?*/ aBitmap.ReleaseAccess(pAccess);
/*?*/ }
-/*?*/
+/*?*/
/*?*/ break;
/*?*/ }
+ case XFILL_NONE:
+ break;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ return bRetval;
/*N*/ }
@@ -526,7 +528,7 @@ namespace binfilter {
/*N*/ aMapFraction(1,1)
/*N*/ {
/*N*/ }
-/*N*/
+/*N*/
/*N*/ SdrEngineDefaults& SdrEngineDefaults::GetDefaults()
/*N*/ {
/*N*/ SdrGlobalData& rGlobalData=GetSdrGlobalData();
@@ -553,7 +555,7 @@ namespace binfilter {
/*N*/ pOutl->SetForbiddenCharsTable( pModel->GetForbiddenCharsTable() );
/*N*/ pOutl->SetAsianCompressionMode( pModel->GetCharCompressType() );
/*N*/ pOutl->SetKernAsianPunctuation( pModel->IsKernAsianPunctuation() );
-/*N*/
+/*N*/
/*N*/ return pOutl;
/*N*/ }
@@ -577,7 +579,7 @@ namespace binfilter {
/*N*/ ResMgr* ImpGetResMgr()
/*N*/ {
/*N*/ SdrGlobalData& rGlobalData = GetSdrGlobalData();
-/*N*/
+/*N*/
/*N*/ if(!rGlobalData.pResMgr)
/*N*/ {
/*N*/ #ifndef SVX_LIGHT
@@ -588,7 +590,7 @@ namespace binfilter {
/*N*/ rGlobalData.pResMgr =
/*N*/ ResMgr::CreateResMgr( aName.GetBuffer(), Application::GetSettings().GetUILocale() );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ return rGlobalData.pResMgr;
/*N*/ }
}
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx b/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx
index 2e5a32c..4026bcb 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -123,7 +123,7 @@ namespace binfilter {
/*N*/ {
/*N*/ HideMarkHdl(NULL);
/*N*/ }
-/*N*/
+/*N*/
/*N*/ bMarkedObjRectDirty=TRUE;
/*N*/ bMarkedPointsRectsDirty=TRUE;
/*N*/ }
@@ -208,22 +208,22 @@ namespace binfilter {
/*N*/ {
/*N*/ // break all creation actions when hiding page (#75081#)
/*N*/ BrkAction();
-/*N*/
+/*N*/
/*N*/ BOOL bVis(IsMarkHdlShown());
-/*N*/
+/*N*/
/*N*/ if(bVis)
/*?*/ HideMarkHdl(NULL);
-/*N*/
+/*N*/
/*N*/ // Alle Markierungen dieser Seite verwerfen
/*N*/ BOOL bMrkChg(aMark.DeletePageView(*pPV));
/*N*/ SdrSnapView::HidePage(pPV);
-/*N*/
+/*N*/
/*N*/ if(bMrkChg)
/*N*/ {
/*?*/ MarkListHasChanged();
/*?*/ AdjustMarkHdl();
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if(bVis)
/*N*/ ShowMarkHdl(NULL);
/*N*/ }
@@ -238,7 +238,7 @@ namespace binfilter {
/*N*/ void SdrMarkView::BrkMarkObj()
/*N*/ {
-/*N*/ if (bMarking) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ if (bMarking) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*N*/ }
/*N*/ }
@@ -250,7 +250,7 @@ namespace binfilter {
/*N*/ void SdrMarkView::BrkMarkPoints()
/*N*/ {
-/*N*/ if (bMarkingPoints) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ if (bMarkingPoints) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*N*/ }
/*N*/ }
@@ -262,7 +262,7 @@ namespace binfilter {
/*N*/ void SdrMarkView::BrkMarkGluePoints()
/*N*/ {
-/*N*/ if (bMarkingGluePoints) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ if (bMarkingGluePoints) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*N*/ }
/*N*/ }
@@ -400,7 +400,7 @@ namespace binfilter {
/*N*/ }
/*N*/ void SdrMarkView::SetMarkHdlHidden(BOOL bOn)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*N*/ }
/*N*/ BOOL SdrMarkView::ImpIsFrameHandles() const
@@ -408,7 +408,7 @@ namespace binfilter {
/*N*/ ULONG nMarkAnz=aMark.GetMarkCount();
/*N*/ BOOL bFrmHdl=nMarkAnz>nFrameHandlesLimit || bForceFrameHandles;
/*N*/ BOOL bStdDrag=eDragMode==SDRDRAG_MOVE;
-/*N*/ if (nMarkAnz==1 && bStdDrag && bFrmHdl) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ if (nMarkAnz==1 && bStdDrag && bFrmHdl) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*N*/ }
/*N*/ if (!bStdDrag && !bFrmHdl) {
/*?*/ // Grundsaetzlich erstmal alle anderen Dragmodi nur mit FrameHandles
@@ -424,7 +424,7 @@ namespace binfilter {
/*N*/ }
/*N*/ if (!bFrmHdl) {
/*N*/ // FrameHandles, wenn wenigstens 1 Obj kein SpecialDrag kann
-/*N*/ for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && !bFrmHdl; nMarkNum++) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && !bFrmHdl; nMarkNum++) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*N*/ }
/*N*/ }
/*N*/ return bFrmHdl;
@@ -435,23 +435,20 @@ namespace binfilter {
/*N*/ // #105722# remember old focus handle values to search for it again
/*N*/ const SdrHdl* pSaveOldFocusHdl = aHdl.GetFocusHdl();
/*N*/ sal_Bool bSaveOldFocus(sal_False);
-/*N*/ sal_uInt16 nSavePolyNum, nSavePointNum;
-/*N*/ SdrHdlKind eSaveKind;
-/*N*/
+/*N*/
/*N*/ if(pSaveOldFocusHdl
/*N*/ && pSaveOldFocusHdl->GetObj()
/*N*/ && pSaveOldFocusHdl->GetObj()->ISA(SdrPathObj)
/*N*/ && (pSaveOldFocusHdl->GetKind() == HDL_POLY || pSaveOldFocusHdl->GetKind() == HDL_BWGT))
/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
-/*N*/
+/*N*/
/*N*/ aHdl.Clear();
/*N*/ aHdl.SetRotateShear(eDragMode==SDRDRAG_ROTATE);
/*N*/ aHdl.SetDistortShear(eDragMode==SDRDRAG_SHEAR);
/*N*/ pMarkedObj=NULL;
/*N*/ pMarkedPV=NULL;
/*N*/ ULONG nMarkAnz=aMark.GetMarkCount();
-/*N*/ BOOL bStdDrag=eDragMode==SDRDRAG_MOVE;
/*N*/ if (nMarkAnz==1) {
/*?*/ pMarkedObj=aMark.GetMark(0)->GetObj();
/*N*/ }
@@ -476,21 +473,21 @@ namespace binfilter {
/*N*/ } // for nMarkNum
/*N*/ } // if bFrmHdl else
/*N*/ // GluePoint-Handles
-/*N*/ for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*N*/ }
// Drehpunkt/Spiegelachse
/*N*/ AddDragModeHdl(eDragMode);
-/*N*/
+/*N*/
/*N*/ // add custom handles (used by other apps, e.g. AnchorPos)
/*N*/ AddCustomHdl();
-/*N*/
+/*N*/
/*N*/ // sort handles
/*N*/ aHdl.Sort();
-/*N*/
+/*N*/
/*N*/ // #105722# try to restore focus handle index from remembered values
/*N*/ if(bSaveOldFocus)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");//STRIP001
+/*N*/ {DBG_BF_ASSERT(0, "STRIP");//STRIP001
/*N*/ }
/*N*/ }
@@ -501,30 +498,6 @@ namespace binfilter {
/*N*/ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode)
/*N*/ {
-/*N*/ switch(eMode)
-/*N*/ {
-/*?*/ case SDRDRAG_ROTATE:
-/*?*/ {
-/*?*/ // add rotation center
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SdrHdl* pHdl = new SdrHdl(aRef1, HDL_REF1);
-/*?*/
-/*?*/
-/*?*/ break;
-/*?*/ }
-/*?*/ case SDRDRAG_MIRROR:
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
-/*?*/
-/*?*/ break;
-/*?*/ }
-/*?*/ case SDRDRAG_TRANSPARENCE:
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
-/*?*/ break;
-/*?*/ }
-/*?*/ case SDRDRAG_GRADIENT:
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
-/*?*/ break;
-/*N*/ }
-/*N*/ }
/*N*/ }
@@ -532,7 +505,7 @@ namespace binfilter {
/*N*/ void SdrMarkView::CheckMarked()
/*N*/ {
-/*N*/ for (ULONG nm=aMark.GetMarkCount(); nm>0;) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ for (ULONG nm=aMark.GetMarkCount(); nm>0;) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*N*/ }
// #67670# When this leads to a change, MarkListHasChanged()
@@ -589,16 +562,15 @@ namespace binfilter {
/*N*/ {
/*N*/ if (pObj!=NULL && pPV!=NULL && IsObjMarkable(pObj, pPV)) {
/*N*/ BrkAction();
-/*N*/ if (!bUnmark) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
-/*N*/ } else {
+/*N*/ if (bUnmark)
+ {
/*N*/ ULONG nPos=aMark.FindObject(pObj);
-/*N*/ if (nPos!=CONTAINER_ENTRY_NOTFOUND) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ if (nPos!=CONTAINER_ENTRY_NOTFOUND) {
/*N*/ }
/*N*/ }
/*N*/ if (!bImpNoSetMarkHdl) {
/*N*/ MarkListHasChanged();
/*N*/ AdjustMarkHdl(TRUE);
-/*N*/ // if (!IsSolidMarkHdl() || !bSomeObjChgdFlag) {
/*N*/ if (!bSomeObjChgdFlag) {
/*N*/ // ShowMarkHdl kommt sonst mit dem AfterPaintTimer
/*N*/ ShowMarkHdl(NULL);
@@ -624,7 +596,6 @@ namespace binfilter {
/*N*/ return NULL;
/*N*/ }
/*N*/ BOOL bCheckIfMarkable=(nOptions & SDRSEARCH_TESTMARKABLE)!=0;
-/*N*/ BOOL bBack=(nOptions & SDRSEARCH_BACKWARD)!=0;
/*N*/ BOOL bDeep=(nOptions & SDRSEARCH_DEEP)!=0;
/*N*/ BOOL bOLE=pObj->ISA(SdrOle2Obj);
/*N*/ SdrObject* pRet=NULL;
@@ -714,7 +685,7 @@ namespace binfilter {
/*N*/ if(bRestraintPaint && bVis)
/*N*/ {
/*?*/ ShowMarkHdl(NULL);
-/*N*/
+/*N*/
/*N*/ // refresh IAOs
//STRIP012/*N*/ //--/ RefreshAllIAOManagers();
/*N*/ }
@@ -761,22 +732,22 @@ namespace binfilter {
/*N*/ bEdgesOfMarkedNodesDirty=TRUE;
/*N*/ aEdgesOfMarkedNodes.Clear();
/*N*/ aMarkedEdgesOfMarkedNodes.Clear();
-/*N*/
+/*N*/
/*N*/ // #i13033#
/*N*/ // Forget transitive hull of complete selection
/*N*/ maAllMarkedObjects.Clear();
-/*N*/
+/*N*/
/*N*/ bMarkedObjRectDirty=TRUE;
/*N*/ bMarkedPointsRectsDirty=TRUE;
/*N*/ #ifndef SVX_LIGHT
/*?*/ if (pItemBrowser!=NULL) DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pItemBrowser->SetDirty();
/*N*/ #endif
/*N*/ BOOL bOneEdgeMarked=FALSE;
-/*N*/ if (aMark.GetMarkCount()==1) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ if (aMark.GetMarkCount()==1) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*N*/ }
/*N*/ ImpSetGlueVisible4(bOneEdgeMarked);
/*N*/ }
-/*N*/
+/*N*/
////////////////////////////////////////////////////////////////////////////////////////////////////
/*N*/ void SdrMarkView::WriteRecords(SvStream& rOut) const
@@ -860,7 +831,7 @@ namespace binfilter {
/*N*/ {
/*N*/ const SdrPageViewWinRec& rWR = rWinList[ (USHORT) i];
/*N*/ const SdrUnoControlList& rControlList = rWR.GetControlList();
-/*N*/
+/*N*/
/*N*/ for(UINT32 j = 0; j < rControlList.GetCount(); j++)
/*N*/ {
/*?*/ ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > xControl = rControlList[ (USHORT) j].GetControl();
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdtrans.cxx b/binfilter/bf_svx/source/svdraw/svx_svdtrans.cxx
index b4d2a6d..7ff052f 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdtrans.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdtrans.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -30,10 +30,8 @@
#include <math.h>
#include "xpoly.hxx"
-
#include <tools/bigint.hxx>
-
namespace binfilter {
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -55,7 +53,7 @@ namespace binfilter {
/*N*/ Fraction xFact(rxFact);
/*N*/ Fraction yFact(ryFact);
/*N*/ long nHgt=rRect.Bottom()-rRect.Top();
-/*N*/
+/*N*/
/*N*/ {
/*N*/ if (xFact.GetDenominator()==0) {
/*?*/ long nWdt=rRect.Right()-rRect.Left();
@@ -80,7 +78,7 @@ namespace binfilter {
/*?*/ yFact=Fraction(yFact.GetNumerator(),-1);
/*?*/ if (nHgt==0) rRect.Top()--;
/*?*/ }
-/*?*/
+/*?*/
/*?*/ yFact=Fraction(yFact.GetNumerator(),1); // DivZero abfangen
/*N*/ }
/*N*/ rRect.Top() =rRef.Y()+Round(((double)(rRect.Top() -rRef.Y())*yFact.GetNumerator())/yFact.GetDenominator());
@@ -267,7 +265,7 @@ namespace binfilter {
/*N*/ nCos=cos(a);
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ void GeoStat::RecalcTan()
/*N*/ {
/*N*/ if (nShearWink==0) {
@@ -299,11 +297,11 @@ namespace binfilter {
/*N*/ rGeo.nDrehWink=NormAngle360(rGeo.nDrehWink);
/*N*/ // Drehung ist damit im Kasten
/*N*/ rGeo.RecalcSinCos();
-/*N*/
+/*N*/
/*N*/ Point aPt1(rPol[1]-rPol[0]);
/*N*/ if (rGeo.nDrehWink!=0) RotatePoint(aPt1,Point(0,0),-rGeo.nSin,rGeo.nCos); // -Sin fuer Rueckdrehung
/*N*/ long nWdt=aPt1.X();
-/*N*/
+/*N*/
/*N*/ Point aPt0(rPol[0]);
/*N*/ Point aPt3(rPol[3]-rPol[0]);
/*N*/ if (rGeo.nDrehWink!=0) RotatePoint(aPt3,Point(0,0),-rGeo.nSin,rGeo.nCos); // -Sin fuer Rueckdrehung
@@ -311,7 +309,7 @@ namespace binfilter {
/*N*/ long nShW=GetAngle(aPt3);
/*N*/ nShW-=27000; // ShearWink wird zur Senkrechten gemessen
/*N*/ nShW=-nShW; // Negieren, denn '+' ist Rechtskursivierung
-/*N*/
+/*N*/
/*N*/ bool bMirr=aPt3.Y()<0;
/*N*/ if (bMirr) { // "Punktetausch" bei Spiegelung
/*N*/ nHgt=-nHgt;
@@ -398,7 +396,7 @@ namespace binfilter {
/*?*/ FrPair GetMapFactor(FieldUnit eS, FieldUnit eD)
/*?*/ {
/*?*/ if (eS==eD) return FrPair(1,1,1,1);
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}return FrPair(1,1,1,1);//STRIP001 //STRIP001 /*?*/ FrPair aS(GetInchOrMM(eS));
+/*?*/ {DBG_BF_ASSERT(0, "STRIP");}return FrPair(1,1,1,1);
/*?*/ };
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -410,13 +408,6 @@ namespace binfilter {
// 1 yd = 3 ft = 36" = 914,4mm
// 1 ft = 12 " = 1" = 304,8mm
-
-
-
-
-
-
-
////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xfontmac.cxx b/binfilter/bf_svx/source/xoutdev/svx_xfontmac.cxx
index 1e175ba..ea0122f 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xfontmac.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xfontmac.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -52,7 +52,6 @@
#include <sv.hxx>
-#include "xpoly.hxx"
#include "xattr.hxx"
#include "xoutx.hxx"
@@ -1417,8 +1416,6 @@ long XOutputDevice::ImpDrawFormText(const String& rText, const Polygon& rPoly,
aPos.X() -= (long) (fDx * nLen / fLen + fXDist);
aPos.Y() -= (long) (fDy * nLen / fLen + fYDist);
-// aPos.X() -= (long) ((fDx * nLen - fDy * nFormTextDistance) / fLen);
-// aPos.Y() -= (long) ((fDy * nLen + fDx * nFormTextDistance) / fLen);
// BoundRect-Approximation
nXMin = Min(nXMin, aPos.X() - nMaxCharExtent);
@@ -1479,7 +1476,6 @@ long XOutputDevice::ImpDrawFormText(const String& rText, const Polygon& rPoly,
pOut->SetFont(aFont);
if ( bDraw )
pOut->DrawTextArray(aPos, rText, pDXArray, nChar, nCnt);
-// pOut->DrawText(aPos, rText, nChar, nCnt);
}
}
else
@@ -1561,7 +1557,6 @@ long XOutputDevice::ImpDrawFormText(const String& rText, const Polygon& rPoly,
else
pOut->DrawTextArray(aPolyPos, rText, pDXArray,
nChar+i, 1);
-// pOut->DrawText(aPolyPos, rText, nChar+i, 1);
}
}
}
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xout.cxx b/binfilter/bf_svx/source/xoutdev/svx_xout.cxx
index b00fde2..bd019c2 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xout.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xout.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -44,7 +44,7 @@
#include "xftouit.hxx"
#include "xftsfit.hxx"
#include "xftshcit.hxx"
-#include "xftshit.hxx"
+#include "xftshit.hxx"
#include "xftshtit.hxx"
#include "xftshxy.hxx"
#include "xftstit.hxx"
@@ -137,7 +137,7 @@ namespace binfilter {
/*N*/ {
/*N*/ delete[] pLinePattern;
/*N*/ delete mpFillGraphicObject;
-/*N*/
+/*N*/
/*N*/ delete iRotTransGradient();
/*N*/ delete static_cast< ImpData* >( pImpData );
/*N*/ }
@@ -155,7 +155,7 @@ namespace binfilter {
/*N*/ void XOutputDevice::DrawLine( const Point& rStart, const Point& rEnd )
/*N*/ {
/*N*/ Polygon aPoly(2);
-/*N*/
+/*N*/
/*N*/ aPoly[0] = rStart;
/*N*/ aPoly[1] = rEnd;
/*N*/ DrawLinePolygon( aPoly, FALSE );
@@ -196,7 +196,7 @@ namespace binfilter {
/*N*/ ULONG nYRound )
/*N*/ {
/*N*/ const Polygon aPoly( rRect, nXRound, nYRound );
-/*N*/
+/*N*/
/*N*/ DrawFillPolyPolygon( aPoly, TRUE );
/*N*/ DrawLinePolygon( aPoly, TRUE );
/*N*/ }
@@ -215,7 +215,7 @@ namespace binfilter {
/*N*/ void XOutputDevice::DrawEllipse( const Rectangle& rRect )
/*N*/ {
/*N*/ const Polygon aPoly( rRect.Center(), rRect.GetWidth() >> 1, rRect.GetHeight() >> 1 );
-/*N*/
+/*N*/
/*N*/ DrawFillPolyPolygon( aPoly );
/*N*/ DrawLinePolygon( aPoly, TRUE );
/*N*/ }
@@ -235,7 +235,7 @@ namespace binfilter {
/*N*/ const Point& rEnd )
/*N*/ {
/*N*/ const Polygon aPoly( rRect, rStart, rEnd, POLY_ARC );
-/*N*/
+/*N*/
/*N*/ DrawFillPolyPolygon( aPoly );
/*N*/ DrawLinePolygon( aPoly, TRUE );
/*N*/ }
@@ -255,7 +255,7 @@ namespace binfilter {
/*N*/ const Point& rEnd )
/*N*/ {
/*N*/ const Polygon aPoly( rRect, rStart, rEnd, POLY_PIE );
-/*N*/
+/*N*/
/*N*/ DrawFillPolyPolygon( aPoly );
/*N*/ DrawLinePolygon( aPoly, TRUE );
/*N*/ }
@@ -278,7 +278,7 @@ namespace binfilter {
/*N*/ // #100127# Too much hassle below this method
/*N*/ // const Polygon aPoly( XOutCreatePolygonBezier(rXPoly, pOut) );
/*N*/ const Polygon aPoly( XOutCreatePolygon(rXPoly, pOut) );
-/*N*/
+/*N*/
/*N*/ DrawFillPolyPolygon( aPoly );
/*N*/ DrawLinePolygon(aPoly, TRUE);
/*N*/ }
@@ -297,9 +297,9 @@ namespace binfilter {
/*N*/ void XOutputDevice::DrawXPolyPolygon( const XPolyPolygon& rXPolyPoly )
/*N*/ {
/*N*/ PolyPolygon aPolyPoly;
-/*N*/
+/*N*/
/*N*/ USHORT nCount = rXPolyPoly.Count(), i;
-/*N*/
+/*N*/
/*N*/ for( i = 0; i < nCount; i++ )
/*N*/ {
/*N*/ if( rXPolyPoly[i].GetPointCount() > 0 )
@@ -309,13 +309,13 @@ namespace binfilter {
/*N*/ aPolyPoly.Insert(XOutCreatePolygon(rXPolyPoly[i], pOut));
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ DrawFillPolyPolygon( aPolyPoly );
-/*N*/
+/*N*/
/*N*/ if( eLineStyle != XLINE_NONE )
/*N*/ {
/*N*/ nCount = aPolyPoly.Count();
-/*N*/
+/*N*/
/*N*/ for (i = 0; i < nCount; i++ )
/*N*/ DrawLinePolygon(aPolyPoly.GetObject(i), TRUE);
/*N*/ }
@@ -338,21 +338,21 @@ namespace binfilter {
/*N*/ Point aTranslation;
/*N*/ const Rectangle aRect(rXPoly.GetBoundRect());
/*N*/ const long nWidth = Max( (long)(aRect.GetWidth() - 1), 1L );
-/*N*/
+/*N*/
/*N*/ if ( bCenter )
/*N*/ aTranslation = aRect.Center();
/*N*/ else
/*N*/ aTranslation = aRect.TopCenter();
-/*N*/
+/*N*/
/*N*/ // Punkte verschieben und Skalieren
/*N*/ for (USHORT i = 0; i < rXPoly.GetPointCount(); i++)
/*N*/ rXPoly[i] = (rXPoly[i] - aTranslation) * nNewWidth / nWidth;
-/*N*/
+/*N*/
/*N*/ long nHeight = aRect.GetHeight() * nNewWidth / nWidth;
-/*N*/
+/*N*/
/*N*/ if ( bCenter )
/*N*/ nHeight >>= 1;
-/*N*/
+/*N*/
/*N*/ return nHeight;
/*N*/ }
@@ -369,19 +369,18 @@ namespace binfilter {
//-/void XOutputDevice::SetLineAttr(const XLineAttrSetItem& rAttr)
/*N*/ void XOutputDevice::SetLineAttr(const SfxItemSet& rSet)
/*N*/ {
-/*N*/ //-/ const SfxItemSet& rSet = rAttr.GetItemSet();
-/*N*/ const BOOL bPureMtf = ( pOut->GetOutDevType() != OUTDEV_PRINTER ) && ( pOut->GetConnectMetaFile() != NULL );
-/*N*/
+/*N*/ const BOOL bPureMtf = ( pOut->GetOutDevType() != OUTDEV_PRINTER ) && ( pOut->GetConnectMetaFile() != NULL );
+/*N*/
/*N*/ aLineColor = ITEMVALUE( rSet, XATTR_LINECOLOR, XLineColorItem );
/*N*/ nLineTransparence = ITEMVALUE( rSet, XATTR_LINETRANSPARENCE, XLineTransparenceItem );
-/*N*/
+/*N*/
/*N*/ delete[] pLinePattern;
/*N*/ pLinePattern = NULL;
/*N*/ bLineStart = FALSE;
/*N*/ bLineEnd = FALSE;
/*N*/ bHair = TRUE;
/*N*/ nLineWidth = ITEMVALUE( rSet, XATTR_LINEWIDTH, XLineWidthItem );
-/*N*/
+/*N*/
/*N*/ if( bIgnoreLineAttr )
/*N*/ {
/*N*/ // fuer Linien mit Staerke Null wird im "Nur Haarlinienmodus" ein Hellgrau-Pen benutzt
@@ -396,34 +395,34 @@ namespace binfilter {
/*N*/ else
/*N*/ {
/*N*/ long nMinLineWidth = Max( nLineWidth, pOut->PixelToLogic( Size( 2, 2 ) ) .Width() );
-/*N*/
+/*N*/
/*N*/ eLineStyle = ITEMVALUE( rSet, XATTR_LINESTYLE, XLineStyleItem );
-/*N*/
+/*N*/
/*N*/ // Falls wir Linienstil ignorieren, setzen wir Linienstil auf Solid
/*N*/ if ( bIgnoreLineStyle )
/*N*/ {
/*N*/ eLineStyle = XLINE_SOLID;
/*N*/ pOut->SetLineColor( COL_BLACK );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // bei reinen Metafiles auch sehr duenne Linien als Polygone ausgeben,
/*N*/ // damit wir hier eine hoehere Genauigkeit wegen der Systemunabhaegigkeit erreichen
/*N*/ // SB: aber nicht, wenn gedruckt wird (dabei wird immer ein Metafile aufgezeichnet)
/*N*/ if ( bPureMtf )
/*N*/ nMinLineWidth /= MTF_DIVISOR;
-/*N*/
+/*N*/
/*N*/ if ( eLineStyle == XLINE_DASH )
/*N*/ {
/*N*/ USHORT i, nCnt, nDotCnt;
/*N*/ long nDotLen, nDashLen, nDistance;
/*N*/ long nMinLength = nMinLineWidth;
-/*N*/
+/*N*/
/*N*/ const XDash& rDash = ITEMVALUE( rSet, XATTR_LINEDASH, XLineDashItem );
-/*N*/
+/*N*/
/*N*/ // Sonderbehandlung fuer Haarlinien
/*N*/ if ( nLineWidth < nMinLineWidth )
/*N*/ nMinLength = 30;
-/*N*/
+/*N*/
/*N*/ nDotCnt = rDash.GetDots() << 1;
/*N*/ nLinePatternCnt = nDotCnt + ( rDash.GetDashes() << 1 ) + 1;
/*N*/ pLinePattern = new long[nLinePatternCnt];
@@ -431,7 +430,7 @@ namespace binfilter {
/*N*/ nDotLen = rDash.GetDotLen();
/*N*/ nDashLen = rDash.GetDashLen();
/*N*/ nDistance = rDash.GetDistance();
-/*N*/
+/*N*/
/*N*/ if ( rDash.GetDashStyle() == XDASH_RECTRELATIVE || rDash.GetDashStyle() == XDASH_ROUNDRELATIVE )
/*N*/ {
/*N*/ // Der Teilungsfaktor ist abhaengig davon,
@@ -442,17 +441,17 @@ namespace binfilter {
/*N*/ // Genauigkeit im Mtf bezieht sich nur auf die Breite
/*N*/ // (KA 29.09.96)
/*N*/ const long nFactor = nMinLength * ( bPureMtf ? MTF_DIVISOR : 1 );
-/*N*/
+/*N*/
/*N*/ nDotLen = nDotLen * nFactor / 100;
/*N*/ nDashLen = nDashLen * nFactor / 100;
/*N*/ nDistance = nDistance * nFactor / 100;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if ( nDotLen == 0 )
/*N*/ nDotLen = nMinLength;
/*N*/ if ( nDashLen == 0 )
/*N*/ nDashLen = nMinLength;
-/*N*/
+/*N*/
/*N*/ for (i = 0; i < nDotCnt; i += 2)
/*N*/ {
/*N*/ if ( nDotLen )
@@ -478,8 +477,8 @@ namespace binfilter {
/*N*/ else
/*N*/ pLinePattern[nCnt] = 0;
/*N*/ }
-/*N*/
-/*N*/
+/*N*/
+/*N*/
/*N*/ if ( nLineWidth < nMinLineWidth && eLineStyle == XLINE_SOLID )
/*N*/ {
/*N*/ nLineWidth = 0;
@@ -489,19 +488,19 @@ namespace binfilter {
/*N*/ {
/*N*/ bHair = FALSE;
/*N*/ pOut->SetLineColor();
-/*N*/
+/*N*/
/*N*/ if( nLineWidth < nMinLineWidth )
/*N*/ nLineWidth = 0;
/*N*/ }
/*N*/ const SfxPoolItem* pPoolItem;
-/*N*/
+/*N*/
/*N*/ // Polygon und Daten fuer Linienanfang und -ende initialisieren
/*N*/ if ( rSet.GetItemState(XATTR_LINESTART, TRUE, &pPoolItem) == SFX_ITEM_SET )
/*N*/ {
/*N*/ long nWidth = ITEMVALUE( rSet, XATTR_LINESTARTWIDTH, XLineStartWidthItem );
-/*N*/
+/*N*/
/*N*/ aLineStartPoly = ((XLineStartItem*) pPoolItem)->GetValue();
-/*N*/
+/*N*/
/*N*/ // Nur aktivieren, wenn Polygonbreite > 0
/*N*/ if ( nWidth )
/*N*/ {
@@ -522,9 +521,9 @@ namespace binfilter {
/*N*/ if ( rSet.GetItemState(XATTR_LINEEND, TRUE, &pPoolItem) == SFX_ITEM_SET )
/*N*/ {
/*N*/ long nWidth = ITEMVALUE( rSet, XATTR_LINEENDWIDTH, XLineEndWidthItem );
-/*N*/
+/*N*/
/*N*/ aLineEndPoly = ((XLineStartItem*) pPoolItem)->GetValue();
-/*N*/
+/*N*/
/*N*/ if ( nWidth )
/*N*/ {
/*N*/ // Breite negativ: Prozentwert
@@ -558,29 +557,29 @@ namespace binfilter {
/*N*/ {
/*N*/ //-/ const SfxItemSet& rSet = rAttr.GetItemSet();
/*N*/ const XFillFloatTransparenceItem& rFloatTransItem = (const XFillFloatTransparenceItem&) rSet.Get( XATTR_FILLFLOATTRANSPARENCE );
-/*N*/
+/*N*/
/*N*/ eFillStyle = bIgnoreFillAttr ? XFILL_NONE : ITEMVALUE( rSet, XATTR_FILLSTYLE, XFillStyleItem );
/*N*/ nFillTransparence = ITEMVALUE( rSet, XATTR_FILLTRANSPARENCE, XFillTransparenceItem );
-/*N*/
+/*N*/
/*N*/ // clear bitmap
/*N*/ if( eFillStyle != XFILL_BITMAP )
/*N*/ {
/*N*/ maFillBitmap.SetEmpty();
/*N*/ maFillBitmapSize.Width() = maFillBitmapSize.Height() = 0L;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ // assign transparent gradient?
/*N*/ if( ( eFillStyle != XFILL_NONE ) && ( rFloatTransItem.IsEnabled() || nFillTransparence ) )
/*N*/ {
/*N*/ XGradient aXGrad;
-/*N*/
+/*N*/
/*N*/ if( rFloatTransItem.IsEnabled() )
/*N*/ aXGrad = rFloatTransItem.GetValue();
/*N*/ else
/*N*/ {
/*N*/ const BYTE cTrans = (BYTE) ( nFillTransparence * 255 / 100 );
/*N*/ const Color aTransCol( cTrans, cTrans, cTrans );
-/*N*/
+/*N*/
/*N*/ aXGrad.SetGradientStyle( XGRAD_LINEAR );
/*N*/ aXGrad.SetStartColor( aTransCol );
/*N*/ aXGrad.SetEndColor( aTransCol );
@@ -592,7 +591,7 @@ namespace binfilter {
/*N*/ aXGrad.SetEndIntens( 100 );
/*N*/ aXGrad.SetSteps( 3 );
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if( iRotTransGradient() )
/*N*/ *iRotTransGradient() = aXGrad;
/*N*/ else
@@ -603,11 +602,11 @@ namespace binfilter {
/*N*/ delete iRotTransGradient();
/*N*/ iRotTransGradient() = NULL;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if( eFillStyle != XFILL_NONE )
/*N*/ {
/*N*/ pOut->SetFillColor( aFillColor = ITEMVALUE( rSet, XATTR_FILLCOLOR, XFillColorItem ) );
-/*N*/
+/*N*/
/*N*/ if( eFillStyle == XFILL_BITMAP )
/*N*/ {
/*N*/ MapMode aMapMode( pOut->GetMapMode() );
@@ -622,9 +621,9 @@ namespace binfilter {
/*N*/ BOOL bLogSize = ITEMVALUE( rSet, XATTR_FILLBMP_SIZELOG, SfxBoolItem );
/*N*/ Size aSize( labs( ITEMVALUE( rSet, XATTR_FILLBMP_SIZEX, SfxMetricItem ) ),
/*N*/ labs( ITEMVALUE( rSet, XATTR_FILLBMP_SIZEY, SfxMetricItem ) ) );
-/*N*/
+/*N*/
/*N*/ if( !mbRecalc && !pOut->GetConnectMetaFile() &&
-/*N*/ ( aBmp == maFillBitmap ) &&
+/*N*/ ( aBmp == maFillBitmap ) &&
/*N*/ ( pOut->GetOutDevType() == meLastOutDevType ) &&
/*N*/ ( maLastMapMode.GetMapUnit() == aMapMode.GetMapUnit() ) &&
/*N*/ ( maLastMapMode.GetScaleX() == aMapMode.GetScaleX() ) &&
@@ -646,7 +645,7 @@ namespace binfilter {
/*N*/ maFillBitmap = aBmp;
/*N*/ maLastMapMode = aMapMode;
/*N*/ meLastOutDevType = pOut->GetOutDevType();
-/*N*/
+/*N*/
/*N*/ mbBmpTile = bTile;
/*N*/ mbBmpStretch = bStretch;
/*N*/ mbBmpLogSize = bLogSize;
@@ -655,7 +654,7 @@ namespace binfilter {
/*N*/ meBmpRectPoint = eRectPoint;
/*N*/ mnBmpOffPosX = nOffPosX;
/*N*/ mnBmpOffPosY = nOffPosY;
-/*N*/
+/*N*/
/*N*/ if( bLogSize )
/*N*/ maBmpSize = aSize;
/*N*/ else
@@ -663,7 +662,7 @@ namespace binfilter {
/*N*/ mnBmpPerCentX = (USHORT) aSize.Width();
/*N*/ mnBmpPerCentY = (USHORT) aSize.Height();
/*N*/ }
-/*N*/
+/*N*/
/*N*/ mbRecalc = TRUE;
/*N*/ }
/*N*/ }
@@ -697,18 +696,18 @@ namespace binfilter {
/*N*/ void XOutputDevice::SetTextAttr(const SfxItemSet& rSet)
/*N*/ {
/*N*/ //-/ const SfxItemSet& rSet = rAttr.GetItemSet();
-/*N*/
+/*N*/
/*N*/ eFormTextStyle = ITEMVALUE( rSet, XATTR_FORMTXTSTYLE, XFormTextStyleItem );
/*N*/ eFormTextAdjust = ITEMVALUE( rSet, XATTR_FORMTXTADJUST, XFormTextAdjustItem );
/*N*/ nFormTextDistance = ITEMVALUE( rSet, XATTR_FORMTXTDISTANCE, XFormTextDistanceItem );
/*N*/ nFormTextStart = ITEMVALUE( rSet, XATTR_FORMTXTSTART, XFormTextStartItem );
/*N*/ bFormTextMirror = ITEMVALUE( rSet, XATTR_FORMTXTMIRROR, XFormTextMirrorItem );
-/*N*/
+/*N*/
/*N*/ // Neu ab 27.06.95 ESO
/*N*/ bFormTextOutline = ITEMVALUE( rSet, XATTR_FORMTXTOUTLINE, XFormTextOutlineItem );
/*N*/ eFormTextShadow = ITEMVALUE( rSet, XATTR_FORMTXTSHADOW, XFormTextShadowItem );
/*N*/ aFormTextShdwColor = ITEMVALUE( rSet, XATTR_FORMTXTSHDWCOLOR, XFormTextShadowColorItem );
-/*N*/
+/*N*/
/*N*/ // Neu ab 09.11.95 KA
/*N*/ nFormTextShdwTransp = ITEMVALUE( rSet, XATTR_FORMTXTSHDWTRANSP, XFormTextShadowTranspItem );
/*N*/ nFormTextShdwXVal = ITEMVALUE( rSet, XATTR_FORMTXTSHDWXVAL, XFormTextShadowXValItem );
diff --git a/binfilter/inc/bf_starmath/xchar.hxx b/binfilter/inc/bf_starmath/xchar.hxx
deleted file mode 100644
index ac9004c..0000000
--- a/binfilter/inc/bf_starmath/xchar.hxx
+++ /dev/null
@@ -1,109 +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 XCHAR_HXX
-#define XCHAR_HXX
-
-
-#include <tools/gen.hxx>
-#include <vcl/outdev.hxx>
-#include <tools/poly.hxx>
-#include <bf_svx/xpoly.hxx>
-
-
-#include "rect.hxx"
-namespace binfilter {
-
-
-
-
-////////////////////////////////////////
-// SmPolygon
-//
-
-class SmPolygonLoader;
-
-class SmPolygon
-{
- friend class SmPolygonLoader;
-
- XPolyPolygon aPoly;
- Rectangle aBoundRect; // das umgebende Rechteck (ohne Rand!)
- // wie von OutputDevice::GetBoundRect
- Size aFontSize; // vom Originalzeichen (Width != 0 aus FontMetric)
- Point aPos;
- Size aOrigSize; // Originalgröße (des BoundRect)
- Point aOrigPos; // Offset des BoundRect im Originalzeichen
-
- double fScaleX, // Skalierungsfaktoren der aktuellen (gewollten)
- fScaleY, // Größe gegenüber der Originalgröße
-
- fDelayedFactorX, // dienen zum sammeln der Änderungen
- fDelayedFactorY; // bis tatsächlich skaliert wird
-
- sal_Unicode cChar;
- BOOL bDelayedScale,
- bDelayedBoundRect;
-
- void Scale();
-
-public:
- SmPolygon();
- SmPolygon(sal_Unicode cChar);
- // default copy-constructor verwenden
-
- const Size & GetOrigFontSize() const { return aFontSize; };
- const Size & GetOrigSize() const { return aOrigSize; }
- const Point & GetOrigPos() const { return aOrigPos; }
-
- void ScaleBy(double fFactorX, double fFactorY);
- double GetScaleX() const { return fScaleX * fDelayedFactorX; }
- double GetScaleY() const { return fScaleY * fDelayedFactorY; }
-
- void AdaptToX(const OutputDevice &rDev, ULONG nWidth);
- void AdaptToY(const OutputDevice &rDev, ULONG nHeight);
-
- void Move (const Point &rPoint);
- void MoveTo(const Point &rPoint) { Move(rPoint - aPos); }
-
- const sal_Unicode GetChar() const { return cChar; }
- const Rectangle & GetBoundRect(const OutputDevice &rDev) const;
-
-
- // default assignment-operator verwenden
-
- friend SvStream & operator >> (SvStream &rIStream, SmPolygon &rPoly);
- friend SvStream & operator << (SvStream &rOStream, const SmPolygon &rPoly);
-};
-
-
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_svx/svdedtv.hxx b/binfilter/inc/bf_svx/svdedtv.hxx
index b2e9a66..02be56e 100644
--- a/binfilter/inc/bf_svx/svdedtv.hxx
+++ b/binfilter/inc/bf_svx/svdedtv.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -35,8 +35,6 @@
#include <bf_svx/svdmrkv.hxx>
-#include <bf_svx/xpoly.hxx>
-
#include <bf_svx/svdmodel.hxx>
namespace binfilter {
diff --git a/binfilter/inc/bf_svx/svdhdl.hxx b/binfilter/inc/bf_svx/svdhdl.hxx
index af2bc3f..6dfa4f3 100644
--- a/binfilter/inc/bf_svx/svdhdl.hxx
+++ b/binfilter/inc/bf_svx/svdhdl.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -37,14 +37,14 @@
#include <bf_svtools/solar.hrc>
-#include <bf_svx/xpoly.hxx>
#include <bf_svx/svdoedge.hxx>
+
class VirtualDevice;
class OutputDevice;
class Region;
class Window;
-namespace binfilter {
+namespace binfilter {
class SdrHdlList;
class SdrObject;
@@ -64,7 +64,7 @@ class SdrMarkView;
// Modus selektiert wird.
// HDL_MOVE...HDL_LWRGT muessen im enum immer zusammen stehen bleiben!
-enum SdrHdlKind
+enum SdrHdlKind
{
HDL_MOVE, // Handle zum Verschieben des Objekts
HDL_UPLFT, // Oben links
diff --git a/binfilter/inc/bf_svx/svdobj.hxx b/binfilter/inc/bf_svx/svdobj.hxx
index bf63eec..8c61271 100644
--- a/binfilter/inc/bf_svx/svdobj.hxx
+++ b/binfilter/inc/bf_svx/svdobj.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -73,7 +73,6 @@ class SfxPoolItem;
//************************************************************
class ExtOutputDevice;
-//class ImpSdrMtfAnimator;
class OutlinerParaObject;
class SdrOutliner;
class SdrDragStat;
@@ -94,7 +93,6 @@ class SdrVirtObj;
class XFillAttrSetItem;
class XLineAttrSetItem;
class XPolyPolygon;
-class XPolygon;
class XTextAttrSetItem;
class SdrLineGeometry;
@@ -643,7 +641,7 @@ public:
CreateLinePoly().
@param rXOut
- Output device that specifies required resolution
+ Output device that specifies required resolution
@param rSet
Item set attributing the line style
@@ -655,11 +653,11 @@ public:
transfers to the caller.
*/
::std::auto_ptr< SdrLineGeometry > ImpPrepareLineGeometry(ExtOutputDevice& rXOut, const SfxItemSet& rSet, BOOL bIsLineDraft = FALSE) const;
- void ImpDrawLineGeometry( ExtOutputDevice& rXOut,
- Color& rColor,
- sal_uInt16 nTransparence,
+ void ImpDrawLineGeometry( ExtOutputDevice& rXOut,
+ Color& rColor,
+ sal_uInt16 nTransparence,
SdrLineGeometry& rLineGeometry,
- sal_Int32 nDX=0,
+ sal_Int32 nDX=0,
sal_Int32 nDY=0 ) const;
void ImpDrawColorLineGeometry(ExtOutputDevice& rXOut, const SfxItemSet& rSet, SdrLineGeometry& rLineGeometry) const;
/** Line geometry creation and output (used during Paint())
@@ -668,7 +666,7 @@ public:
SdrLineGeometry is opaque here.
@param rOut
- Output device that specifies required resolution
+ Output device that specifies required resolution
@param bForceOnePixel
Force generated line geometry to be a hair line of one pixel width (in device resolution)
@@ -684,9 +682,9 @@ public:
@return the generated line geometry. Ownership of the pointer
transfers to the caller.
*/
- virtual ::std::auto_ptr< SdrLineGeometry > CreateLinePoly( OutputDevice& rOut,
- BOOL bForceOnePixel,
- BOOL bForceTwoPixel,
+ virtual ::std::auto_ptr< SdrLineGeometry > CreateLinePoly( OutputDevice& rOut,
+ BOOL bForceOnePixel,
+ BOOL bForceTwoPixel,
BOOL bIsLineDraft ) const;
// HitTest, 2. Stufe. nTol ist die zulaessige Toleranz in logischen Einheiten.
diff --git a/binfilter/inc/bf_svx/svdopath.hxx b/binfilter/inc/bf_svx/svdopath.hxx
index fed4951..de2a47f 100644
--- a/binfilter/inc/bf_svx/svdopath.hxx
+++ b/binfilter/inc/bf_svx/svdopath.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -31,16 +31,9 @@
#include <bf_svx/svdotext.hxx>
-#include <bf_svx/xpoly.hxx>
namespace binfilter {
//************************************************************
-// Vorausdeklarationen
-//************************************************************
-
-class XPolyPolygon;
-
-//************************************************************
// Defines
//************************************************************
@@ -109,10 +102,6 @@ public:
virtual void NbcSetSnapRect(const Rectangle& rRect);
virtual void TakeContour(XPolyPolygon& rPoly) const;
-
-
-
-
virtual void NbcMove(const Size& aSize);
virtual void NbcResize(const Point& rRefPnt, const Fraction& aXFact, const Fraction& aYFact);
virtual void NbcRotate(const Point& rRefPnt, long nAngle, double fSin, double fCos);
@@ -179,17 +168,17 @@ public:
////////////////////////////////////////////////////////////////////////////////////////////////////
//
- // transformation interface for StarOfficeAPI. This implements support for
+ // transformation interface for StarOfficeAPI. This implements support for
// homogen 3x3 matrices containing the transformation of the SdrObject. At the
- // moment it contains a shearX, rotation and translation, but for setting all linear
+ // moment it contains a shearX, rotation and translation, but for setting all linear
// transforms like Scale, ShearX, ShearY, Rotate and Translate are supported.
//
////////////////////////////////////////////////////////////////////////////////////////////////////
// gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon
// with the base geometry and returns TRUE. Otherwise it returns FALSE.
virtual BOOL TRGetBaseGeometry(Matrix3D& rMat, XPolyPolygon& rPolyPolygon) const;
- // sets the base geometry of the object using infos contained in the homogen 3x3 matrix.
- // If it's an SdrPathObj it will use the provided geometry information. The Polygon has
+ // sets the base geometry of the object using infos contained in the homogen 3x3 matrix.
+ // If it's an SdrPathObj it will use the provided geometry information. The Polygon has
// to use (0,0) as upper left and will be scaled to the given size in the matrix.
virtual void TRSetBaseGeometry(const Matrix3D& rMat, const XPolyPolygon& rPolyPolygon);
};
diff --git a/binfilter/inc/bf_svx/svdosmrt.hxx b/binfilter/inc/bf_svx/svdosmrt.hxx
index 2328928..2912b2b 100644
--- a/binfilter/inc/bf_svx/svdosmrt.hxx
+++ b/binfilter/inc/bf_svx/svdosmrt.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -29,8 +29,6 @@
#ifndef _SVDSMRT_HXX
#define _SVDSMRT_HXX
-#include <bf_svx/xpoly.hxx>
-
#include <bf_svx/svdosmev.hxx>
class SvStream;
namespace binfilter {
@@ -387,10 +385,6 @@ public:
SdrSmartDragPointList aDragPoints;
bool bAnimated;
ULONG nTimerStep;
-// AutoTimer aAnimator;
-// SdrPathObj* pPathObj;
-//private:
-// DECL_LINK(AniHdl,AutoTimer*);
public:
SdrObjSmartData();
~SdrObjSmartData();
diff --git a/binfilter/inc/bf_svx/unoshape.hxx b/binfilter/inc/bf_svx/unoshape.hxx
index a918fc6..37f782b 100644
--- a/binfilter/inc/bf_svx/unoshape.hxx
+++ b/binfilter/inc/bf_svx/unoshape.hxx
@@ -58,6 +58,7 @@
#include <cppuhelper/implbase11.hxx>
#include <bf_svx/unoprov.hxx>
+
class SvGlobalName;
namespace binfilter {
class SfxItemSet;
@@ -252,6 +253,7 @@ class SvxShape : public cppu::WeakAggImplHelper11<
virtual sal_Int16 SAL_CALL resetActionLocks( ) throw (::com::sun::star::uno::RuntimeException);
};
}//end of namespace binfilter
+
#include <bf_svx/unotext.hxx>
namespace binfilter {
class SvxShapeText : public SvxShape, public SvxUnoTextBase
@@ -305,6 +307,7 @@ virtual void SAL_CALL release() throw();
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
};
}//end of namespace binfilter
+
#include <com/sun/star/drawing/XShapes.hpp>
#include <com/sun/star/drawing/XShapeGroup.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
@@ -406,6 +409,7 @@ virtual void SAL_CALL disconnectBegin( const ::com::sun::star::uno::Reference< :
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException);
};
}//end of namespace binfilter
+
#include <com/sun/star/drawing/XControlShape.hpp>
namespace binfilter {
/***********************************************************************
@@ -485,6 +489,7 @@ public:
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
};
}//end of namespace binfilter
+
#include <bf_svx/xpoly.hxx>
namespace binfilter {
diff --git a/binfilter/inc/bf_svx/xlineit.hxx b/binfilter/inc/bf_svx/xlineit.hxx
index 595aa69..5f83701 100644
--- a/binfilter/inc/bf_svx/xlineit.hxx
+++ b/binfilter/inc/bf_svx/xlineit.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -29,33 +29,15 @@
#ifndef _SVX_XLINIIT_HXX
#define _SVX_XLINIIT_HXX
-#include <bf_svx/xit.hxx>
-#include <bf_svx/xcolit.hxx>
-
-#include <bf_svx/xpoly.hxx>
-#include <bf_svx/xenum.hxx>
-
-#include <bf_svtools/metitem.hxx>
-
-#include <bf_svtools/eitem.hxx>
-
-class SvStream;
-
-namespace binfilter {
-class XDash;
-class XDashTable;
-}//end of namespace binfilter
-
-#include <bf_svx/xdash.hxx>
+#include <bf_svx/xlnedit.hxx>
+#include <bf_svx/xlnedcit.hxx>
+#include <bf_svx/xlnstcit.hxx>
+#include <bf_svx/xlnstit.hxx>
+#include <bf_svx/xlnstwit.hxx>
#include <bf_svx/xlndsit.hxx>
#include <bf_svx/xlnwtit.hxx>
#include <bf_svx/xlnclit.hxx>
-#include <bf_svx/xlnstit.hxx>
-#include <bf_svx/xlnedit.hxx>
-#include <bf_svx/xlnstwit.hxx>
#include <bf_svx/xlnedwit.hxx>
-#include <bf_svx/xlnstcit.hxx>
-#include <bf_svx/xlnedcit.hxx>
#endif
diff --git a/binfilter/inc/bf_svx/xlnedit.hxx b/binfilter/inc/bf_svx/xlnedit.hxx
index 0fc89d6..ae8c512 100644
--- a/binfilter/inc/bf_svx/xlnedit.hxx
+++ b/binfilter/inc/bf_svx/xlnedit.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
diff --git a/binfilter/inc/bf_svx/xoutx.hxx b/binfilter/inc/bf_svx/xoutx.hxx
index ce0b9ea..2a5e9e2 100644
--- a/binfilter/inc/bf_svx/xoutx.hxx
+++ b/binfilter/inc/bf_svx/xoutx.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -38,6 +38,7 @@
#include <bf_svx/xenum.hxx>
#include <vcl/outdev.hxx>
#include <vcl/bitmap.hxx>
+
namespace binfilter {
class SfxItemSet;
class BfGraphicObject;
@@ -180,18 +181,10 @@ protected:
void DrawLinePolygon( const Polygon& rPoly, BOOL bClosePoly );
// #101498# changed interface due to bidi requirements
- sal_Int32 ImpDrawFormText(DrawPortionInfo* pInfo, const Polygon& rPoly, sal_Int32 nAbsStart,
+ sal_Int32 ImpDrawFormText(DrawPortionInfo* pInfo, const Polygon& rPoly, sal_Int32 nAbsStart,
sal_Bool bToLastPoint, sal_Bool bDraw, sal_Bool bIsShadow);
- void ImpDrawFormTextShadow(DrawPortionInfo* pInfo, const Polygon& rPoly, sal_Int32 nAbsStart,
+ void ImpDrawFormTextShadow(DrawPortionInfo* pInfo, const Polygon& rPoly, sal_Int32 nAbsStart,
sal_Bool bToLastPoint, sal_Bool bDraw);
- //long ImpDrawFormText(const String& rText, const Polygon& rPoly,
- // Font aFont, long nAbsStart, BOOL bIsShadow,
- // BOOL bToLastPoint, BOOL bDraw,
- // const long* pDXArray = NULL);
- //void DrawFormTextShadow(const String& rText, const Polygon& rPoly,
- // const Font& rFont, long nAbsStart,
- // BOOL bToLastPoint, BOOL bDraw,
- // const long* pDXArray = NULL);
/*N*/ void ImpDrawTiledBitmap( OutputDevice* pOut, const Rectangle& rRect,
/*N*/ const Point& rStartPoint, const Rectangle& rClipRect,
@@ -228,17 +221,9 @@ protected:
// #101498# changed interface due to bidi requirements
sal_Int32 DrawFormText(DrawPortionInfo* pInfo, const Polygon& rPoly,
- sal_Int32 nAbsStart = 0L, sal_Bool bToLastPoint = sal_True,
+ sal_Int32 nAbsStart = 0L, sal_Bool bToLastPoint = sal_True,
sal_Bool bDraw = sal_True);
- // #101498# XPolygon version of DrawFormText not used, removed.
- // Difference was only to change XPolygon to Polygon using
- // XOutCreatePolygon(...)
- //long DrawFormText(const String& rText, const XPolygon& rXPoly,
- // Font aFont, long nAbsStart = 0,
- // BOOL bToLastPoint = TRUE, BOOL bDraw = TRUE,
- // const long* pDXArray = NULL);
-
const Rectangle& GetFormTextBoundRect() const { return aFormTextBoundRect; }
// Nur Temporaer
@@ -282,7 +267,7 @@ protected:
};
// Nur aus Kompatibilitaetsgruenden fuer SvDraw
-class ExtOutputDevice : public XOutputDevice
+class ExtOutputDevice : public XOutputDevice
{
public:
@@ -301,8 +286,6 @@ long XOutCalcBezierStepCount( const XPolygon& rXPoly, USHORT nIndex, OutputDev
void XOutCalcBezier( const XPolygon& rXPoly, USHORT nBezIndex, Polygon& rPoly, USHORT nPolyIndex, long nSteps );
Polygon XOutCreatePolygon( const XPolygon& rXPoly, OutputDevice* pOut, USHORT nRough = 0 );
Polygon XOutCreatePolygonBezier( const XPolygon& rXPoly, OutputDevice* pOut );
-// #102382# Remove XOutGetCharOutline
-//XPolyPolygon XOutGetCharOutline( USHORT nChar, OutputDevice& rOut, BOOL bOptimizeSize = TRUE );
}//end of namespace binfilter
#endif // _XOUTX_HXX
diff --git a/binfilter/inc/bf_svx/xpolyimp.hxx b/binfilter/inc/bf_svx/xpolyimp.hxx
index 2a1267b..3e61601 100644
--- a/binfilter/inc/bf_svx/xpolyimp.hxx
+++ b/binfilter/inc/bf_svx/xpolyimp.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
diff --git a/binfilter/inc/bf_svx/xtable.hxx b/binfilter/inc/bf_svx/xtable.hxx
index 74c654e..e5074b1 100644
--- a/binfilter/inc/bf_svx/xtable.hxx
+++ b/binfilter/inc/bf_svx/xtable.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
commit 2a934478ed4e1a892b8d844d9b3c437f9f381cda
Author: Joseph Powers <jpowers27 at cox.net>
Date: Thu Jan 20 19:58:40 2011 -0800
Remove DECLARE_LIST(ViewList,OutlinerView*)
diff --git a/binfilter/inc/bf_svx/outliner.hxx b/binfilter/inc/bf_svx/outliner.hxx
index 664fe6f..66733db 100644
--- a/binfilter/inc/bf_svx/outliner.hxx
+++ b/binfilter/inc/bf_svx/outliner.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -50,6 +50,7 @@ namespace com { namespace sun { namespace star { namespace linguistic2 {
class XSpellChecker1;
class XHyphenator;
}}}}
+
class SvStream;
class Window;
class KeyEvent;
@@ -58,6 +59,7 @@ class Pointer;
class MapMode;
class OutputDevice;
class PolyPolygon;
+
namespace binfilter {
class SvKeyValueIterator;
@@ -85,16 +87,6 @@ class SvxLRSpaceItem;
class EditEngine;
class SvxForbiddenCharactersTable;
-//STRIP008 #include <com/sun/star/uno/Reference.h>
-//STRIP008
-//STRIP008 #include <rtl/ref.hxx>
-//STRIP008 #include <bf_svx/svxfont.hxx>
-//STRIP008
-//STRIP008 namespace com { namespace sun { namespace star { namespace linguistic2 {
-//STRIP008 class XSpellChecker1;
-//STRIP008 class XHyphenator;
-//STRIP008 }}}}
-
// nur interner Gebrauch!
#define PARAFLAG_DROPTARGET 0x1000
#define PARAFLAG_DROPTARGET_EMPTY 0x2000
@@ -209,27 +201,15 @@ private:
};
MouseTarget OLD_ePrevMouseTarget;
-#ifdef _OUTLINER_CXX
-
-
-
-
-
-#endif
-
public:
virtual ~OutlinerView();
EditView& GetEditView() const { return *pEditView; }
-
-
-
Outliner* GetOutliner() const { return pOwner; }
Window* GetWindow() const;
-
Rectangle GetOutputArea() const;
Rectangle GetVisArea() const;
@@ -242,16 +222,9 @@ public:
ESelection GetSelection();
-
void SetSelection( const ESelection& );
};
-#if _SOLAR__PRIVATE
-DECLARE_LIST(ViewList,OutlinerView*)
-#else
-typedef List ViewList;
-#endif
-
class DrawPortionInfo
{
public:
@@ -274,9 +247,9 @@ public:
BYTE GetBiDiLevel() const { return mnBiDiLevel; }
sal_Bool IsRTL() const;
- DrawPortionInfo( const Point& rPos, const String& rTxt, USHORT nTxtStart, USHORT nTxtLen,
- const SvxFont& rFnt, USHORT nPar, xub_StrLen nIdx, const sal_Int32* pDXArr, BYTE nBiDiLevel)
- : rStartPos(rPos), rText(rTxt), rFont(rFnt), nPara(nPar), nIndex(nIdx),
+ DrawPortionInfo( const Point& rPos, const String& rTxt, USHORT nTxtStart, USHORT nTxtLen,
+ const SvxFont& rFnt, USHORT nPar, xub_StrLen nIdx, const sal_Int32* pDXArr, BYTE nBiDiLevel)
+ : rStartPos(rPos), rText(rTxt), rFont(rFnt), nPara(nPar), nIndex(nIdx),
pDXArray(pDXArr), mnBiDiLevel(nBiDiLevel)
{
nTextStart = nTxtStart;
@@ -377,7 +350,6 @@ class Outliner
OutlinerEditEng* pEditEngine;
ParagraphList* pParaList;
- ViewList aViewList;
Paragraph* pHdlParagraph;
Link aDrawPortionHdl;
@@ -507,8 +479,6 @@ public:
Paragraph* GetParagraph( ULONG nAbsPos ) const;
BOOL HasParent( Paragraph* pParagraph ) const;
-// Paragraph* GetParagraph( Paragraph* pParent, ULONG nRelPos ) const;
-// ULONG GetRelPos( Paragraph* pParent, Paragraph* pPara ) const;
ULONG GetAbsPos( Paragraph* pPara );
USHORT GetDepth( USHORT nPara ) const;
@@ -567,7 +537,6 @@ public:
Link GetStatusEventHdl() const;
-
const Size& GetPaperSize() const;
void SetPaperSize( const Size& rSize );
@@ -582,23 +551,19 @@ public:
void SetDefTab( USHORT nTab );
-
-
BOOL IsForceAutoColor() const;
EBulletInfo GetBulletInfo( USHORT nPara );
-
void StripPortions();
// #101498#
- virtual void DrawingText( const Point& rStartPos, const String& rText, USHORT nTextStart, USHORT nTextLen,
+ virtual void DrawingText( const Point& rStartPos, const String& rText, USHORT nTextStart, USHORT nTextLen,
const sal_Int32* pDXArray, const SvxFont& rFont,
USHORT nPara, xub_StrLen nIndex, BYTE nRightToLeft);
Size CalcTextSize();
-
void SetStyleSheetPool( SfxStyleSheetPool* pSPool );
SfxStyleSheetPool* GetStyleSheetPool();
@@ -608,7 +573,6 @@ public:
void SetParaAttribs( ULONG nPara, const SfxItemSet&, bool bApiCall = false );
SfxItemSet GetParaAttribs( ULONG nPara );
-
// gibt ein Array mit den Bulletbreiten der n Einrueckebenen
// zurueck. Letzter Wert muss -1 sein. Wird vom Outliner geloescht.
Link GetWidthArrReqHdl() const{ return aWidthArrReqHdl; }
@@ -652,10 +616,8 @@ public:
// Depricated
void SetDefaultLanguage( LanguageType eLang );
-
// Depricated
-
void SetEditTextObjectPool( SfxItemPool* pPool );
SfxItemPool* GetEditTextObjectPool() const;
More information about the Libreoffice-commits
mailing list