diff options
Diffstat (limited to 'svx/source/svdraw')
77 files changed, 3857 insertions, 3877 deletions
diff --git a/svx/source/svdraw/ActionDescriptionProvider.cxx b/svx/source/svdraw/ActionDescriptionProvider.cxx index 22385de66090..f88ab5e8ba61 100644..100755 --- a/svx/source/svdraw/ActionDescriptionProvider.cxx +++ b/svx/source/svdraw/ActionDescriptionProvider.cxx @@ -29,14 +29,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "ActionDescriptionProvider.hxx" -#include "svdglob.hxx" -#include "svdstr.hrc" +#include "svx/ActionDescriptionProvider.hxx" +#include "svx/svdglob.hxx" +#include "svx/svdstr.hrc" ::rtl::OUString ActionDescriptionProvider::createDescription( ActionType eActionType , const ::rtl::OUString& rObjectName ) { - USHORT nResID=0; + sal_uInt16 nResID=0; switch( eActionType ) { case INSERT: diff --git a/svx/source/svdraw/clonelist.cxx b/svx/source/svdraw/clonelist.cxx index e746a257b3d2..e746a257b3d2 100644..100755 --- a/svx/source/svdraw/clonelist.cxx +++ b/svx/source/svdraw/clonelist.cxx diff --git a/svx/source/svdraw/gradtrns.cxx b/svx/source/svdraw/gradtrns.cxx index 28c590219ba7..28c590219ba7 100644..100755 --- a/svx/source/svdraw/gradtrns.cxx +++ b/svx/source/svdraw/gradtrns.cxx diff --git a/svx/source/svdraw/gradtrns.hxx b/svx/source/svdraw/gradtrns.hxx index 4d9e826580cf..4d9e826580cf 100644..100755 --- a/svx/source/svdraw/gradtrns.hxx +++ b/svx/source/svdraw/gradtrns.hxx diff --git a/svx/source/svdraw/impgrfll.cxx b/svx/source/svdraw/impgrfll.cxx index 3afdd35faee2..55d221386d23 100644..100755 --- a/svx/source/svdraw/impgrfll.cxx +++ b/svx/source/svdraw/impgrfll.cxx @@ -43,12 +43,12 @@ void ImpCalcBmpFillSizes( Size& rStartOffset, const Size& rBmpSize, const Size& rBmpPerCent, const Size& rBmpOffPerCent, - BOOL bBmpLogSize, - BOOL bBmpTile, - BOOL bBmpStretch, + sal_Bool bBmpLogSize, + sal_Bool bBmpTile, + sal_Bool bBmpStretch, RECT_POINT eBmpRectPoint ) { - BOOL bOriginalSize = FALSE, bScaleSize = FALSE; + 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 @@ -58,16 +58,16 @@ void ImpCalcBmpFillSizes( Size& rStartOffset, if( bBmpLogSize ) { if( !rBmpSize.Width() && !rBmpSize.Height() ) - bOriginalSize = TRUE; + bOriginalSize = sal_True; else if( !rBmpSize.Width() || !rBmpSize.Height() ) - bScaleSize = TRUE; + bScaleSize = sal_True; } else { if( !rBmpPerCent.Width() && !rBmpPerCent.Height() ) - bOriginalSize = TRUE; + bOriginalSize = sal_True; else if( !rBmpPerCent.Width() || !rBmpPerCent.Height() ) - bScaleSize = TRUE; + bScaleSize = sal_True; } // entweder Originalgroesse oder angepasste Groesse diff --git a/svx/source/svdraw/makefile.mk b/svx/source/svdraw/makefile.mk deleted file mode 100644 index 514c5b6d2cbc..000000000000 --- a/svx/source/svdraw/makefile.mk +++ /dev/null @@ -1,124 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=svx -TARGET=svdraw -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -LIB1TARGET= $(SLB)$/$(TARGET)-core.lib -LIB1OBJFILES= \ - $(SLO)$/svdxcgv.obj \ - $(SLO)$/svdmodel.obj \ - $(SLO)$/svdpage.obj \ - $(SLO)$/svdobj.obj \ - $(SLO)$/svdedtv1.obj \ - $(SLO)$/svdcrtv.obj \ - $(SLO)$/svdograf.obj \ - $(SLO)$/svdoole2.obj \ - $(SLO)$/svdhdl.obj \ - $(SLO)$/svdmrkv.obj \ - $(SLO)$/svdogrp.obj \ - $(SLO)$/svdotxln.obj \ - $(SLO)$/svdotextdecomposition.obj \ - $(SLO)$/svdotextpathdecomposition.obj \ - $(SLO)$/svdouno.obj \ - $(SLO)$/svdpagv.obj \ - $(SLO)$/svddrgmt.obj \ - $(SLO)$/svdpntv.obj \ - $(SLO)$/svdsnpv.obj \ - $(SLO)$/svdview.obj \ - $(SLO)$/svdtext.obj \ - $(SLO)$/svdoashp.obj \ - $(SLO)$/svdoattr.obj \ - $(SLO)$/svdotext.obj \ - $(SLO)$/svdotxat.obj \ - $(SLO)$/svdotxdr.obj \ - $(SLO)$/svdotxed.obj \ - $(SLO)$/svdotxfl.obj \ - $(SLO)$/svdotxtr.obj \ - $(SLO)$/svdorect.obj \ - $(SLO)$/svdoedge.obj \ - $(SLO)$/svdomeas.obj \ - $(SLO)$/svdopath.obj \ - $(SLO)$/svdocapt.obj \ - $(SLO)$/svdocirc.obj \ - $(SLO)$/svdopage.obj \ - $(SLO)$/svdoutl.obj \ - $(SLO)$/svdovirt.obj \ - $(SLO)$/svdoutlinercache.obj \ - $(SLO)$/gradtrns.obj \ - $(SLO)$/svdattr.obj \ - $(SLO)$/svddrag.obj \ - $(SLO)$/svddrgv.obj \ - $(SLO)$/svdedtv2.obj \ - $(SLO)$/svdedxv.obj \ - $(SLO)$/svdetc.obj \ - $(SLO)$/sdrhittesthelper.obj \ - $(SLO)$/svdfmtf.obj \ - $(SLO)$/svdglev.obj \ - $(SLO)$/svdglue.obj \ - $(SLO)$/svdhlpln.obj \ - $(SLO)$/svditer.obj \ - $(SLO)$/svdlayer.obj \ - $(SLO)$/svdmark.obj \ - $(SLO)$/svdmrkv1.obj \ - $(SLO)$/sdrcomment.obj \ - $(SLO)$/sdrmasterpagedescriptor.obj \ - $(SLO)$/sdrpagewindow.obj \ - $(SLO)$/sdrpaintwindow.obj \ - $(SLO)$/svdpoev.obj \ - $(SLO)$/svdtrans.obj \ - $(SLO)$/svdundo.obj \ - $(SLO)$/svdviter.obj \ - $(SLO)$/clonelist.obj \ - $(SLO)$/svdedtv.obj \ - $(SLO)$/selectioncontroller.obj \ - $(SLO)$/polypolygoneditor.obj \ - $(SLO)$/svdibrow.obj \ - $(SLO)$/svdomedia.obj - -LIB2TARGET= $(SLB)$/$(TARGET).lib -LIB2OBJFILES= \ - $(SLO)$/ActionDescriptionProvider.obj \ - $(SLO)$/impgrfll.obj - -SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES) - -SRS1NAME=svdstr -SRC1FILES= svdstr.src - -.INCLUDE : target.mk diff --git a/svx/source/svdraw/polypolygoneditor.cxx b/svx/source/svdraw/polypolygoneditor.cxx index f92f6e67454f..f92f6e67454f 100644..100755 --- a/svx/source/svdraw/polypolygoneditor.cxx +++ b/svx/source/svdraw/polypolygoneditor.cxx diff --git a/svx/source/svdraw/sdrcomment.cxx b/svx/source/svdraw/sdrcomment.cxx index 989c6c20d6ed..989c6c20d6ed 100644..100755 --- a/svx/source/svdraw/sdrcomment.cxx +++ b/svx/source/svdraw/sdrcomment.cxx diff --git a/svx/source/svdraw/sdrhittesthelper.cxx b/svx/source/svdraw/sdrhittesthelper.cxx index 6d0f9dafc751..6d0f9dafc751 100644..100755 --- a/svx/source/svdraw/sdrhittesthelper.cxx +++ b/svx/source/svdraw/sdrhittesthelper.cxx diff --git a/svx/source/svdraw/sdrmasterpagedescriptor.cxx b/svx/source/svdraw/sdrmasterpagedescriptor.cxx index 015367fe7a8e..015367fe7a8e 100644..100755 --- a/svx/source/svdraw/sdrmasterpagedescriptor.cxx +++ b/svx/source/svdraw/sdrmasterpagedescriptor.cxx diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx index 7aa3af64536d..5630043039f4 100644..100755 --- a/svx/source/svdraw/sdrpagewindow.cxx +++ b/svx/source/svdraw/sdrpagewindow.cxx @@ -40,7 +40,7 @@ #include <svx/svdpage.hxx> #include <svx/svdview.hxx> #include <svx/svdpagv.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svx/sdr/contact/objectcontactofpageview.hxx> #include <svx/sdr/contact/displayinfo.hxx> #include <osl/mutex.hxx> @@ -80,8 +80,8 @@ using namespace ::com::sun::star; // , thus it seems not necessary to make // it visible her at all. // #58917# Das Show darf nicht am VCL-Fenster landen, weil dann Assertion vom SFX - // BOOL bVis = pWindow->IsVisible(); - // xC->setVisible(TRUE); + // sal_Bool bVis = pWindow->IsVisible(); + // xC->setVisible(sal_True); // if ( !bVis ) // pWindow->Hide(); // if( !mxContext.is() && bVisible ) @@ -193,6 +193,10 @@ void SdrPageWindow::PrePaint() } } +void SdrPageWindow::PostPaint() +{ +} + void SdrPageWindow::PrepareRedraw(const Region& rReg) { // evtl. give OC the chance to do ProcessDisplay preparations diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx index 27e812d2a947..98e28a0c3eaa 100644..100755 --- a/svx/source/svdraw/sdrpaintwindow.cxx +++ b/svx/source/svdraw/sdrpaintwindow.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svx/sdr/overlay/overlaymanagerbuffered.hxx> #include <svx/svdpntv.hxx> #include <vcl/gdimtf.hxx> diff --git a/svx/source/svdraw/selectioncontroller.cxx b/svx/source/svdraw/selectioncontroller.cxx index 3b2d93696b3a..3b2d93696b3a 100644..100755 --- a/svx/source/svdraw/selectioncontroller.cxx +++ b/svx/source/svdraw/selectioncontroller.cxx diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 06d6df2339ff..dcab84f3de01 100644..100755 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -55,11 +55,11 @@ #include <svx/svxids.hrc> #include <svx/xtable.hxx> // fuer RGB_Color() -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdmodel.hxx> // fuer DEGREE_CHAR #include <svx/svdtrans.hxx> -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" #include <svx/sdgcpitm.hxx> #include <editeng/adjitem.hxx> #include <svx/sdtfchim.hxx> @@ -300,11 +300,11 @@ SdrItemPool::SdrItemPool( SvxBoxInfoItem* pBoxInfoItem = new SvxBoxInfoItem( SDRATTR_TABLE_BORDER_INNER ); - pBoxInfoItem->SetTable( TRUE ); - pBoxInfoItem->SetDist( TRUE); // Abstandsfeld immer anzeigen -// pBoxInfoItem->SetMinDist( TRUE );// Minimalgroesse in Tabellen und Absaetzen setzen + pBoxInfoItem->SetTable( sal_True ); + pBoxInfoItem->SetDist( sal_True); // Abstandsfeld immer anzeigen +// pBoxInfoItem->SetMinDist( sal_True );// Minimalgroesse in Tabellen und Absaetzen setzen // pBoxInfoItem->SetDefDist( MIN_BORDER_DIST );// Default-Abstand immer setzen - pBoxInfoItem->SetValid( VALID_DISABLE, TRUE ); // Einzelne Linien koennen nur in Tabellen DontCare-Status haben + pBoxInfoItem->SetValid( VALID_DISABLE, sal_True ); // Einzelne Linien koennen nur in Tabellen DontCare-Status haben mppLocalPoolDefaults[ SDRATTR_TABLE_BORDER_INNER - SDRATTR_START ] = pBoxInfoItem; // mppLocalPoolDefaults[ SDRATTR_TABLE_BORDER_SHADOW - SDRATTR_START ] = new SvxShadowItem( SDRATTR_TABLE_BORDER_SHADOW ); @@ -330,7 +330,7 @@ SdrItemPool::SdrItemPool( /************************************************************************* |* |* copy ctor, sorgt dafuer, dass die static defaults gecloned werden -|* (Parameter 2 = TRUE) +|* (Parameter 2 = sal_True) |* \************************************************************************/ @@ -385,7 +385,7 @@ SfxItemPresentation SdrItemPool::GetPresentation( const IntlWrapper * pIntlWrapper) const { if (!IsInvalidItem(&rItem)) { - USHORT nWhich=rItem.Which(); + sal_uInt16 nWhich=rItem.Which(); if (nWhich>=SDRATTR_SHADOW_FIRST && nWhich<=SDRATTR_END) { rItem.GetPresentation(SFX_ITEM_PRESENTATION_NAMELESS, GetMetric(nWhich),ePresentationMetric,rText, @@ -405,7 +405,7 @@ SfxItemPresentation SdrItemPool::GetPresentation( void SdrItemPool::TakeItemName(sal_uInt16 nWhich, String& rItemName) { ResMgr* pResMgr = ImpGetResMgr(); - USHORT nResId = SIP_UNKNOWN_ATTR; + sal_uInt16 nResId = SIP_UNKNOWN_ATTR; switch (nWhich) { @@ -633,10 +633,10 @@ void SdrItemPool::TakeItemName(sal_uInt16 nWhich, String& rItemName) TYPEINIT1_AUTOFACTORY(SdrFractionItem,SfxPoolItem); -SdrFractionItem::SdrFractionItem(USHORT nId, SvStream& rIn): +SdrFractionItem::SdrFractionItem(sal_uInt16 nId, SvStream& rIn): SfxPoolItem(nId) { - INT32 nMul,nDiv; + sal_Int32 nMul,nDiv; rIn>>nMul; rIn>>nDiv; nValue=Fraction(nMul,nDiv); @@ -654,7 +654,7 @@ SfxItemPresentation SdrFractionItem::GetPresentation( { if(nValue.IsValid()) { - INT32 nDiv = nValue.GetDenominator(); + sal_Int32 nDiv = nValue.GetDenominator(); rText = UniString::CreateFromInt32(nValue.GetNumerator()); if(nDiv != 1) @@ -681,15 +681,15 @@ SfxItemPresentation SdrFractionItem::GetPresentation( return ePresentation; } -SfxPoolItem* SdrFractionItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SdrFractionItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrFractionItem(Which(),rIn); } -SvStream& SdrFractionItem::Store(SvStream& rOut, USHORT /*nItemVers*/) const +SvStream& SdrFractionItem::Store(SvStream& rOut, sal_uInt16 /*nItemVers*/) const { - rOut<<INT32(nValue.GetNumerator()); - rOut<<INT32(nValue.GetDenominator()); + rOut<<sal_Int32(nValue.GetNumerator()); + rOut<<sal_Int32(nValue.GetDenominator()); return rOut; } @@ -710,7 +710,7 @@ SfxItemPresentation SdrScaleItem::GetPresentation( { if(GetValue().IsValid()) { - INT32 nDiv = GetValue().GetDenominator(); + sal_Int32 nDiv = GetValue().GetDenominator(); rText = UniString::CreateFromInt32(GetValue().GetNumerator()); rText += sal_Unicode(':'); @@ -734,7 +734,7 @@ SfxItemPresentation SdrScaleItem::GetPresentation( return ePresentation; } -SfxPoolItem* SdrScaleItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SdrScaleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrScaleItem(Which(),rIn); } @@ -755,12 +755,12 @@ SfxPoolItem* SdrOnOffItem::Clone(SfxItemPool* /*pPool*/) const return new SdrOnOffItem(Which(),GetValue()); } -SfxPoolItem* SdrOnOffItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SdrOnOffItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrOnOffItem(Which(),rIn); } -XubString SdrOnOffItem::GetValueTextByVal(BOOL bVal) const +XubString SdrOnOffItem::GetValueTextByVal(sal_Bool bVal) const { if (bVal) return ImpGetResStr(STR_ItemValON); else return ImpGetResStr(STR_ItemValOFF); @@ -787,12 +787,12 @@ SfxPoolItem* SdrYesNoItem::Clone(SfxItemPool* /*pPool*/) const return new SdrYesNoItem(Which(),GetValue()); } -SfxPoolItem* SdrYesNoItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SdrYesNoItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrYesNoItem(Which(),rIn); } -XubString SdrYesNoItem::GetValueTextByVal(BOOL bVal) const +XubString SdrYesNoItem::GetValueTextByVal(sal_Bool bVal) const { if (bVal) return ImpGetResStr(STR_ItemValYES); else return ImpGetResStr(STR_ItemValNO); @@ -823,7 +823,7 @@ SfxPoolItem* SdrPercentItem::Clone(SfxItemPool* /*pPool*/) const return new SdrPercentItem(Which(),GetValue()); } -SfxPoolItem* SdrPercentItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SdrPercentItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrPercentItem(Which(),rIn); } @@ -858,7 +858,7 @@ SfxPoolItem* SdrAngleItem::Clone(SfxItemPool* /*pPool*/) const return new SdrAngleItem(Which(),GetValue()); } -SfxPoolItem* SdrAngleItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SdrAngleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrAngleItem(Which(),rIn); } @@ -867,8 +867,8 @@ SfxItemPresentation SdrAngleItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper * pIntlWrapper) const { - INT32 nValue(GetValue()); - BOOL bNeg(nValue < 0); + sal_Int32 nValue(GetValue()); + sal_Bool bNeg(nValue < 0); if(bNeg) nValue = -nValue; @@ -894,8 +894,8 @@ SfxItemPresentation SdrAngleItem::GetPresentation( rText.Insert(aUnicodeNull, 0); xub_StrLen nLen = rText.Len(); - BOOL bNull1(rText.GetChar(nLen-1) == aUnicodeNull); - BOOL bNull2(bNull1 && rText.GetChar(nLen-2) == aUnicodeNull); + sal_Bool bNull1(rText.GetChar(nLen-1) == aUnicodeNull); + sal_Bool bNull2(bNull1 && rText.GetChar(nLen-2) == aUnicodeNull); if(bNull2) { @@ -947,14 +947,14 @@ SfxPoolItem* SdrMetricItem::Clone(SfxItemPool* /*pPool*/) const return new SdrMetricItem(Which(),GetValue()); } -SfxPoolItem* SdrMetricItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SdrMetricItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrMetricItem(Which(),rIn); } bool SdrMetricItem::HasMetrics() const { - return TRUE; + return sal_True; } bool SdrMetricItem::ScaleMetrics(long nMul, long nDiv) @@ -966,7 +966,7 @@ bool SdrMetricItem::ScaleMetrics(long nMul, long nDiv) aVal/=nDiv; SetValue(long(aVal)); } - return TRUE; + return sal_True; } SfxItemPresentation SdrMetricItem::GetPresentation(SfxItemPresentation ePres, @@ -996,11 +996,11 @@ TYPEINIT1_AUTOFACTORY(SdrCaptionTypeItem,SfxEnumItem); SfxPoolItem* SdrCaptionTypeItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCaptionTypeItem(*this); } -SfxPoolItem* SdrCaptionTypeItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrCaptionTypeItem(rIn); } +SfxPoolItem* SdrCaptionTypeItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrCaptionTypeItem(rIn); } -USHORT SdrCaptionTypeItem::GetValueCount() const { return 4; } +sal_uInt16 SdrCaptionTypeItem::GetValueCount() const { return 4; } -XubString SdrCaptionTypeItem::GetValueTextByPos(USHORT nPos) const +XubString SdrCaptionTypeItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValCAPTIONTYPE1+nPos); } @@ -1008,7 +1008,7 @@ XubString SdrCaptionTypeItem::GetValueTextByPos(USHORT nPos) const SfxItemPresentation SdrCaptionTypeItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { - rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue())); + rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { String aStr; @@ -1023,11 +1023,11 @@ TYPEINIT1_AUTOFACTORY(SdrCaptionEscDirItem,SfxEnumItem); SfxPoolItem* SdrCaptionEscDirItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCaptionEscDirItem(*this); } -SfxPoolItem* SdrCaptionEscDirItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrCaptionEscDirItem(rIn); } +SfxPoolItem* SdrCaptionEscDirItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrCaptionEscDirItem(rIn); } -USHORT SdrCaptionEscDirItem::GetValueCount() const { return 3; } +sal_uInt16 SdrCaptionEscDirItem::GetValueCount() const { return 3; } -XubString SdrCaptionEscDirItem::GetValueTextByPos(USHORT nPos) const +XubString SdrCaptionEscDirItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValCAPTIONESCHORI+nPos); } @@ -1035,7 +1035,7 @@ XubString SdrCaptionEscDirItem::GetValueTextByPos(USHORT nPos) const SfxItemPresentation SdrCaptionEscDirItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { - rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue())); + rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { String aStr; @@ -1055,11 +1055,11 @@ TYPEINIT1_AUTOFACTORY(SdrTextFitToSizeTypeItem,SfxEnumItem); SfxPoolItem* SdrTextFitToSizeTypeItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextFitToSizeTypeItem(*this); } -SfxPoolItem* SdrTextFitToSizeTypeItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrTextFitToSizeTypeItem(rIn); } +SfxPoolItem* SdrTextFitToSizeTypeItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextFitToSizeTypeItem(rIn); } -USHORT SdrTextFitToSizeTypeItem::GetValueCount() const { return 4; } +sal_uInt16 SdrTextFitToSizeTypeItem::GetValueCount() const { return 4; } -XubString SdrTextFitToSizeTypeItem::GetValueTextByPos(USHORT nPos) const +XubString SdrTextFitToSizeTypeItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValFITTOSIZENONE+nPos); } @@ -1067,7 +1067,7 @@ XubString SdrTextFitToSizeTypeItem::GetValueTextByPos(USHORT nPos) const SfxItemPresentation SdrTextFitToSizeTypeItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { - rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue())); + rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { String aStr; @@ -1078,13 +1078,13 @@ SfxItemPresentation SdrTextFitToSizeTypeItem::GetPresentation(SfxItemPresentatio return ePres; } -int SdrTextFitToSizeTypeItem::HasBoolValue() const { return TRUE; } +int SdrTextFitToSizeTypeItem::HasBoolValue() const { return sal_True; } -BOOL SdrTextFitToSizeTypeItem::GetBoolValue() const { return GetValue()!=SDRTEXTFIT_NONE; } +sal_Bool SdrTextFitToSizeTypeItem::GetBoolValue() const { return GetValue()!=SDRTEXTFIT_NONE; } -void SdrTextFitToSizeTypeItem::SetBoolValue(BOOL bVal) { SetValue(sal::static_int_cast< USHORT >(bVal ? SDRTEXTFIT_PROPORTIONAL : SDRTEXTFIT_NONE)); } +void SdrTextFitToSizeTypeItem::SetBoolValue(sal_Bool bVal) { SetValue(sal::static_int_cast< sal_uInt16 >(bVal ? SDRTEXTFIT_PROPORTIONAL : SDRTEXTFIT_NONE)); } -bool SdrTextFitToSizeTypeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrTextFitToSizeTypeItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { drawing::TextFitToSizeType eFS = (drawing::TextFitToSizeType)GetValue(); rVal <<= eFS; @@ -1092,7 +1092,7 @@ bool SdrTextFitToSizeTypeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) c return true; } -bool SdrTextFitToSizeTypeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrTextFitToSizeTypeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::TextFitToSizeType eFS; if(!(rVal >>= eFS)) @@ -1104,7 +1104,7 @@ bool SdrTextFitToSizeTypeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId* eFS = (drawing::TextFitToSizeType) nEnum; } - SetValue( sal::static_int_cast< USHORT >( (SdrFitToSizeType)eFS ) ); + SetValue( sal::static_int_cast< sal_uInt16 >( (SdrFitToSizeType)eFS ) ); return true; } @@ -1113,11 +1113,11 @@ TYPEINIT1_AUTOFACTORY(SdrTextVertAdjustItem,SfxEnumItem); SfxPoolItem* SdrTextVertAdjustItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextVertAdjustItem(*this); } -SfxPoolItem* SdrTextVertAdjustItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrTextVertAdjustItem(rIn); } +SfxPoolItem* SdrTextVertAdjustItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextVertAdjustItem(rIn); } -USHORT SdrTextVertAdjustItem::GetValueCount() const { return 5; } +sal_uInt16 SdrTextVertAdjustItem::GetValueCount() const { return 5; } -XubString SdrTextVertAdjustItem::GetValueTextByPos(USHORT nPos) const +XubString SdrTextVertAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValTEXTVADJTOP+nPos); } @@ -1125,7 +1125,7 @@ XubString SdrTextVertAdjustItem::GetValueTextByPos(USHORT nPos) const SfxItemPresentation SdrTextVertAdjustItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { - rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue())); + rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { String aStr; @@ -1136,13 +1136,13 @@ SfxItemPresentation SdrTextVertAdjustItem::GetPresentation(SfxItemPresentation e return ePres; } -bool SdrTextVertAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrTextVertAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::TextVerticalAdjust)GetValue(); return true; } -bool SdrTextVertAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrTextVertAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::TextVerticalAdjust eAdj; if(!(rVal >>= eAdj)) @@ -1154,7 +1154,7 @@ bool SdrTextVertAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) eAdj = (drawing::TextVerticalAdjust)nEnum; } - SetValue( sal::static_int_cast< USHORT >( (SdrTextVertAdjust)eAdj ) ); + SetValue( sal::static_int_cast< sal_uInt16 >( (SdrTextVertAdjust)eAdj ) ); return true; } @@ -1163,11 +1163,11 @@ TYPEINIT1_AUTOFACTORY(SdrTextHorzAdjustItem,SfxEnumItem); SfxPoolItem* SdrTextHorzAdjustItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextHorzAdjustItem(*this); } -SfxPoolItem* SdrTextHorzAdjustItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrTextHorzAdjustItem(rIn); } +SfxPoolItem* SdrTextHorzAdjustItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextHorzAdjustItem(rIn); } -USHORT SdrTextHorzAdjustItem::GetValueCount() const { return 5; } +sal_uInt16 SdrTextHorzAdjustItem::GetValueCount() const { return 5; } -XubString SdrTextHorzAdjustItem::GetValueTextByPos(USHORT nPos) const +XubString SdrTextHorzAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValTEXTHADJLEFT+nPos); } @@ -1175,7 +1175,7 @@ XubString SdrTextHorzAdjustItem::GetValueTextByPos(USHORT nPos) const SfxItemPresentation SdrTextHorzAdjustItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { - rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue())); + rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { String aStr; @@ -1186,13 +1186,13 @@ SfxItemPresentation SdrTextHorzAdjustItem::GetPresentation(SfxItemPresentation e return ePres; } -bool SdrTextHorzAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrTextHorzAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::TextHorizontalAdjust)GetValue(); return true; } -bool SdrTextHorzAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrTextHorzAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::TextHorizontalAdjust eAdj; if(!(rVal >>= eAdj)) @@ -1204,7 +1204,7 @@ bool SdrTextHorzAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) eAdj = (drawing::TextHorizontalAdjust)nEnum; } - SetValue( sal::static_int_cast< USHORT >( (SdrTextHorzAdjust)eAdj ) ); + SetValue( sal::static_int_cast< sal_uInt16 >( (SdrTextHorzAdjust)eAdj ) ); return true; } @@ -1213,11 +1213,11 @@ TYPEINIT1_AUTOFACTORY(SdrTextAniKindItem,SfxEnumItem); SfxPoolItem* SdrTextAniKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniKindItem(*this); } -SfxPoolItem* SdrTextAniKindItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrTextAniKindItem(rIn); } +SfxPoolItem* SdrTextAniKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextAniKindItem(rIn); } -USHORT SdrTextAniKindItem::GetValueCount() const { return 5; } +sal_uInt16 SdrTextAniKindItem::GetValueCount() const { return 5; } -XubString SdrTextAniKindItem::GetValueTextByPos(USHORT nPos) const +XubString SdrTextAniKindItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValTEXTANI_NONE+nPos); } @@ -1225,7 +1225,7 @@ XubString SdrTextAniKindItem::GetValueTextByPos(USHORT nPos) const SfxItemPresentation SdrTextAniKindItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { - rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue())); + rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { String aStr; @@ -1236,13 +1236,13 @@ SfxItemPresentation SdrTextAniKindItem::GetPresentation(SfxItemPresentation ePre return ePres; } -bool SdrTextAniKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrTextAniKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::TextAnimationKind)GetValue(); return true; } -bool SdrTextAniKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrTextAniKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::TextAnimationKind eKind; if(!(rVal >>= eKind)) @@ -1253,7 +1253,7 @@ bool SdrTextAniKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) eKind = (drawing::TextAnimationKind)nEnum; } - SetValue( sal::static_int_cast< USHORT >( (SdrTextAniKind)eKind ) ); + SetValue( sal::static_int_cast< sal_uInt16 >( (SdrTextAniKind)eKind ) ); return true; } @@ -1262,11 +1262,11 @@ TYPEINIT1_AUTOFACTORY(SdrTextAniDirectionItem,SfxEnumItem); SfxPoolItem* SdrTextAniDirectionItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniDirectionItem(*this); } -SfxPoolItem* SdrTextAniDirectionItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrTextAniDirectionItem(rIn); } +SfxPoolItem* SdrTextAniDirectionItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextAniDirectionItem(rIn); } -USHORT SdrTextAniDirectionItem::GetValueCount() const { return 4; } +sal_uInt16 SdrTextAniDirectionItem::GetValueCount() const { return 4; } -XubString SdrTextAniDirectionItem::GetValueTextByPos(USHORT nPos) const +XubString SdrTextAniDirectionItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValTEXTANI_LEFT+nPos); } @@ -1274,7 +1274,7 @@ XubString SdrTextAniDirectionItem::GetValueTextByPos(USHORT nPos) const SfxItemPresentation SdrTextAniDirectionItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { - rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue())); + rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { String aStr; @@ -1285,13 +1285,13 @@ SfxItemPresentation SdrTextAniDirectionItem::GetPresentation(SfxItemPresentation return ePres; } -bool SdrTextAniDirectionItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrTextAniDirectionItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::TextAnimationDirection)GetValue(); return true; } -bool SdrTextAniDirectionItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrTextAniDirectionItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::TextAnimationDirection eDir; if(!(rVal >>= eDir)) @@ -1303,7 +1303,7 @@ bool SdrTextAniDirectionItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ eDir = (drawing::TextAnimationDirection)nEnum; } - SetValue( sal::static_int_cast< USHORT >( (SdrTextAniDirection)eDir ) ); + SetValue( sal::static_int_cast< sal_uInt16 >( (SdrTextAniDirection)eDir ) ); return true; } @@ -1312,7 +1312,7 @@ TYPEINIT1_AUTOFACTORY(SdrTextAniDelayItem,SfxUInt16Item); SfxPoolItem* SdrTextAniDelayItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniDelayItem(*this); } -SfxPoolItem* SdrTextAniDelayItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrTextAniDelayItem(rIn); } +SfxPoolItem* SdrTextAniDelayItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextAniDelayItem(rIn); } SfxItemPresentation SdrTextAniDelayItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, @@ -1338,7 +1338,7 @@ TYPEINIT1_AUTOFACTORY(SdrTextAniAmountItem,SfxInt16Item); SfxPoolItem* SdrTextAniAmountItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniAmountItem(*this); } -SfxPoolItem* SdrTextAniAmountItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrTextAniAmountItem(rIn); } +SfxPoolItem* SdrTextAniAmountItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextAniAmountItem(rIn); } bool SdrTextAniAmountItem::HasMetrics() const { @@ -1353,15 +1353,15 @@ bool SdrTextAniAmountItem::ScaleMetrics(long nMul, long nDiv) aVal+=nDiv/2; // fuer korrektes Runden aVal/=nDiv; SetValue(short(aVal)); - return TRUE; - } else return FALSE; + return sal_True; + } else return sal_False; } SfxItemPresentation SdrTextAniAmountItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, XubString& rText, const IntlWrapper *) const { - INT32 nValue(GetValue()); + sal_Int32 nValue(GetValue()); if(!nValue) nValue = -1L; @@ -1394,12 +1394,12 @@ SfxItemPresentation SdrTextAniAmountItem::GetPresentation( } TYPEINIT1_AUTOFACTORY( SdrTextFixedCellHeightItem, SfxBoolItem ); -SdrTextFixedCellHeightItem::SdrTextFixedCellHeightItem( BOOL bUseFixedCellHeight ) +SdrTextFixedCellHeightItem::SdrTextFixedCellHeightItem( sal_Bool bUseFixedCellHeight ) : SfxBoolItem( SDRATTR_TEXT_USEFIXEDCELLHEIGHT, bUseFixedCellHeight ) { } SdrTextFixedCellHeightItem::SdrTextFixedCellHeightItem( SvStream & rStream, sal_uInt16 nVersion ) - : SfxBoolItem( SDRATTR_TEXT_USEFIXEDCELLHEIGHT, FALSE ) + : SfxBoolItem( SDRATTR_TEXT_USEFIXEDCELLHEIGHT, sal_False ) { if ( nVersion ) { @@ -1443,13 +1443,13 @@ sal_uInt16 SdrTextFixedCellHeightItem::GetVersion( sal_uInt16 /*nFileFormatVersi { return 1; } -bool SdrTextFixedCellHeightItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrTextFixedCellHeightItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { sal_Bool bValue = (sal_Bool)GetValue(); rVal <<= bValue; return true; } -bool SdrTextFixedCellHeightItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrTextFixedCellHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Bool bValue = sal_Bool(); if( !( rVal >>= bValue ) ) @@ -1572,7 +1572,7 @@ sal_uInt16 SdrCustomShapeAdjustmentItem::GetVersion( sal_uInt16 /*nFileFormatVer return 1; } -bool SdrCustomShapeAdjustmentItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrCustomShapeAdjustmentItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { sal_uInt32 i, nCount = GetCount(); uno::Sequence< sal_Int32 > aSequence( nCount ); @@ -1586,7 +1586,7 @@ bool SdrCustomShapeAdjustmentItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId* return true; } -bool SdrCustomShapeAdjustmentItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrCustomShapeAdjustmentItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { uno::Sequence< sal_Int32 > aSequence; if( !( rVal >>= aSequence ) ) @@ -1618,11 +1618,11 @@ TYPEINIT1_AUTOFACTORY(SdrEdgeKindItem,SfxEnumItem); SfxPoolItem* SdrEdgeKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrEdgeKindItem(*this); } -SfxPoolItem* SdrEdgeKindItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrEdgeKindItem(rIn); } +SfxPoolItem* SdrEdgeKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrEdgeKindItem(rIn); } -USHORT SdrEdgeKindItem::GetValueCount() const { return 4; } +sal_uInt16 SdrEdgeKindItem::GetValueCount() const { return 4; } -XubString SdrEdgeKindItem::GetValueTextByPos(USHORT nPos) const +XubString SdrEdgeKindItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValEDGE_ORTHOLINES+nPos); } @@ -1630,7 +1630,7 @@ XubString SdrEdgeKindItem::GetValueTextByPos(USHORT nPos) const SfxItemPresentation SdrEdgeKindItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { - rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue())); + rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { String aStr; @@ -1641,7 +1641,7 @@ SfxItemPresentation SdrEdgeKindItem::GetPresentation(SfxItemPresentation ePres, return ePres; } -bool SdrEdgeKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrEdgeKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { drawing::ConnectorType eCT = drawing::ConnectorType_STANDARD; @@ -1661,7 +1661,7 @@ bool SdrEdgeKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const return true; } -bool SdrEdgeKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrEdgeKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::ConnectorType eCT; if(!(rVal >>= eCT)) @@ -1683,18 +1683,18 @@ bool SdrEdgeKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) default: OSL_FAIL( "SdrEdgeKindItem::PuValue : unknown enum" ); } - SetValue( sal::static_int_cast< USHORT >( eEK ) ); + SetValue( sal::static_int_cast< sal_uInt16 >( eEK ) ); return true; } -bool SdrEdgeNode1HorzDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrEdgeNode1HorzDistItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); return true; } -bool SdrEdgeNode1HorzDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrEdgeNode1HorzDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; if(!(rVal >>= nValue)) @@ -1704,13 +1704,13 @@ bool SdrEdgeNode1HorzDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId* return true; } -bool SdrEdgeNode1VertDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrEdgeNode1VertDistItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); return true; } -bool SdrEdgeNode1VertDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrEdgeNode1VertDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; if(!(rVal >>= nValue)) @@ -1720,13 +1720,13 @@ bool SdrEdgeNode1VertDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId* return true; } -bool SdrEdgeNode2HorzDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrEdgeNode2HorzDistItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); return true; } -bool SdrEdgeNode2HorzDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrEdgeNode2HorzDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; if(!(rVal >>= nValue)) @@ -1736,13 +1736,13 @@ bool SdrEdgeNode2HorzDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId* return true; } -bool SdrEdgeNode2VertDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrEdgeNode2VertDistItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); return true; } -bool SdrEdgeNode2VertDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrEdgeNode2VertDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; if(!(rVal >>= nValue)) @@ -1752,13 +1752,13 @@ bool SdrEdgeNode2VertDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId* return true; } -bool SdrEdgeLine1DeltaItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrEdgeLine1DeltaItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); return true; } -bool SdrEdgeLine1DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrEdgeLine1DeltaItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; if(!(rVal >>= nValue)) @@ -1768,13 +1768,13 @@ bool SdrEdgeLine1DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) return true; } -bool SdrEdgeLine2DeltaItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrEdgeLine2DeltaItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); return true; } -bool SdrEdgeLine2DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrEdgeLine2DeltaItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; if(!(rVal >>= nValue)) @@ -1784,13 +1784,13 @@ bool SdrEdgeLine2DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) return true; } -bool SdrEdgeLine3DeltaItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrEdgeLine3DeltaItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); return true; } -bool SdrEdgeLine3DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrEdgeLine3DeltaItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; if(!(rVal >>= nValue)) @@ -1809,11 +1809,11 @@ TYPEINIT1_AUTOFACTORY(SdrMeasureKindItem,SfxEnumItem); SfxPoolItem* SdrMeasureKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureKindItem(*this); } -SfxPoolItem* SdrMeasureKindItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrMeasureKindItem(rIn); } +SfxPoolItem* SdrMeasureKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrMeasureKindItem(rIn); } -USHORT SdrMeasureKindItem::GetValueCount() const { return 2; } +sal_uInt16 SdrMeasureKindItem::GetValueCount() const { return 2; } -XubString SdrMeasureKindItem::GetValueTextByPos(USHORT nPos) const +XubString SdrMeasureKindItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValMEASURE_STD+nPos); } @@ -1821,7 +1821,7 @@ XubString SdrMeasureKindItem::GetValueTextByPos(USHORT nPos) const SfxItemPresentation SdrMeasureKindItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { - rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue())); + rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { String aStr; @@ -1832,13 +1832,13 @@ SfxItemPresentation SdrMeasureKindItem::GetPresentation(SfxItemPresentation ePre return ePres; } -bool SdrMeasureKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrMeasureKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::MeasureKind)GetValue(); return true; } -bool SdrMeasureKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrMeasureKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::MeasureKind eKind; if(!(rVal >>= eKind)) @@ -1850,7 +1850,7 @@ bool SdrMeasureKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) eKind = (drawing::MeasureKind)nEnum; } - SetValue( sal::static_int_cast< USHORT >( (SdrMeasureKind)eKind ) ); + SetValue( sal::static_int_cast< sal_uInt16 >( (SdrMeasureKind)eKind ) ); return true; } @@ -1858,11 +1858,11 @@ TYPEINIT1_AUTOFACTORY(SdrMeasureTextHPosItem,SfxEnumItem); SfxPoolItem* SdrMeasureTextHPosItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureTextHPosItem(*this); } -SfxPoolItem* SdrMeasureTextHPosItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrMeasureTextHPosItem(rIn); } +SfxPoolItem* SdrMeasureTextHPosItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrMeasureTextHPosItem(rIn); } -USHORT SdrMeasureTextHPosItem::GetValueCount() const { return 4; } +sal_uInt16 SdrMeasureTextHPosItem::GetValueCount() const { return 4; } -XubString SdrMeasureTextHPosItem::GetValueTextByPos(USHORT nPos) const +XubString SdrMeasureTextHPosItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValMEASURE_TEXTHAUTO+nPos); } @@ -1870,7 +1870,7 @@ XubString SdrMeasureTextHPosItem::GetValueTextByPos(USHORT nPos) const SfxItemPresentation SdrMeasureTextHPosItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { - rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue())); + rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { String aStr; @@ -1881,13 +1881,13 @@ SfxItemPresentation SdrMeasureTextHPosItem::GetPresentation(SfxItemPresentation return ePres; } -bool SdrMeasureTextHPosItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrMeasureTextHPosItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::MeasureTextHorzPos)GetValue(); return true; } -bool SdrMeasureTextHPosItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrMeasureTextHPosItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::MeasureTextHorzPos ePos; if(!(rVal >>= ePos)) @@ -1899,7 +1899,7 @@ bool SdrMeasureTextHPosItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) ePos = (drawing::MeasureTextHorzPos)nEnum; } - SetValue( sal::static_int_cast< USHORT >( (SdrMeasureTextHPos)ePos ) ); + SetValue( sal::static_int_cast< sal_uInt16 >( (SdrMeasureTextHPos)ePos ) ); return true; } @@ -1907,11 +1907,11 @@ TYPEINIT1_AUTOFACTORY(SdrMeasureTextVPosItem,SfxEnumItem); SfxPoolItem* SdrMeasureTextVPosItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureTextVPosItem(*this); } -SfxPoolItem* SdrMeasureTextVPosItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrMeasureTextVPosItem(rIn); } +SfxPoolItem* SdrMeasureTextVPosItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrMeasureTextVPosItem(rIn); } -USHORT SdrMeasureTextVPosItem::GetValueCount() const { return 5; } +sal_uInt16 SdrMeasureTextVPosItem::GetValueCount() const { return 5; } -XubString SdrMeasureTextVPosItem::GetValueTextByPos(USHORT nPos) const +XubString SdrMeasureTextVPosItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValMEASURE_TEXTVAUTO+nPos); } @@ -1919,7 +1919,7 @@ XubString SdrMeasureTextVPosItem::GetValueTextByPos(USHORT nPos) const SfxItemPresentation SdrMeasureTextVPosItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { - rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue())); + rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { String aStr; @@ -1930,13 +1930,13 @@ SfxItemPresentation SdrMeasureTextVPosItem::GetPresentation(SfxItemPresentation return ePres; } -bool SdrMeasureTextVPosItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrMeasureTextVPosItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::MeasureTextVertPos)GetValue(); return true; } -bool SdrMeasureTextVPosItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrMeasureTextVPosItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::MeasureTextVertPos ePos; if(!(rVal >>= ePos)) @@ -1948,7 +1948,7 @@ bool SdrMeasureTextVPosItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) ePos = (drawing::MeasureTextVertPos)nEnum; } - SetValue( sal::static_int_cast< USHORT >( (SdrMeasureTextHPos)ePos ) ); + SetValue( sal::static_int_cast< sal_uInt16 >( (SdrMeasureTextHPos)ePos ) ); return true; } @@ -1956,11 +1956,11 @@ TYPEINIT1_AUTOFACTORY(SdrMeasureUnitItem,SfxEnumItem); SfxPoolItem* SdrMeasureUnitItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureUnitItem(*this); } -SfxPoolItem* SdrMeasureUnitItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrMeasureUnitItem(rIn); } +SfxPoolItem* SdrMeasureUnitItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrMeasureUnitItem(rIn); } -USHORT SdrMeasureUnitItem::GetValueCount() const { return 14; } +sal_uInt16 SdrMeasureUnitItem::GetValueCount() const { return 14; } -XubString SdrMeasureUnitItem::GetValueTextByPos(USHORT nPos) const +XubString SdrMeasureUnitItem::GetValueTextByPos(sal_uInt16 nPos) const { XubString aRetval; @@ -1975,7 +1975,7 @@ XubString SdrMeasureUnitItem::GetValueTextByPos(USHORT nPos) const SfxItemPresentation SdrMeasureUnitItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { - rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue())); + rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { String aStr; @@ -1986,19 +1986,19 @@ SfxItemPresentation SdrMeasureUnitItem::GetPresentation(SfxItemPresentation ePre return ePres; } -bool SdrMeasureUnitItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrMeasureUnitItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); return true; } -bool SdrMeasureUnitItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrMeasureUnitItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nMeasure = 0; if(!(rVal >>= nMeasure)) return false; - SetValue( sal::static_int_cast< USHORT >( (FieldUnit)nMeasure ) ); + SetValue( sal::static_int_cast< sal_uInt16 >( (FieldUnit)nMeasure ) ); return true; } @@ -2011,11 +2011,11 @@ TYPEINIT1_AUTOFACTORY(SdrCircKindItem,SfxEnumItem); SfxPoolItem* SdrCircKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCircKindItem(*this); } -SfxPoolItem* SdrCircKindItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrCircKindItem(rIn); } +SfxPoolItem* SdrCircKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrCircKindItem(rIn); } -USHORT SdrCircKindItem::GetValueCount() const { return 4; } +sal_uInt16 SdrCircKindItem::GetValueCount() const { return 4; } -XubString SdrCircKindItem::GetValueTextByPos(USHORT nPos) const +XubString SdrCircKindItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValCIRC_FULL+nPos); } @@ -2023,7 +2023,7 @@ XubString SdrCircKindItem::GetValueTextByPos(USHORT nPos) const SfxItemPresentation SdrCircKindItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { - rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue())); + rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { String aStr; @@ -2034,13 +2034,13 @@ SfxItemPresentation SdrCircKindItem::GetPresentation(SfxItemPresentation ePres, return ePres; } -bool SdrCircKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrCircKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::CircleKind)GetValue(); return true; } -bool SdrCircKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrCircKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::CircleKind eKind; if(!(rVal >>= eKind)) @@ -2052,7 +2052,7 @@ bool SdrCircKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) eKind = (drawing::CircleKind)nEnum; } - SetValue( sal::static_int_cast< USHORT >( (SdrCircKind)eKind ) ); + SetValue( sal::static_int_cast< sal_uInt16 >( (SdrCircKind)eKind ) ); return true; } @@ -2068,7 +2068,7 @@ SfxPoolItem* SdrSignedPercentItem::Clone(SfxItemPool* /*pPool*/) const return new SdrSignedPercentItem( Which(), GetValue() ); } -SfxPoolItem* SdrSignedPercentItem::Create( SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SdrSignedPercentItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrSignedPercentItem( Which(), rIn ); } @@ -2103,7 +2103,7 @@ SfxPoolItem* SdrGrafRedItem::Clone( SfxItemPool* /*pPool*/) const return new SdrGrafRedItem( *this ); } -SfxPoolItem* SdrGrafRedItem::Create( SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SdrGrafRedItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrGrafRedItem( rIn ); } @@ -2119,7 +2119,7 @@ SfxPoolItem* SdrGrafGreenItem::Clone( SfxItemPool* /*pPool*/) const return new SdrGrafGreenItem( *this ); } -SfxPoolItem* SdrGrafGreenItem::Create( SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SdrGrafGreenItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrGrafGreenItem( rIn ); } @@ -2135,7 +2135,7 @@ SfxPoolItem* SdrGrafBlueItem::Clone( SfxItemPool* /*pPool*/) const return new SdrGrafBlueItem( *this ); } -SfxPoolItem* SdrGrafBlueItem::Create( SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SdrGrafBlueItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrGrafBlueItem( rIn ); } @@ -2151,7 +2151,7 @@ SfxPoolItem* SdrGrafLuminanceItem::Clone( SfxItemPool* /*pPool*/) const return new SdrGrafLuminanceItem( *this ); } -SfxPoolItem* SdrGrafLuminanceItem::Create( SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SdrGrafLuminanceItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrGrafLuminanceItem( rIn ); } @@ -2167,7 +2167,7 @@ SfxPoolItem* SdrGrafContrastItem::Clone( SfxItemPool* /*pPool*/) const return new SdrGrafContrastItem( *this ); } -SfxPoolItem* SdrGrafContrastItem::Create( SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SdrGrafContrastItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrGrafContrastItem( rIn ); } @@ -2183,24 +2183,24 @@ SfxPoolItem* SdrGrafGamma100Item::Clone( SfxItemPool* /*pPool */) const return new SdrGrafGamma100Item( *this ); } -SfxPoolItem* SdrGrafGamma100Item::Create( SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SdrGrafGamma100Item::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrGrafGamma100Item( rIn ); } -bool SdrGrafGamma100Item::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrGrafGamma100Item::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= ((double)GetValue()) / 100.0; return true; } -bool SdrGrafGamma100Item::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrGrafGamma100Item::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { double nGamma = 0; if(!(rVal >>= nGamma)) return false; - SetValue( (UINT32)(nGamma * 100.0 ) ); + SetValue( (sal_uInt32)(nGamma * 100.0 ) ); return true; } @@ -2231,7 +2231,7 @@ SfxPoolItem* SdrGrafTransparenceItem::Clone( SfxItemPool* /*pPool*/) const return new SdrGrafTransparenceItem( *this ); } -SfxPoolItem* SdrGrafTransparenceItem::Create( SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SdrGrafTransparenceItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrGrafTransparenceItem( rIn ); } @@ -2247,17 +2247,17 @@ SfxPoolItem* SdrGrafModeItem::Clone(SfxItemPool* /*pPool*/) const return new SdrGrafModeItem( *this ); } -SfxPoolItem* SdrGrafModeItem::Create( SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SdrGrafModeItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrGrafModeItem( rIn ); } -USHORT SdrGrafModeItem::GetValueCount() const +sal_uInt16 SdrGrafModeItem::GetValueCount() const { return 4; } -XubString SdrGrafModeItem::GetValueTextByPos(UINT16 nPos) const +XubString SdrGrafModeItem::GetValueTextByPos(sal_uInt16 nPos) const { XubString aStr; @@ -2292,7 +2292,7 @@ SfxItemPresentation SdrGrafModeItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { - rText = GetValueTextByPos( sal::static_int_cast< USHORT >( GetValue() ) ); + rText = GetValueTextByPos( sal::static_int_cast< sal_uInt16 >( GetValue() ) ); if( ePres == SFX_ITEM_PRESENTATION_COMPLETE ) { @@ -2317,12 +2317,12 @@ SfxPoolItem* SdrGrafCropItem::Clone( SfxItemPool* /*pPool*/) const return new SdrGrafCropItem( *this ); } -SfxPoolItem* SdrGrafCropItem::Create( SvStream& rIn, USHORT nVer ) const +SfxPoolItem* SdrGrafCropItem::Create( SvStream& rIn, sal_uInt16 nVer ) const { return( ( 0 == nVer ) ? Clone( NULL ) : SvxGrfCrop::Create( rIn, nVer ) ); } -USHORT SdrGrafCropItem::GetVersion( USHORT /*nFileVersion*/) const +sal_uInt16 SdrGrafCropItem::GetVersion( sal_uInt16 /*nFileVersion*/) const { // GRFCROP_VERSION_MOVETOSVX is 1 return GRFCROP_VERSION_MOVETOSVX; diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index f3ff2141c36b..8aa08a1aa7da 100644..100755 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" #include <svx/svdcrtv.hxx> -#include "xattr.hxx" +#include "svx/xattr.hxx" #include <svx/svdundo.hxx> #include <svx/svdocapt.hxx> // Spezialbehandlung: Nach dem Create transparente Fuellung #include <svx/svdoedge.hxx> @@ -46,7 +46,7 @@ #include <svx/svdopath.hxx> #include <svx/sdr/overlay/overlaypolypolygon.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include "fmobj.hxx" #include <svx/svdocirc.hxx> #include <svx/sdr/contact/viewcontact.hxx> @@ -215,11 +215,11 @@ void SdrCreateView::ImpClearVars() nAktIdent=OBJ_NONE; pAktCreate=NULL; pCreatePV=NULL; - bAutoTextEdit=FALSE; - b1stPointAsCenter=FALSE; + bAutoTextEdit=sal_False; + b1stPointAsCenter=sal_False; aAktCreatePointer=Pointer(POINTER_CROSS); - bUseIncompatiblePathCreateInterface=FALSE; - bAutoClosePolys=TRUE; + bUseIncompatiblePathCreateInterface=sal_False; + bAutoClosePolys=sal_True; nAutoCloseDistPix=5; nFreeHandMinDistPix=10; @@ -250,7 +250,7 @@ void SdrCreateView::ImpDelCreateAttr() { } -BOOL SdrCreateView::IsAction() const +sal_Bool SdrCreateView::IsAction() const { return SdrDragView::IsAction() || pAktCreate!=NULL; } @@ -297,26 +297,26 @@ void SdrCreateView::TakeActionRect(Rectangle& rRect) const } } -BOOL SdrCreateView::CheckEdgeMode() +sal_Bool SdrCreateView::CheckEdgeMode() { - UINT32 nInv=nAktInvent; - UINT16 nIdn=nAktIdent; + sal_uInt32 nInv=nAktInvent; + sal_uInt16 nIdn=nAktIdent; if (pAktCreate!=NULL) { nInv=pAktCreate->GetObjInventor(); nIdn=pAktCreate->GetObjIdentifier(); // wird vom EdgeObj gemanaged - if (nAktInvent==SdrInventor && nAktIdent==OBJ_EDGE) return FALSE; + if (nAktInvent==SdrInventor && nAktIdent==OBJ_EDGE) return sal_False; } if (!IsCreateMode() || nAktInvent!=SdrInventor || nAktIdent!=OBJ_EDGE) { ImpClearConnectMarker(); - return FALSE; + return sal_False; } else { - // TRUE heisst: MouseMove soll Connect checken + // sal_True heisst: MouseMove soll Connect checken return !IsAction(); } } @@ -349,7 +349,7 @@ void SdrCreateView::HideConnectMarker() ImpClearConnectMarker(); } -BOOL SdrCreateView::MouseMove(const MouseEvent& rMEvt, Window* pWin) +sal_Bool SdrCreateView::MouseMove(const MouseEvent& rMEvt, Window* pWin) { if(CheckEdgeMode() && pWin) { @@ -359,7 +359,7 @@ BOOL SdrCreateView::MouseMove(const MouseEvent& rMEvt, Window* pWin) { // Defaultete Hit-Toleranz bei IsMarkedHit() mal aendern !!!! Point aPos(pWin->PixelToLogic(rMEvt.GetPosPixel())); - BOOL bMarkHit=PickHandle(aPos)!=NULL || IsMarkedObjHit(aPos); + sal_Bool bMarkHit=PickHandle(aPos)!=NULL || IsMarkedObjHit(aPos); SdrObjConnection aCon; if (!bMarkHit) SdrEdgeObj::ImpFindConnector(aPos,*pPV,aCon,NULL,pWin); SetConnectMarker(aCon,*pPV); @@ -368,22 +368,22 @@ BOOL SdrCreateView::MouseMove(const MouseEvent& rMEvt, Window* pWin) return SdrDragView::MouseMove(rMEvt,pWin); } -BOOL SdrCreateView::IsTextTool() const +sal_Bool SdrCreateView::IsTextTool() const { return eEditMode==SDREDITMODE_CREATE && nAktInvent==SdrInventor && (nAktIdent==OBJ_TEXT || nAktIdent==OBJ_TEXTEXT || nAktIdent==OBJ_TITLETEXT || nAktIdent==OBJ_OUTLINETEXT); } -BOOL SdrCreateView::IsEdgeTool() const +sal_Bool SdrCreateView::IsEdgeTool() const { return eEditMode==SDREDITMODE_CREATE && nAktInvent==SdrInventor && (nAktIdent==OBJ_EDGE); } -BOOL SdrCreateView::IsMeasureTool() const +sal_Bool SdrCreateView::IsMeasureTool() const { return eEditMode==SDREDITMODE_CREATE && nAktInvent==SdrInventor && (nAktIdent==OBJ_MEASURE); } -void SdrCreateView::SetCurrentObj(UINT16 nIdent, UINT32 nInvent) +void SdrCreateView::SetCurrentObj(sal_uInt16 nIdent, sal_uInt32 nInvent) { if (nAktInvent!=nInvent || nAktIdent!=nIdent) { @@ -417,10 +417,10 @@ void SdrCreateView::SetCurrentObj(UINT16 nIdent, UINT32 nInvent) ImpSetGlueVisible3(IsEdgeTool()); } -BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point& rPnt, OutputDevice* pOut, +sal_Bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut, short nMinMov, SdrPageView* pPV, const Rectangle& rLogRect, SdrObject* pPreparedFactoryObject) { - BOOL bRet=FALSE; + sal_Bool bRet=sal_False; UnmarkAllObj(); BrkAction(); @@ -443,7 +443,7 @@ BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point& aLay = aMeasureLayer; } - SdrLayerID nLayer=pCreatePV->GetPage()->GetLayerAdmin().GetLayerID(aLay,TRUE); + SdrLayerID nLayer=pCreatePV->GetPage()->GetLayerAdmin().GetLayerID(aLay,sal_True); if (nLayer==SDRLAYER_NOTFOUND) nLayer=0; if (!pCreatePV->GetLockedLayers().IsSet(nLayer) && pCreatePV->GetVisibleLayers().IsSet(nLayer)) { @@ -466,9 +466,9 @@ BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point& } Point aPnt(rPnt); - if (nAktInvent!=SdrInventor || (nAktIdent!=USHORT(OBJ_EDGE) && - nAktIdent!=USHORT(OBJ_FREELINE) && - nAktIdent!=USHORT(OBJ_FREEFILL) )) { // Kein Fang fuer Edge und Freihand! + if (nAktInvent!=SdrInventor || (nAktIdent!=sal_uInt16(OBJ_EDGE) && + nAktIdent!=sal_uInt16(OBJ_FREELINE) && + nAktIdent!=sal_uInt16(OBJ_FREEFILL) )) { // Kein Fang fuer Edge und Freihand! aPnt=GetSnapPos(aPnt,pCreatePV); } if (pAktCreate!=NULL) @@ -539,8 +539,8 @@ BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point& pDragWin=pOut; if (pAktCreate->BegCreate(aDragStat)) { - ShowCreateObj(/*pOut,TRUE*/); - bRet=TRUE; + ShowCreateObj(/*pOut,sal_True*/); + bRet=sal_True; } else { @@ -554,7 +554,7 @@ BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point& return bRet; } -BOOL SdrCreateView::BegCreateObj(const Point& rPnt, OutputDevice* pOut, short nMinMov, SdrPageView* pPV) +sal_Bool SdrCreateView::BegCreateObj(const Point& rPnt, OutputDevice* pOut, short nMinMov, SdrPageView* pPV) { return ImpBegCreateObj(nAktInvent,nAktIdent,rPnt,pOut,nMinMov,pPV,Rectangle(), 0L); } @@ -573,7 +573,7 @@ sal_Bool SdrCreateView::BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMi return ImpBegCreateObj(nInvent, nIdent, rPnt, 0L, nMinMov, 0L, Rectangle(), pPreparedFactoryObject); } -BOOL SdrCreateView::BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz, +sal_Bool SdrCreateView::BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz, OutputDevice* pOut, short nMinMov, SdrPageView* pPV) { return ImpBegCreateObj(SdrInventor,OBJ_CAPTION,rPnt,pOut,nMinMov,pPV, @@ -600,9 +600,9 @@ void SdrCreateView::MovCreateObj(const Point& rPnt) if(bDidLimit && IsOrtho()) { if(aDragStat.IsOrtho8Possible()) - OrthoDistance8(aDragStat.GetPrev(), aPnt, FALSE); + OrthoDistance8(aDragStat.GetPrev(), aPnt, sal_False); else if(aDragStat.IsOrtho4Possible()) - OrthoDistance4(aDragStat.GetPrev(), aPnt, FALSE); + OrthoDistance4(aDragStat.GetPrev(), aPnt, sal_False); } if (aPnt==aDragStat.GetNow()) return; @@ -624,24 +624,24 @@ void SdrCreateView::MovCreateObj(const Point& rPnt) } } -BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) +sal_Bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) { - BOOL bRet=FALSE; + sal_Bool bRet=sal_False; SdrObject* pObjMerk=pAktCreate; SdrPageView* pPVMerk=pCreatePV; if (pAktCreate!=NULL) { - ULONG nAnz=aDragStat.GetPointAnz(); + sal_uIntPtr nAnz=aDragStat.GetPointAnz(); if (nAnz<=1 && eCmd==SDRCREATE_FORCEEND) { BrkCreateObj(); // Objekte mit nur einem Punkt gibt's nicht (zumindest noch nicht) - return FALSE; // FALSE=Event nicht ausgewertet + return sal_False; // sal_False=Event nicht ausgewertet } - BOOL bPntsEq=nAnz>1; - ULONG i=1; + sal_Bool bPntsEq=nAnz>1; + sal_uIntPtr i=1; Point aP0=aDragStat.GetPoint(0); while (bPntsEq && i<nAnz) { bPntsEq=aP0==aDragStat.GetPoint(i); i++; } @@ -666,7 +666,7 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) } else { - nLayer = rAd.GetLayerID(aAktLayer, TRUE); + nLayer = rAd.GetLayerID(aAktLayer, sal_True); } if(SDRLAYER_NOTFOUND == nLayer) @@ -677,7 +677,7 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) pObj->SetLayer(nLayer); // #83403# recognize creation of a new 3D object inside a 3D scene - BOOL bSceneIntoScene(FALSE); + sal_Bool bSceneIntoScene(sal_False); if(pObjMerk && pObjMerk->ISA(E3dScene) @@ -685,7 +685,7 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) && pCreatePV->GetAktGroup() && pCreatePV->GetAktGroup()->ISA(E3dScene)) { - BOOL bDidInsert = ((E3dView*)this)->ImpCloneAll3DObjectsToDestScene( + sal_Bool bDidInsert = ((E3dView*)this)->ImpCloneAll3DObjectsToDestScene( (E3dScene*)pObjMerk, (E3dScene*)pCreatePV->GetAktGroup(), Point(0, 0)); if(bDidInsert) @@ -693,8 +693,8 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) // delete object, it's content is cloned and inserted SdrObject::Free( pObjMerk ); pObjMerk = 0L; - bRet = FALSE; - bSceneIntoScene = TRUE; + bRet = sal_False; + bSceneIntoScene = sal_True; } } @@ -705,7 +705,7 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) } pCreatePV=NULL; - bRet=TRUE; // TRUE=Event ausgewertet + bRet=sal_True; // sal_True=Event ausgewertet } else { @@ -725,7 +725,7 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) HideCreateObj(); ShowCreateObj(); aDragStat.ResetMinMoved(); // NextPoint gibt's bei MovCreateObj() - bRet=TRUE; + bRet=sal_True; } } if (bRet && pObjMerk!=NULL && IsTextEditAfterCreate()) @@ -776,7 +776,7 @@ void SdrCreateView::BrkCreateObj() } } -void SdrCreateView::ShowCreateObj(/*OutputDevice* pOut, BOOL bFull*/) +void SdrCreateView::ShowCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/) { if(IsCreateObj() && !aDragStat.IsShown()) { @@ -885,7 +885,7 @@ void SdrCreateView::ShowCreateObj(/*OutputDevice* pOut, BOOL bFull*/) } } - aDragStat.SetShown(TRUE); + aDragStat.SetShown(sal_True); } } @@ -898,19 +898,19 @@ void SdrCreateView::HideCreateObj() mpCreateViewExtraData->HideOverlay(); //DrawCreateObj(pOut,bFull); - aDragStat.SetShown(FALSE); + aDragStat.SetShown(sal_False); } } //////////////////////////////////////////////////////////////////////////////////////////////////// /* new interface src537 */ -BOOL SdrCreateView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) const +sal_Bool SdrCreateView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const { if(pAktCreate) { rTargetSet.Put(pAktCreate->GetMergedItemSet()); - return TRUE; + return sal_True; } else { @@ -918,13 +918,13 @@ BOOL SdrCreateView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) co } } -BOOL SdrCreateView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll) +sal_Bool SdrCreateView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll) { if(pAktCreate) { pAktCreate->SetMergedItemSetAndBroadcast(rSet, bReplaceAll); - return TRUE; + return sal_True; } else { @@ -932,11 +932,11 @@ BOOL SdrCreateView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll) } } -SfxStyleSheet* SdrCreateView::GetStyleSheet() const // SfxStyleSheet* SdrCreateView::GetStyleSheet(BOOL& rOk) const +SfxStyleSheet* SdrCreateView::GetStyleSheet() const // SfxStyleSheet* SdrCreateView::GetStyleSheet(sal_Bool& rOk) const { if (pAktCreate!=NULL) { - //rOk=TRUE; + //rOk=sal_True; return pAktCreate->GetStyleSheet(); } else @@ -945,12 +945,12 @@ SfxStyleSheet* SdrCreateView::GetStyleSheet() const // SfxStyleSheet* SdrCreateV } } -BOOL SdrCreateView::SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr) +sal_Bool SdrCreateView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr) { if (pAktCreate!=NULL) { pAktCreate->SetStyleSheet(pStyleSheet,bDontRemoveHardAttr); - return TRUE; + return sal_True; } else { diff --git a/svx/source/svdraw/svddrag.cxx b/svx/source/svdraw/svddrag.cxx index 8801fc067957..c2fb309b2e74 100644..100755 --- a/svx/source/svdraw/svddrag.cxx +++ b/svx/source/svdraw/svddrag.cxx @@ -50,20 +50,20 @@ void SdrDragStat::Reset() { pView=NULL; pPageView=NULL; - bShown=FALSE; + bShown=sal_False; nMinMov=1; - bMinMoved=FALSE; - bHorFixed=FALSE; - bVerFixed=FALSE; - bWantNoSnap=FALSE; + bMinMoved=sal_False; + bHorFixed=sal_False; + bVerFixed=sal_False; + bWantNoSnap=sal_False; pHdl=NULL; - bOrtho4=FALSE; - bOrtho8=FALSE; + bOrtho4=sal_False; + bOrtho8=sal_False; pDragMethod=NULL; - bEndDragChangesAttributes=FALSE; - bEndDragChangesGeoAndAttributes=FALSE; - bMouseIsUp=FALSE; - Clear(TRUE); + bEndDragChangesAttributes=sal_False; + bEndDragChangesGeoAndAttributes=sal_False; + bMouseIsUp=sal_False; + Clear(sal_True); aActionRect=Rectangle(); } @@ -115,7 +115,7 @@ bool SdrDragStat::CheckMinMoved(const Point& rPnt) long dx=rPnt.X()-GetPrev().X(); if (dx<0) dx=-dx; long dy=rPnt.Y()-GetPrev().Y(); if (dy<0) dy=-dy; if (dx>=long(nMinMov) || dy>=long(nMinMov)) - bMinMoved=TRUE; + bMinMoved=sal_True; } return bMinMoved; } diff --git a/svx/source/svdraw/svddrgm1.hxx b/svx/source/svdraw/svddrgm1.hxx index dd9ed18bc4c3..dd9ed18bc4c3 100644..100755 --- a/svx/source/svdraw/svddrgm1.hxx +++ b/svx/source/svdraw/svddrgm1.hxx diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index 8ea6f410cbfe..89c0e1ab3211 100644..100755 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -38,7 +38,7 @@ #include <tools/bigint.hxx> #include <vcl/svapp.hxx> -#include "xattr.hxx" +#include "svx/xattr.hxx" #include <svx/xpoly.hxx> #include <svx/svdetc.hxx> #include <svx/svdtrans.hxx> @@ -46,8 +46,8 @@ #include <svx/svdmark.hxx> #include <svx/svdocapt.hxx> #include <svx/svdpagv.hxx> -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache #include <svx/svddrgv.hxx> #include <svx/svdundo.hxx> #include <svx/svdograf.hxx> @@ -60,7 +60,7 @@ #include <svx/sdr/overlay/overlaymanager.hxx> #include <svx/sdr/overlay/overlayrollingrectangle.hxx> #include <svx/sdrpagewindow.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <svx/sdr/contact/viewobjectcontact.hxx> @@ -69,7 +69,7 @@ #include <svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx> #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> #include <svx/sdr/contact/objectcontact.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdopath.hxx> #include <svx/polypolygoneditor.hxx> #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> @@ -903,6 +903,9 @@ void SdrDragMovHdl::TakeSdrDragComment(XubString& rStr) const bool SdrDragMovHdl::BeginSdrDrag() { + if( !GetDragHdl() ) + return false; + DragStat().Ref1()=GetDragHdl()->GetPos(); DragStat().SetShown(!DragStat().IsShown()); SdrHdlKind eKind=GetDragHdl()->GetKind(); @@ -932,7 +935,7 @@ void SdrDragMovHdl::MoveSdrDrag(const Point& rNoSnapPnt) { Point aPnt(rNoSnapPnt); - if (DragStat().CheckMinMoved(rNoSnapPnt)) + if ( GetDragHdl() && DragStat().CheckMinMoved(rNoSnapPnt)) { if (GetDragHdl()->GetKind()==HDL_MIRX) { @@ -1043,22 +1046,25 @@ void SdrDragMovHdl::MoveSdrDrag(const Point& rNoSnapPnt) bool SdrDragMovHdl::EndSdrDrag(bool /*bCopy*/) { - switch (GetDragHdl()->GetKind()) + if( GetDragHdl() ) { - case HDL_REF1: - Ref1()=DragStat().GetNow(); - break; + switch (GetDragHdl()->GetKind()) + { + case HDL_REF1: + Ref1()=DragStat().GetNow(); + break; - case HDL_REF2: - Ref2()=DragStat().GetNow(); - break; + case HDL_REF2: + Ref2()=DragStat().GetNow(); + break; - case HDL_MIRX: - Ref1()+=DragStat().GetNow()-DragStat().GetStart(); - Ref2()+=DragStat().GetNow()-DragStat().GetStart(); - break; + case HDL_MIRX: + Ref1()+=DragStat().GetNow()-DragStat().GetStart(); + Ref2()+=DragStat().GetNow()-DragStat().GetStart(); + break; - default: break; + default: break; + } } return true; @@ -1067,7 +1073,11 @@ bool SdrDragMovHdl::EndSdrDrag(bool /*bCopy*/) void SdrDragMovHdl::CancelSdrDrag() { Hide(); - GetDragHdl()->SetPos(DragStat().GetRef1()); + + SdrHdl* pHdl = GetDragHdl(); + if( pHdl ) + pHdl->SetPos(DragStat().GetRef1()); + SdrHdl* pHM = GetHdlList().GetHdl(HDL_MIRX); if(pHM) @@ -1576,13 +1586,13 @@ void SdrDragMove::MoveSdrDrag(const Point& rNoSnapPnt_) { // Klebepunkte aufs BoundRect des Obj limitieren aPt1-=DragStat().GetStart(); const SdrMarkList& rML=GetMarkedObjectList(); - ULONG nMarkAnz=rML.GetMarkCount(); + sal_uLong nMarkAnz=rML.GetMarkCount(); - for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) + for (sal_uLong nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { const SdrMark* pM=rML.GetMark(nMarkNum); const SdrUShortCont* pPts=pM->GetMarkedGluePoints(); - ULONG nPtAnz=pPts==NULL ? 0 : pPts->GetCount(); + sal_uLong nPtAnz=pPts==NULL ? 0 : pPts->GetCount(); if (nPtAnz!=0) { @@ -1590,7 +1600,7 @@ void SdrDragMove::MoveSdrDrag(const Point& rNoSnapPnt_) const SdrGluePointList* pGPL=pObj->GetGluePointList(); Rectangle aBound(pObj->GetCurrentBoundRect()); - for (ULONG nPtNum=0; nPtNum<nPtAnz; nPtNum++) + for (sal_uLong nPtNum=0; nPtNum<nPtAnz; nPtNum++) { sal_uInt16 nId=pPts->GetObject(nPtNum); sal_uInt16 nGlueNum=pGPL->FindGluePoint(nId); @@ -1679,12 +1689,12 @@ void SdrDragResize::TakeSdrDragComment(XubString& rStr) const Fraction aFact1(1,1); Point aStart(DragStat().GetStart()); Point aRef(DragStat().GetRef1()); - INT32 nXDiv(aStart.X() - aRef.X()); + sal_Int32 nXDiv(aStart.X() - aRef.X()); if(!nXDiv) nXDiv = 1; - INT32 nYDiv(aStart.Y() - aRef.Y()); + sal_Int32 nYDiv(aStart.Y() - aRef.Y()); if(!nYDiv) nYDiv = 1; @@ -2021,7 +2031,7 @@ void SdrDragRotate::TakeSdrDragComment(XubString& rStr) const ImpTakeDescriptionStr(STR_DragMethRotate, rStr); rStr.AppendAscii(" ("); XubString aStr; - INT32 nTmpWink(NormAngle360(nWink)); + sal_Int32 nTmpWink(NormAngle360(nWink)); if(bRight && nWink) { @@ -2157,7 +2167,7 @@ void SdrDragShear::TakeSdrDragComment(XubString& rStr) const ImpTakeDescriptionStr(STR_DragMethShear, rStr); rStr.AppendAscii(" ("); - INT32 nTmpWink(nWink); + sal_Int32 nTmpWink(nWink); if(bUpSideDown) nTmpWink += 18000; @@ -2749,7 +2759,7 @@ void SdrDragCrook::TakeSdrDragComment(XubString& rStr) const rStr.AppendAscii(" ("); XubString aStr; - INT32 nVal(nWink); + sal_Int32 nVal(nWink); if(bAtCenter) nVal *= 2; @@ -3344,9 +3354,9 @@ bool SdrDragCrook::EndSdrDrag(bool bCopy) if (bCopy) getSdrDragView().CopyMarkedObj(); - ULONG nMarkAnz=getSdrDragView().GetMarkedObjectList().GetMarkCount(); + sal_uLong nMarkAnz=getSdrDragView().GetMarkedObjectList().GetMarkCount(); - for (ULONG nm=0; nm<nMarkAnz; nm++) + for (sal_uLong nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=getSdrDragView().GetMarkedObjectList().GetMark(nm); SdrObject* pO=pM->GetMarkedSdrObj(); diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx index 6ceeae4e3912..e232947cf933 100644..100755 --- a/svx/source/svdraw/svddrgv.cxx +++ b/svx/source/svdraw/svddrgv.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" #include <svx/svddrgv.hxx> -#include "xattr.hxx" +#include "svx/xattr.hxx" #include <svx/xpoly.hxx> #include <svx/svdetc.hxx> #include <svx/svdtrans.hxx> @@ -39,12 +39,12 @@ #include <svx/svdpagv.hxx> #include <svx/svdopath.hxx> #include <svx/svdoedge.hxx> -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" #include "svddrgm1.hxx" #include <svx/obj3d.hxx> #include <svx/svdoashp.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <svx/polypolygoneditor.hxx> @@ -69,34 +69,34 @@ using namespace sdr; void SdrDragView::ImpClearVars() { - bFramDrag=FALSE; + bFramDrag=sal_False; eDragMode=SDRDRAG_MOVE; - bDragLimit=FALSE; - bMarkedHitMovesAlways=FALSE; + bDragLimit=sal_False; + bMarkedHitMovesAlways=sal_False; eDragHdl=HDL_MOVE; pDragHdl=NULL; - bDragHdl=FALSE; - bDragSpecial=FALSE; + bDragHdl=sal_False; + bDragSpecial=sal_False; mpCurrentSdrDragMethod=NULL; - bDragStripes=FALSE; - bMirrRefDragObj=TRUE; - bDragWithCopy=FALSE; + bDragStripes=sal_False; + bMirrRefDragObj=sal_True; + bDragWithCopy=sal_False; pInsPointUndo=NULL; - bInsGluePoint=FALSE; - bInsObjPointMode=FALSE; - bInsGluePointMode=FALSE; + bInsGluePoint=sal_False; + bInsObjPointMode=sal_False; + bInsGluePointMode=sal_False; nDragXorPolyLimit=100; nDragXorPointLimit=500; - bNoDragXorPolys=FALSE; - bAutoVertexCon=TRUE; - bAutoCornerCon=FALSE; - bRubberEdgeDragging=TRUE; + bNoDragXorPolys=sal_False; + bAutoVertexCon=sal_True; + bAutoCornerCon=sal_False; + bRubberEdgeDragging=sal_True; nRubberEdgeDraggingLimit=100; - bDetailedEdgeDragging=TRUE; + bDetailedEdgeDragging=sal_True; nDetailedEdgeDraggingLimit=10; - bResizeAtCenter=FALSE; - bCrookAtCenter=FALSE; - bMouseHideWhileDraggingPoints=FALSE; + bResizeAtCenter=sal_False; + bCrookAtCenter=sal_False; + bMouseHideWhileDraggingPoints=sal_False; // init using default mbSolidDragging = getOptionsDrawinglayer().IsSolidDragCreate(); @@ -123,7 +123,7 @@ void SdrDragView::ImpDelDragAttr() { } -BOOL SdrDragView::IsAction() const +sal_Bool SdrDragView::IsAction() const { return (mpCurrentSdrDragMethod || SdrExchangeView::IsAction()); } @@ -141,7 +141,7 @@ void SdrDragView::EndAction() { if (mpCurrentSdrDragMethod) { - EndDragObj(FALSE); + EndDragObj(sal_False); } SdrExchangeView::EndAction(); } @@ -187,7 +187,7 @@ void SdrDragView::TakeActionRect(Rectangle& rRect) const } } -BOOL SdrDragView::TakeDragObjAnchorPos(Point& rPos, BOOL bTR ) const +sal_Bool SdrDragView::TakeDragObjAnchorPos(Point& rPos, sal_Bool bTR ) const { Rectangle aR; TakeActionRect(aR); @@ -200,8 +200,8 @@ BOOL SdrDragView::TakeDragObjAnchorPos(Point& rPos, BOOL bTR ) const if (pObj->ISA(SdrCaptionObj)) { Point aPt(((SdrCaptionObj*)pObj)->GetTailPos()); - BOOL bTail=eDragHdl==HDL_POLY; // Schwanz wird gedraggt (nicht so ganz feine Abfrage hier) - BOOL bOwn=mpCurrentSdrDragMethod->ISA(SdrDragObjOwn); // Objektspeziefisch + sal_Bool bTail=eDragHdl==HDL_POLY; // Schwanz wird gedraggt (nicht so ganz feine Abfrage hier) + sal_Bool bOwn=mpCurrentSdrDragMethod->ISA(SdrDragObjOwn); // Objektspeziefisch if (!bTail) { // bei bTail liefert TakeActionRect schon das richtige if (bOwn) @@ -217,30 +217,30 @@ BOOL SdrDragView::TakeDragObjAnchorPos(Point& rPos, BOOL bTR ) const } } } - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SdrDragView::TakeDragLimit(SdrDragMode /*eMode*/, Rectangle& /*rRect*/) const +sal_Bool SdrDragView::TakeDragLimit(SdrDragMode /*eMode*/, Rectangle& /*rRect*/) const { - return FALSE; + return sal_False; } -BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl, short nMinMov, SdrDragMethod* pForcedMeth) +sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl, short nMinMov, SdrDragMethod* pForcedMeth) { BrkAction(); bool bRet=false; { - SetDragWithCopy(FALSE); + SetDragWithCopy(sal_False); //ForceEdgesOfMarkedNodes(); //TODO: aAni.Reset(); mpCurrentSdrDragMethod=NULL; - bDragSpecial=FALSE; - bDragLimit=FALSE; + bDragSpecial=sal_False; + bDragLimit=sal_False; SdrDragMode eTmpMode=eDragMode; if (eTmpMode==SDRDRAG_MOVE && pHdl!=NULL && pHdl->GetKind()!=HDL_MOVE) { eTmpMode=SDRDRAG_RESIZE; @@ -250,7 +250,7 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl if (!bFramDrag && (pMarkedObj==NULL || !pMarkedObj->hasSpecialDrag()) && (pHdl==NULL || pHdl->GetObj()==NULL)) { - bFramDrag=TRUE; + bFramDrag=sal_True; } Point aPnt(rPnt); @@ -278,7 +278,7 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl bDragHdl=eDragHdl==HDL_REF1 || eDragHdl==HDL_REF2 || eDragHdl==HDL_MIRX; // #103894# Expand test for HDL_ANCHOR_TR - BOOL bNotDraggable = (HDL_ANCHOR == eDragHdl || HDL_ANCHOR_TR == eDragHdl); + sal_Bool bNotDraggable = (HDL_ANCHOR == eDragHdl || HDL_ANCHOR_TR == eDragHdl); if(pHdl && (pHdl->GetKind() == HDL_SMARTTAG) && pForcedMeth ) { @@ -300,18 +300,18 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl case HDL_UPPER: case HDL_LOWER: { // Sind 3D-Objekte selektiert? - BOOL b3DObjSelected = FALSE; - for(UINT32 a=0;!b3DObjSelected && a<GetMarkedObjectCount();a++) + sal_Bool b3DObjSelected = sal_False; + for(sal_uInt32 a=0;!b3DObjSelected && a<GetMarkedObjectCount();a++) { SdrObject* pObj = GetMarkedObjectByIndex(a); if(pObj && pObj->ISA(E3dObject)) - b3DObjSelected = TRUE; + b3DObjSelected = sal_True; } // Falls ja, Shear auch bei !IsShearAllowed zulassen, // da es sich bei 3D-Objekten um eingeschraenkte // Rotationen handelt if (!b3DObjSelected && !IsShearAllowed()) - return FALSE; + return sal_False; mpCurrentSdrDragMethod = new SdrDragShear(*this,eDragMode==SDRDRAG_ROTATE); } break; case HDL_UPLFT: case HDL_UPRGT: @@ -319,12 +319,12 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl { if (eDragMode==SDRDRAG_SHEAR || eDragMode==SDRDRAG_DISTORT) { - if (!IsDistortAllowed(TRUE) && !IsDistortAllowed(FALSE)) return FALSE; + if (!IsDistortAllowed(sal_True) && !IsDistortAllowed(sal_False)) return sal_False; mpCurrentSdrDragMethod = new SdrDragDistort(*this); } else { - if (!IsRotateAllowed(TRUE)) return FALSE; + if (!IsRotateAllowed(sal_True)) return sal_False; mpCurrentSdrDragMethod = new SdrDragRotate(*this); } } break; @@ -332,12 +332,12 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl { if (IsMarkedHitMovesAlways() && eDragHdl==HDL_MOVE) { // HDL_MOVE ist auch wenn Obj direkt getroffen - if (!IsMoveAllowed()) return FALSE; + if (!IsMoveAllowed()) return sal_False; mpCurrentSdrDragMethod = new SdrDragMove(*this); } else { - if (!IsRotateAllowed(TRUE)) return FALSE; + if (!IsRotateAllowed(sal_True)) return sal_False; mpCurrentSdrDragMethod = new SdrDragRotate(*this); } } @@ -347,12 +347,12 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl { if (eDragHdl==HDL_MOVE && IsMarkedHitMovesAlways()) { - if (!IsMoveAllowed()) return FALSE; + if (!IsMoveAllowed()) return sal_False; mpCurrentSdrDragMethod = new SdrDragMove(*this); } else { - if (!IsMirrorAllowed(TRUE,TRUE)) return FALSE; + if (!IsMirrorAllowed(sal_True,sal_True)) return sal_False; mpCurrentSdrDragMethod = new SdrDragMirror(*this); } } break; @@ -362,13 +362,13 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl if (eDragHdl==HDL_MOVE && IsMarkedHitMovesAlways()) { if (!IsMoveAllowed()) - return FALSE; + return sal_False; mpCurrentSdrDragMethod = new SdrDragMove(*this); } else { - if (!IsCrookAllowed(TRUE) && !IsCrookAllowed(FALSE)) - return FALSE; + if (!IsCrookAllowed(sal_True) && !IsCrookAllowed(sal_False)) + return sal_False; mpCurrentSdrDragMethod = new SdrDragCrop(*this); } } @@ -379,15 +379,15 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl if(eDragHdl == HDL_MOVE && IsMarkedHitMovesAlways()) { if(!IsMoveAllowed()) - return FALSE; + return sal_False; mpCurrentSdrDragMethod = new SdrDragMove(*this); } else { if(!IsTransparenceAllowed()) - return FALSE; + return sal_False; - mpCurrentSdrDragMethod = new SdrDragGradient(*this, FALSE); + mpCurrentSdrDragMethod = new SdrDragGradient(*this, sal_False); } break; } @@ -396,13 +396,13 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl if(eDragHdl == HDL_MOVE && IsMarkedHitMovesAlways()) { if(!IsMoveAllowed()) - return FALSE; + return sal_False; mpCurrentSdrDragMethod = new SdrDragMove(*this); } else { if(!IsGradientAllowed()) - return FALSE; + return sal_False; mpCurrentSdrDragMethod = new SdrDragGradient(*this); } @@ -413,12 +413,12 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl { if (eDragHdl==HDL_MOVE && IsMarkedHitMovesAlways()) { - if (!IsMoveAllowed()) return FALSE; + if (!IsMoveAllowed()) return sal_False; mpCurrentSdrDragMethod = new SdrDragMove(*this); } else { - if (!IsCrookAllowed(TRUE) && !IsCrookAllowed(FALSE)) return FALSE; + if (!IsCrookAllowed(sal_True) && !IsCrookAllowed(sal_False)) return sal_False; mpCurrentSdrDragMethod = new SdrDragCrook(*this); } } break; @@ -428,7 +428,7 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl // SDRDRAG_MOVE if((eDragHdl == HDL_MOVE) && !IsMoveAllowed()) { - return FALSE; + return sal_False; } else if(eDragHdl == HDL_GLUE) { @@ -444,9 +444,9 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl } else { - if(!IsResizeAllowed(TRUE)) + if(!IsResizeAllowed(sal_True)) { - return FALSE; + return sal_False; } sal_Bool bSingleTextObjMark = sal_False; // SJ: #i100490# @@ -489,14 +489,14 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl { // #i77187# // do not allow move of polygon points if object is move or size protected - return FALSE; + return sal_False; } } if(!mpCurrentSdrDragMethod) { // fallback to DragSpecial if no interaction defined - bDragSpecial = TRUE; + bDragSpecial = sal_True; mpCurrentSdrDragMethod = new SdrDragObjOwn(*this); } } @@ -520,12 +520,12 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl // Aha, Obj kann nicht Move SpecialDrag, also MoveFrameDrag versuchen delete mpCurrentSdrDragMethod; mpCurrentSdrDragMethod = 0; - bDragSpecial=FALSE; + bDragSpecial=sal_False; if (!IsMoveAllowed()) - return FALSE; + return sal_False; - bFramDrag=TRUE; + bFramDrag=sal_True; mpCurrentSdrDragMethod = new SdrDragMove(*this); aDragStat.SetDragMethod(mpCurrentSdrDragMethod); bRet = mpCurrentSdrDragMethod->BeginSdrDrag(); @@ -553,14 +553,14 @@ void SdrDragView::MovDragObj(const Point& rPnt) } } -BOOL SdrDragView::EndDragObj(BOOL bCopy) +sal_Bool SdrDragView::EndDragObj(sal_Bool bCopy) { bool bRet(false); // #i73341# If insert GluePoint, do not insist on last points being different if(mpCurrentSdrDragMethod && aDragStat.IsMinMoved() && (IsInsertGluePoint() || aDragStat.GetNow() != aDragStat.GetPrev())) { - ULONG nHdlAnzMerk=0; + sal_uIntPtr nHdlAnzMerk=0; if (bEliminatePolyPoints) { // IBM Special @@ -593,7 +593,7 @@ BOOL SdrDragView::EndDragObj(BOOL bCopy) if (bInsPolyPoint) { SetMarkHandles(); - bInsPolyPoint=FALSE; + bInsPolyPoint=sal_False; if( bUndo ) { BegUndo(aInsPointUndoStr); @@ -619,8 +619,8 @@ BOOL SdrDragView::EndDragObj(BOOL bCopy) BrkDragObj(); } - bInsPolyPoint=FALSE; - SetInsertGluePoint(FALSE); + bInsPolyPoint=sal_False; + SetInsertGluePoint(sal_False); return bRet; } @@ -640,7 +640,7 @@ void SdrDragView::BrkDragObj() delete pInsPointUndo; pInsPointUndo=NULL; SetMarkHandles(); - bInsPolyPoint=FALSE; + bInsPolyPoint=sal_False; } if (IsInsertGluePoint()) @@ -648,7 +648,7 @@ void SdrDragView::BrkDragObj() pInsPointUndo->Undo(); // Den eingefuegten Klebepunkt wieder raus delete pInsPointUndo; pInsPointUndo=NULL; - SetInsertGluePoint(FALSE); + SetInsertGluePoint(sal_False); } eDragHdl=HDL_MOVE; @@ -656,7 +656,7 @@ void SdrDragView::BrkDragObj() } } -BOOL SdrDragView::IsInsObjPointPossible() const +sal_Bool SdrDragView::IsInsObjPointPossible() const { return pMarkedObj!=NULL && pMarkedObj->IsPolyObj(); } @@ -732,51 +732,51 @@ sal_Bool SdrDragView::ImpBegInsObjPoint(sal_Bool bIdxZwang, sal_uInt32 nIdx, con return bRet; } -BOOL SdrDragView::EndInsObjPoint(SdrCreateCmd eCmd) +sal_Bool SdrDragView::EndInsObjPoint(SdrCreateCmd eCmd) { if(IsInsObjPoint()) { sal_uInt32 nNextPnt(mnInsPointNum); Point aPnt(aDragStat.GetNow()); - BOOL bOk=EndDragObj(FALSE); - if (bOk==TRUE && eCmd!=SDRCREATE_FORCEEND) + sal_Bool bOk=EndDragObj(sal_False); + if (bOk==sal_True && eCmd!=SDRCREATE_FORCEEND) { // Ret=True bedeutet: Action ist vorbei. bOk=!(ImpBegInsObjPoint(sal_True, nNextPnt, aPnt, eCmd == SDRCREATE_NEXTOBJECT, pDragWin)); } return bOk; - } else return FALSE; + } else return sal_False; } -BOOL SdrDragView::IsInsGluePointPossible() const +sal_Bool SdrDragView::IsInsGluePointPossible() const { - BOOL bRet=FALSE; + sal_Bool bRet=sal_False; if (IsInsGluePointMode() && AreObjectsMarked()) { if (GetMarkedObjectCount()==1) { - // FALSE liefern, wenn 1 Objekt und dieses ein Verbinder ist. + // sal_False liefern, wenn 1 Objekt und dieses ein Verbinder ist. const SdrObject* pObj=GetMarkedObjectByIndex(0); if (!HAS_BASE(SdrEdgeObj,pObj)) { - bRet=TRUE; + bRet=sal_True; } } else { - bRet=TRUE; + bRet=sal_True; } } return bRet; } -BOOL SdrDragView::BegInsGluePoint(const Point& rPnt) +sal_Bool SdrDragView::BegInsGluePoint(const Point& rPnt) { - BOOL bRet=FALSE; + sal_Bool bRet=sal_False; SdrObject* pObj; SdrPageView* pPV; - ULONG nMarkNum; + sal_uIntPtr nMarkNum; if (PickMarkedObj(rPnt,pObj,pPV,&nMarkNum,SDRSEARCH_PASS2BOUND)) { BrkAction(); @@ -792,9 +792,9 @@ BOOL SdrDragView::BegInsGluePoint(const Point& rPnt) SdrGluePointList* pGPL=pObj->ForceGluePointList(); if (pGPL!=NULL) { - USHORT nGlueIdx=pGPL->Insert(SdrGluePoint()); + sal_uInt16 nGlueIdx=pGPL->Insert(SdrGluePoint()); SdrGluePoint& rGP=(*pGPL)[nGlueIdx]; - USHORT nGlueId=rGP.GetId(); + sal_uInt16 nGlueId=rGP.GetId(); rGP.SetAbsolutePos(rPnt,*pObj); SdrHdl* pHdl=NULL; @@ -804,7 +804,7 @@ BOOL SdrDragView::BegInsGluePoint(const Point& rPnt) } if (pHdl!=NULL && pHdl->GetKind()==HDL_GLUE && pHdl->GetObj()==pObj && pHdl->GetObjHdlNum()==nGlueId) { - SetInsertGluePoint(TRUE); + SetInsertGluePoint(sal_True); bRet=BegDragObj(rPnt,NULL,pHdl,0); if (bRet) { @@ -813,7 +813,7 @@ BOOL SdrDragView::BegInsGluePoint(const Point& rPnt) } else { - SetInsertGluePoint(FALSE); + SetInsertGluePoint(sal_False); delete pInsPointUndo; pInsPointUndo=NULL; } @@ -826,7 +826,7 @@ BOOL SdrDragView::BegInsGluePoint(const Point& rPnt) else { // Keine Klebepunkte moeglich bei diesem Objekt (z.B. Edge) - SetInsertGluePoint(FALSE); + SetInsertGluePoint(sal_False); delete pInsPointUndo; pInsPointUndo=NULL; } @@ -853,7 +853,7 @@ void SdrDragView::ShowDragObj() } } - aDragStat.SetShown(TRUE); + aDragStat.SetShown(sal_True); } } @@ -862,13 +862,13 @@ void SdrDragView::HideDragObj() if(mpCurrentSdrDragMethod && aDragStat.IsShown()) { mpCurrentSdrDragMethod->destroyOverlayGeometry(); - aDragStat.SetShown(FALSE); + aDragStat.SetShown(sal_False); } } //////////////////////////////////////////////////////////////////////////////////////////////////// -void SdrDragView::SetNoDragXorPolys(BOOL bOn) +void SdrDragView::SetNoDragXorPolys(sal_Bool bOn) { if (IsNoDragXorPolys()!=bOn) { @@ -895,7 +895,7 @@ void SdrDragView::SetNoDragXorPolys(BOOL bOn) } } -void SdrDragView::SetDragStripes(BOOL bOn) +void SdrDragView::SetDragStripes(sal_Bool bOn) { if (mpCurrentSdrDragMethod && aDragStat.IsShown()) { @@ -909,24 +909,24 @@ void SdrDragView::SetDragStripes(BOOL bOn) } } -BOOL SdrDragView::IsOrthoDesired() const +sal_Bool SdrDragView::IsOrthoDesired() const { if(mpCurrentSdrDragMethod && (IS_TYPE(SdrDragObjOwn, mpCurrentSdrDragMethod) || IS_TYPE(SdrDragResize, mpCurrentSdrDragMethod))) { return bOrthoDesiredOnMarked; } - return FALSE; + return sal_False; } //////////////////////////////////////////////////////////////////////////////////////////////////// -void SdrDragView::SetRubberEdgeDragging(BOOL bOn) +void SdrDragView::SetRubberEdgeDragging(sal_Bool bOn) { if (bOn!=IsRubberEdgeDragging()) { - ULONG nAnz = GetEdgesOfMarkedNodes().GetMarkCount(); - BOOL bShowHide=nAnz!=0 && IsDragObj() && + sal_uIntPtr nAnz = GetEdgesOfMarkedNodes().GetMarkCount(); + sal_Bool bShowHide=nAnz!=0 && IsDragObj() && (nRubberEdgeDraggingLimit>=nAnz); if (bShowHide) HideDragObj(); @@ -936,12 +936,12 @@ void SdrDragView::SetRubberEdgeDragging(BOOL bOn) } } -void SdrDragView::SetRubberEdgeDraggingLimit(USHORT nEdgeObjAnz) +void SdrDragView::SetRubberEdgeDraggingLimit(sal_uInt16 nEdgeObjAnz) { if (nEdgeObjAnz!=nRubberEdgeDraggingLimit) { - ULONG nAnz = GetEdgesOfMarkedNodes().GetMarkCount(); - BOOL bShowHide=IsRubberEdgeDragging() && nAnz!=0 && IsDragObj() && + sal_uIntPtr nAnz = GetEdgesOfMarkedNodes().GetMarkCount(); + sal_Bool bShowHide=IsRubberEdgeDragging() && nAnz!=0 && IsDragObj() && (nEdgeObjAnz>=nAnz)!=(nRubberEdgeDraggingLimit>=nAnz); if (bShowHide) HideDragObj(); @@ -951,12 +951,12 @@ void SdrDragView::SetRubberEdgeDraggingLimit(USHORT nEdgeObjAnz) } } -void SdrDragView::SetDetailedEdgeDragging(BOOL bOn) +void SdrDragView::SetDetailedEdgeDragging(sal_Bool bOn) { if (bOn!=IsDetailedEdgeDragging()) { - ULONG nAnz = GetEdgesOfMarkedNodes().GetMarkCount(); - BOOL bShowHide=nAnz!=0 && IsDragObj() && + sal_uIntPtr nAnz = GetEdgesOfMarkedNodes().GetMarkCount(); + sal_Bool bShowHide=nAnz!=0 && IsDragObj() && (nDetailedEdgeDraggingLimit>=nAnz); if (bShowHide) HideDragObj(); @@ -966,12 +966,12 @@ void SdrDragView::SetDetailedEdgeDragging(BOOL bOn) } } -void SdrDragView::SetDetailedEdgeDraggingLimit(USHORT nEdgeObjAnz) +void SdrDragView::SetDetailedEdgeDraggingLimit(sal_uInt16 nEdgeObjAnz) { if (nEdgeObjAnz!=nDetailedEdgeDraggingLimit) { - ULONG nAnz = GetEdgesOfMarkedNodes().GetMarkCount(); - BOOL bShowHide=IsDetailedEdgeDragging() && nAnz!=0 && IsDragObj() && + sal_uIntPtr nAnz = GetEdgesOfMarkedNodes().GetMarkCount(); + sal_Bool bShowHide=IsDetailedEdgeDragging() && nAnz!=0 && IsDragObj() && (nEdgeObjAnz>=nAnz)!=(nDetailedEdgeDraggingLimit>=nAnz); if (bShowHide) HideDragObj(); diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index 9d44dbde6565..ed9d575d62bc 100644..100755 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -41,8 +41,8 @@ #include <svx/svdpagv.hxx> #include <svx/svdpage.hxx> #include <svx/svdpoev.hxx> // fuer die PolyPossiblities -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache #include <svx/e3dsceneupdater.hxx> // #i13033# @@ -64,55 +64,55 @@ void SdrEditView::ImpResetPossibilityFlags() { - bReadOnly =FALSE; - - bGroupPossible =FALSE; - bUnGroupPossible =FALSE; - bGrpEnterPossible =FALSE; - bDeletePossible =FALSE; - bToTopPossible =FALSE; - bToBtmPossible =FALSE; - bReverseOrderPossible =FALSE; - - bImportMtfPossible =FALSE; - bCombinePossible =FALSE; - bDismantlePossible =FALSE; - bCombineNoPolyPolyPossible =FALSE; - bDismantleMakeLinesPossible=FALSE; - bOrthoDesiredOnMarked =FALSE; - - bMoreThanOneNotMovable =FALSE; - bOneOrMoreMovable =FALSE; - bMoreThanOneNoMovRot =FALSE; - bContortionPossible =FALSE; - bAllPolys =FALSE; - bOneOrMorePolys =FALSE; - bMoveAllowed =FALSE; - bResizeFreeAllowed =FALSE; - bResizePropAllowed =FALSE; - bRotateFreeAllowed =FALSE; - bRotate90Allowed =FALSE; - bMirrorFreeAllowed =FALSE; - bMirror45Allowed =FALSE; - bMirror90Allowed =FALSE; - bTransparenceAllowed =FALSE; - bGradientAllowed =FALSE; - bShearAllowed =FALSE; - bEdgeRadiusAllowed =FALSE; - bCanConvToPath =FALSE; - bCanConvToPoly =FALSE; - bCanConvToContour =FALSE; - bCanConvToPathLineToArea=FALSE; - bCanConvToPolyLineToArea=FALSE; - bMoveProtect =FALSE; - bResizeProtect =FALSE; + bReadOnly =sal_False; + + bGroupPossible =sal_False; + bUnGroupPossible =sal_False; + bGrpEnterPossible =sal_False; + bDeletePossible =sal_False; + bToTopPossible =sal_False; + bToBtmPossible =sal_False; + bReverseOrderPossible =sal_False; + + bImportMtfPossible =sal_False; + bCombinePossible =sal_False; + bDismantlePossible =sal_False; + bCombineNoPolyPolyPossible =sal_False; + bDismantleMakeLinesPossible=sal_False; + bOrthoDesiredOnMarked =sal_False; + + bMoreThanOneNotMovable =sal_False; + bOneOrMoreMovable =sal_False; + bMoreThanOneNoMovRot =sal_False; + bContortionPossible =sal_False; + bAllPolys =sal_False; + bOneOrMorePolys =sal_False; + bMoveAllowed =sal_False; + bResizeFreeAllowed =sal_False; + bResizePropAllowed =sal_False; + bRotateFreeAllowed =sal_False; + bRotate90Allowed =sal_False; + bMirrorFreeAllowed =sal_False; + bMirror45Allowed =sal_False; + bMirror90Allowed =sal_False; + bTransparenceAllowed =sal_False; + bGradientAllowed =sal_False; + bShearAllowed =sal_False; + bEdgeRadiusAllowed =sal_False; + bCanConvToPath =sal_False; + bCanConvToPoly =sal_False; + bCanConvToContour =sal_False; + bCanConvToPathLineToArea=sal_False; + bCanConvToPolyLineToArea=sal_False; + bMoveProtect =sal_False; + bResizeProtect =sal_False; } void SdrEditView::ImpClearVars() { ImpResetPossibilityFlags(); - bPossibilitiesDirty=TRUE; // << war von Purify angemeckert - bBundleVirtObj=FALSE; + bPossibilitiesDirty=sal_True; // << war von Purify angemeckert + bBundleVirtObj=sal_False; } SdrEditView::SdrEditView(SdrModel* pModel1, OutputDevice* pOut): @@ -127,10 +127,10 @@ SdrEditView::~SdrEditView() //////////////////////////////////////////////////////////////////////////////////////////////////// -SdrLayer* SdrEditView::InsertNewLayer(const XubString& rName, USHORT nPos) +SdrLayer* SdrEditView::InsertNewLayer(const XubString& rName, sal_uInt16 nPos) { SdrLayerAdmin& rLA=pMod->GetLayerAdmin(); - USHORT nMax=rLA.GetLayerCount(); + sal_uInt16 nMax=rLA.GetLayerCount(); if (nPos>nMax) nPos=nMax; SdrLayer* pNewLayer=rLA.NewLayer(rName,nPos); @@ -144,7 +144,7 @@ SdrLayer* SdrEditView::InsertNewLayer(const XubString& rName, USHORT nPos) #include <svx/svdogrp.hxx> #include <svx/scene3d.hxx> -BOOL SdrEditView::ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const +sal_Bool SdrEditView::ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const { sal_Bool bDelAll(sal_True); sal_uInt32 nObjAnz(pOL->GetObjCount()); @@ -225,7 +225,7 @@ void SdrEditView::ImpDelLayerDelObjs(SdrObjList* pOL, SdrLayerID nDelID) void SdrEditView::DeleteLayer(const XubString& rName) { SdrLayerAdmin& rLA = pMod->GetLayerAdmin(); - SdrLayer* pLayer = rLA.GetLayer(rName, TRUE); + SdrLayer* pLayer = rLA.GetLayer(rName, sal_True); sal_uInt16 nLayerNum(rLA.GetLayerPos(pLayer)); if(SDRLAYER_NOTFOUND != nLayerNum) @@ -307,11 +307,11 @@ void SdrEditView::DeleteLayer(const XubString& rName) } } -void SdrEditView::MoveLayer(const XubString& rName, USHORT nNewPos) +void SdrEditView::MoveLayer(const XubString& rName, sal_uInt16 nNewPos) { SdrLayerAdmin& rLA=pMod->GetLayerAdmin(); - SdrLayer* pLayer=rLA.GetLayer(rName,TRUE); - USHORT nLayerNum=rLA.GetLayerPos(pLayer); + SdrLayer* pLayer=rLA.GetLayer(rName,sal_True); + sal_uInt16 nLayerNum=rLA.GetLayerPos(pLayer); if (nLayerNum!=SDRLAYER_NOTFOUND) { if( IsUndoEnabled() ) @@ -383,8 +383,8 @@ void SdrEditView::ImpBroadcastEdgesOfMarkedNodes() } } - ULONG nMarkedEdgeAnz = GetMarkedEdgesOfMarkedNodes().GetMarkCount(); - USHORT i; + sal_uIntPtr nMarkedEdgeAnz = GetMarkedEdgesOfMarkedNodes().GetMarkCount(); + sal_uInt16 i; for (i=0; i<nMarkedEdgeAnz; i++) { SdrMark* pEM = GetMarkedEdgesOfMarkedNodes().GetMark(i); @@ -409,95 +409,95 @@ void SdrEditView::ImpBroadcastEdgesOfMarkedNodes() void SdrEditView::MarkListHasChanged() { SdrMarkView::MarkListHasChanged(); - bPossibilitiesDirty=TRUE; + bPossibilitiesDirty=sal_True; } void SdrEditView::ModelHasChanged() { SdrMarkView::ModelHasChanged(); - bPossibilitiesDirty=TRUE; + bPossibilitiesDirty=sal_True; } -BOOL SdrEditView::IsResizeAllowed(BOOL bProp) const +sal_Bool SdrEditView::IsResizeAllowed(sal_Bool bProp) const { ForcePossibilities(); - if (bResizeProtect) return FALSE; + if (bResizeProtect) return sal_False; if (bProp) return bResizePropAllowed; return bResizeFreeAllowed; } -BOOL SdrEditView::IsRotateAllowed(BOOL b90Deg) const +sal_Bool SdrEditView::IsRotateAllowed(sal_Bool b90Deg) const { ForcePossibilities(); - if (bMoveProtect) return FALSE; + if (bMoveProtect) return sal_False; if (b90Deg) return bRotate90Allowed; return bRotateFreeAllowed; } -BOOL SdrEditView::IsMirrorAllowed(BOOL b45Deg, BOOL b90Deg) const +sal_Bool SdrEditView::IsMirrorAllowed(sal_Bool b45Deg, sal_Bool b90Deg) const { ForcePossibilities(); - if (bMoveProtect) return FALSE; + if (bMoveProtect) return sal_False; if (b90Deg) return bMirror90Allowed; if (b45Deg) return bMirror45Allowed; return bMirrorFreeAllowed && !bMoveProtect; } -BOOL SdrEditView::IsTransparenceAllowed() const +sal_Bool SdrEditView::IsTransparenceAllowed() const { ForcePossibilities(); return bTransparenceAllowed; } -BOOL SdrEditView::IsGradientAllowed() const +sal_Bool SdrEditView::IsGradientAllowed() const { ForcePossibilities(); return bGradientAllowed; } -BOOL SdrEditView::IsShearAllowed() const +sal_Bool SdrEditView::IsShearAllowed() const { ForcePossibilities(); - if (bResizeProtect) return FALSE; + if (bResizeProtect) return sal_False; return bShearAllowed; } -BOOL SdrEditView::IsEdgeRadiusAllowed() const +sal_Bool SdrEditView::IsEdgeRadiusAllowed() const { ForcePossibilities(); return bEdgeRadiusAllowed; } -BOOL SdrEditView::IsCrookAllowed(BOOL bNoContortion) const +sal_Bool SdrEditView::IsCrookAllowed(sal_Bool bNoContortion) const { // CrookMode fehlt hier (weil kein Rotate bei Shear ...) ForcePossibilities(); if (bNoContortion) { - if (!bRotateFreeAllowed) return FALSE; // Crook is nich + if (!bRotateFreeAllowed) return sal_False; // Crook is nich return !bMoveProtect && bMoveAllowed; } else { return !bResizeProtect && bContortionPossible; } } -BOOL SdrEditView::IsDistortAllowed(BOOL bNoContortion) const +sal_Bool SdrEditView::IsDistortAllowed(sal_Bool bNoContortion) const { ForcePossibilities(); if (bNoContortion) { - return FALSE; + return sal_False; } else { return !bResizeProtect && bContortionPossible; } } -BOOL SdrEditView::IsCombinePossible(BOOL bNoPolyPoly) const +sal_Bool SdrEditView::IsCombinePossible(sal_Bool bNoPolyPoly) const { ForcePossibilities(); if (bNoPolyPoly) return bCombineNoPolyPolyPossible; else return bCombinePossible; } -BOOL SdrEditView::IsDismantlePossible(BOOL bMakeLines) const +sal_Bool SdrEditView::IsDismantlePossible(sal_Bool bMakeLines) const { ForcePossibilities(); if (bMakeLines) return bDismantleMakeLinesPossible; @@ -506,7 +506,7 @@ BOOL SdrEditView::IsDismantlePossible(BOOL bMakeLines) const void SdrEditView::CheckPossibilities() { - if (bSomeObjChgdFlag) bPossibilitiesDirty=TRUE; + if (bSomeObjChgdFlag) bPossibilitiesDirty=sal_True; if(bSomeObjChgdFlag) { @@ -519,11 +519,11 @@ void SdrEditView::CheckPossibilities() if (bPossibilitiesDirty) { ImpResetPossibilityFlags(); SortMarkedObjects(); - ULONG nMarkAnz=GetMarkedObjectCount(); + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); if (nMarkAnz!=0) { bReverseOrderPossible=nMarkAnz>=2; - ULONG nMovableCount=0; + sal_uIntPtr nMovableCount=0; bGroupPossible=nMarkAnz>=2; bCombinePossible=nMarkAnz>=2; if (nMarkAnz==1) { @@ -531,27 +531,27 @@ void SdrEditView::CheckPossibilities() // fehlt noch ... const SdrObject* pObj=GetMarkedObjectByIndex(0); //const SdrPathObj* pPath=PTR_CAST(SdrPathObj,pObj); - BOOL bGroup=pObj->GetSubList()!=NULL; - BOOL bHasText=pObj->GetOutlinerParaObject()!=NULL; + sal_Bool bGroup=pObj->GetSubList()!=NULL; + sal_Bool bHasText=pObj->GetOutlinerParaObject()!=NULL; if (bGroup || bHasText) { - bCombinePossible=TRUE; + bCombinePossible=sal_True; } } bCombineNoPolyPolyPossible=bCombinePossible; - bDeletePossible=TRUE; + bDeletePossible=sal_True; // Zu den Transformationen erstmal ja sagen - bMoveAllowed =TRUE; - bResizeFreeAllowed=TRUE; - bResizePropAllowed=TRUE; - bRotateFreeAllowed=TRUE; - bRotate90Allowed =TRUE; - bMirrorFreeAllowed=TRUE; - bMirror45Allowed =TRUE; - bMirror90Allowed =TRUE; - bShearAllowed =TRUE; - bEdgeRadiusAllowed=FALSE; - bContortionPossible=TRUE; - bCanConvToContour = TRUE; + bMoveAllowed =sal_True; + bResizeFreeAllowed=sal_True; + bResizePropAllowed=sal_True; + bRotateFreeAllowed=sal_True; + bRotate90Allowed =sal_True; + bMirrorFreeAllowed=sal_True; + bMirror45Allowed =sal_True; + bMirror90Allowed =sal_True; + bShearAllowed =sal_True; + bEdgeRadiusAllowed=sal_False; + bContortionPossible=sal_True; + bCanConvToContour = sal_True; // these ones are only allowed when single object is selected bTransparenceAllowed = (nMarkAnz == 1); @@ -564,7 +564,7 @@ void SdrEditView::CheckPossibilities() // maybe group object, so get merged ItemSet const SfxItemSet& rSet = pObj->GetMergedItemSet(); - SfxItemState eState = rSet.GetItemState(XATTR_FILLSTYLE, FALSE); + SfxItemState eState = rSet.GetItemState(XATTR_FILLSTYLE, sal_False); if(SFX_ITEM_DONTCARE != eState) { @@ -573,67 +573,67 @@ void SdrEditView::CheckPossibilities() if(eFillStyle != XFILL_GRADIENT) { - bGradientAllowed = FALSE; + bGradientAllowed = sal_False; } } } - BOOL bNoMovRotFound=FALSE; + sal_Bool bNoMovRotFound=sal_False; const SdrPageView* pPV0=NULL; - for (ULONG nm=0; nm<nMarkAnz; nm++) { + for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { const SdrMark* pM=GetSdrMarkByIndex(nm); const SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrPageView* pPV=pM->GetPageView(); if (pPV!=pPV0) { - if (pPV->IsReadOnly()) bReadOnly=TRUE; + if (pPV->IsReadOnly()) bReadOnly=sal_True; pPV0=pPV; } SdrObjTransformInfoRec aInfo; pObj->TakeObjInfo(aInfo); - BOOL bMovPrt=pObj->IsMoveProtect(); - BOOL bSizPrt=pObj->IsResizeProtect(); + sal_Bool bMovPrt=pObj->IsMoveProtect(); + sal_Bool bSizPrt=pObj->IsResizeProtect(); if (!bMovPrt && aInfo.bMoveAllowed) nMovableCount++; // Menge der MovableObjs zaehlen - if (bMovPrt) bMoveProtect=TRUE; - if (bSizPrt) bResizeProtect=TRUE; + if (bMovPrt) bMoveProtect=sal_True; + if (bSizPrt) bResizeProtect=sal_True; // not allowed when not allowed at one object if(!aInfo.bTransparenceAllowed) - bTransparenceAllowed = FALSE; + bTransparenceAllowed = sal_False; // Wenn einer was nicht kann, duerfen's alle nicht - if (!aInfo.bMoveAllowed ) bMoveAllowed =FALSE; - if (!aInfo.bResizeFreeAllowed) bResizeFreeAllowed=FALSE; - if (!aInfo.bResizePropAllowed) bResizePropAllowed=FALSE; - if (!aInfo.bRotateFreeAllowed) bRotateFreeAllowed=FALSE; - if (!aInfo.bRotate90Allowed ) bRotate90Allowed =FALSE; - if (!aInfo.bMirrorFreeAllowed) bMirrorFreeAllowed=FALSE; - if (!aInfo.bMirror45Allowed ) bMirror45Allowed =FALSE; - if (!aInfo.bMirror90Allowed ) bMirror90Allowed =FALSE; - if (!aInfo.bShearAllowed ) bShearAllowed =FALSE; - if (aInfo.bEdgeRadiusAllowed) bEdgeRadiusAllowed=TRUE; - if (aInfo.bNoContortion ) bContortionPossible=FALSE; + if (!aInfo.bMoveAllowed ) bMoveAllowed =sal_False; + if (!aInfo.bResizeFreeAllowed) bResizeFreeAllowed=sal_False; + if (!aInfo.bResizePropAllowed) bResizePropAllowed=sal_False; + if (!aInfo.bRotateFreeAllowed) bRotateFreeAllowed=sal_False; + if (!aInfo.bRotate90Allowed ) bRotate90Allowed =sal_False; + if (!aInfo.bMirrorFreeAllowed) bMirrorFreeAllowed=sal_False; + if (!aInfo.bMirror45Allowed ) bMirror45Allowed =sal_False; + if (!aInfo.bMirror90Allowed ) bMirror90Allowed =sal_False; + if (!aInfo.bShearAllowed ) bShearAllowed =sal_False; + if (aInfo.bEdgeRadiusAllowed) bEdgeRadiusAllowed=sal_True; + if (aInfo.bNoContortion ) bContortionPossible=sal_False; // Fuer Crook mit Contortion: Alle Objekte muessen // Movable und Rotatable sein, ausser maximal 1 if (!bMoreThanOneNoMovRot) { if (!aInfo.bMoveAllowed || !aInfo.bResizeFreeAllowed) { bMoreThanOneNoMovRot=bNoMovRotFound; - bNoMovRotFound=TRUE; + bNoMovRotFound=sal_True; } } // when one member cannot be converted, no conversion is possible if(!aInfo.bCanConvToContour) - bCanConvToContour = FALSE; + bCanConvToContour = sal_False; // Ungroup if (!bUnGroupPossible) bUnGroupPossible=pObj->GetSubList()!=NULL; // ConvertToCurve: Wenn mind. einer konvertiert werden kann ist das ok. - if (aInfo.bCanConvToPath ) bCanConvToPath =TRUE; - if (aInfo.bCanConvToPoly ) bCanConvToPoly =TRUE; - if (aInfo.bCanConvToPathLineToArea) bCanConvToPathLineToArea=TRUE; - if (aInfo.bCanConvToPolyLineToArea) bCanConvToPolyLineToArea=TRUE; + if (aInfo.bCanConvToPath ) bCanConvToPath =sal_True; + if (aInfo.bCanConvToPoly ) bCanConvToPoly =sal_True; + if (aInfo.bCanConvToPathLineToArea) bCanConvToPathLineToArea=sal_True; + if (aInfo.bCanConvToPolyLineToArea) bCanConvToPolyLineToArea=sal_True; // Combine/Dismantle if(bCombinePossible) @@ -645,15 +645,15 @@ void SdrEditView::CheckPossibilities() if (!bDismantlePossible) bDismantlePossible = ImpCanDismantle(pObj, sal_False); if (!bDismantleMakeLinesPossible) bDismantleMakeLinesPossible = ImpCanDismantle(pObj, sal_True); // OrthoDesiredOnMarked checken - if (!bOrthoDesiredOnMarked && !aInfo.bNoOrthoDesired) bOrthoDesiredOnMarked=TRUE; + if (!bOrthoDesiredOnMarked && !aInfo.bNoOrthoDesired) bOrthoDesiredOnMarked=sal_True; // ImportMtf checken if (!bImportMtfPossible) { - BOOL bGraf=HAS_BASE(SdrGrafObj,pObj); - BOOL bOle2=HAS_BASE(SdrOle2Obj,pObj); + sal_Bool bGraf=HAS_BASE(SdrGrafObj,pObj); + sal_Bool bOle2=HAS_BASE(SdrOle2Obj,pObj); if( bGraf && ((SdrGrafObj*)pObj)->HasGDIMetaFile() && !((SdrGrafObj*)pObj)->IsEPS() ) - bImportMtfPossible = TRUE; + bImportMtfPossible = sal_True; if (bOle2) bImportMtfPossible=((SdrOle2Obj*)pObj)->GetObjRef().is(); @@ -666,12 +666,12 @@ void SdrEditView::CheckPossibilities() } ImpCheckToTopBtmPossible(); ((SdrPolyEditView*)this)->ImpCheckPolyPossibilities(); - bPossibilitiesDirty=FALSE; + bPossibilitiesDirty=sal_False; if (bReadOnly) { - BOOL bMerker1=bGrpEnterPossible; + sal_Bool bMerker1=bGrpEnterPossible; ImpResetPossibilityFlags(); - bReadOnly=TRUE; + bReadOnly=sal_True; bGrpEnterPossible=bMerker1; } if (bMoveAllowed) { @@ -681,9 +681,9 @@ void SdrEditView::CheckPossibilities() SdrObject* pObj=GetMarkedObjectByIndex(0); SdrEdgeObj* pEdge=PTR_CAST(SdrEdgeObj,pObj); if (pEdge!=NULL) { - SdrObject* pNode1=pEdge->GetConnectedNode(TRUE); - SdrObject* pNode2=pEdge->GetConnectedNode(FALSE); - if (pNode1!=NULL || pNode2!=NULL) bMoveAllowed=FALSE; + SdrObject* pNode1=pEdge->GetConnectedNode(sal_True); + SdrObject* pNode2=pEdge->GetConnectedNode(sal_False); + if (pNode1!=NULL || pNode2!=NULL) bMoveAllowed=sal_False; } } } @@ -694,14 +694,14 @@ void SdrEditView::CheckPossibilities() void SdrEditView::ForceMarkedObjToAnotherPage() { - BOOL bFlg=FALSE; - for (ULONG nm=0; nm<GetMarkedObjectCount(); nm++) { + sal_Bool bFlg=sal_False; + for (sal_uIntPtr nm=0; nm<GetMarkedObjectCount(); nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); Rectangle aObjRect(pObj->GetCurrentBoundRect()); Rectangle aPgRect(pM->GetPageView()->GetPageRect()); if (!aObjRect.IsOver(aPgRect)) { - BOOL bFnd=FALSE; + sal_Bool bFnd=sal_False; SdrPageView* pPV = GetSdrPageView(); if(pPV) @@ -716,7 +716,7 @@ void SdrEditView::ForceMarkedObjToAnotherPage() pPV->GetObjList()->InsertObject(pObj,CONTAINER_APPEND,&aReason); pM->SetPageView(pPV); InvalidateAllWin(aObjRect); - bFlg=TRUE; + bFlg=sal_True; } } } @@ -923,8 +923,8 @@ void SdrEditView::CopyMarkedObj() SdrMarkList aSourceObjectsForCopy(GetMarkedObjectList()); // Folgende Schleife Anstatt MarkList::Merge(), damit // ich jeweils mein Flag an die MarkEntries setzen kann. - ULONG nEdgeAnz = GetEdgesOfMarkedNodes().GetMarkCount(); - for (ULONG nEdgeNum=0; nEdgeNum<nEdgeAnz; nEdgeNum++) { + sal_uIntPtr nEdgeAnz = GetEdgesOfMarkedNodes().GetMarkCount(); + for (sal_uIntPtr nEdgeNum=0; nEdgeNum<nEdgeAnz; nEdgeNum++) { SdrMark aM(*GetEdgesOfMarkedNodes().GetMark(nEdgeNum)); aM.SetUser(1); aSourceObjectsForCopy.InsertEntry(aM); @@ -938,9 +938,9 @@ void SdrEditView::CopyMarkedObj() const bool bUndo = IsUndoEnabled(); GetMarkedObjectListWriteAccess().Clear(); - ULONG nCloneErrCnt=0; - ULONG nMarkAnz=aSourceObjectsForCopy.GetMarkCount(); - ULONG nm; + sal_uIntPtr nCloneErrCnt=0; + sal_uIntPtr nMarkAnz=aSourceObjectsForCopy.GetMarkCount(); + sal_uIntPtr nm; for (nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=aSourceObjectsForCopy.GetMark(nm); SdrObject* pO=pM->GetMarkedSdrObj()->Clone(); @@ -994,14 +994,14 @@ void SdrEditView::CopyMarkedObj() //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, ULONG nOptions) +sal_Bool SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, sal_uIntPtr nOptions) { if ((nOptions & SDRINSERT_SETDEFLAYER)!=0) { - SdrLayerID nLayer=rPV.GetPage()->GetLayerAdmin().GetLayerID(aAktLayer,TRUE); + SdrLayerID nLayer=rPV.GetPage()->GetLayerAdmin().GetLayerID(aAktLayer,sal_True); if (nLayer==SDRLAYER_NOTFOUND) nLayer=0; if (rPV.GetLockedLayers().IsSet(nLayer) || !rPV.GetVisibleLayers().IsSet(nLayer)) { SdrObject::Free( pObj ); // Layer gesperrt oder nicht sichtbar - return FALSE; + return sal_False; } pObj->NbcSetLayer(nLayer); } @@ -1024,10 +1024,10 @@ BOOL SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, ULONG nO if ((nOptions & SDRINSERT_ADDMARK)==0) UnmarkAllObj(); MarkObj(pObj,&rPV); } - return TRUE; + return sal_True; } -void SdrEditView::ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, BOOL bMark) +void SdrEditView::ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, sal_Bool bMark) { SdrObjList* pOL=pOldObj->GetObjList(); const bool bUndo = IsUndoEnabled(); @@ -1035,7 +1035,7 @@ void SdrEditView::ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrO AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoReplaceObject(*pOldObj,*pNewObj)); if( IsObjMarked( pOldObj ) ) - MarkObj( pOldObj, &rPV, TRUE /*unmark!*/ ); + MarkObj( pOldObj, &rPV, sal_True /*unmark!*/ ); pOL->ReplaceObject(pNewObj,pOldObj->GetOrdNum()); @@ -1047,46 +1047,6 @@ void SdrEditView::ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrO //////////////////////////////////////////////////////////////////////////////////////////////////// -#ifdef WIN -void SdrEditView::BegUndo() // Undo-Klammerung auf -{ - pMod->BegUndo(); -} - -void SdrEditView::BegUndo(const String& rComment) // Undo-Klammerung auf -{ - pMod->BegUndo(rComment); -} - -void SdrEditView::BegUndo(const String& rComment, const String& rObjDescr, - SdrRepeatFunc eFunc) // Undo-Klammerung auf -{ - pMod->BegUndo(rComment,rObjDescr,eFunc); -} - -void SdrEditView::BegUndo(SdrUndoGroup* pUndoGrp) // Undo-Klammerung auf -{ - pMod->BegUndo(pUndoGrp); -} - -void SdrEditView::AddUndo(SdrUndoAction* pUndo) // Action hinzufuegen -{ - pMod->AddUndo(pUndo); -} - // nur nach dem 1. BegUndo oder vor dem letzten EndUndo: -void SdrEditView::SetUndoComment(const String& rComment) -{ - pMod->SetUndoComment(rComment); -} - - -void SdrEditView::SetUndoComment(const String& rComment, - const String& rObjDescr) -{ - pMod->SetUndoComment(rComment,rObjDescr); -} -#endif - bool SdrEditView::IsUndoEnabled() const { return pMod->IsUndoEnabled(); diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 386d2608bac0..8081ab2a48db 100644..100755 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -41,8 +41,8 @@ #include <svx/rectenum.hxx> #include <svx/svxids.hrc> // fuer SID_ATTR_TRANSFORM_... #include <svx/svdattr.hxx> // fuer Get/SetGeoAttr -#include "svditext.hxx" -#include "svditer.hxx" +#include "svx/svditext.hxx" +#include "svx/svditer.hxx" #include <svx/svdtrans.hxx> #include <svx/svdundo.hxx> #include <svx/svdpage.hxx> @@ -51,8 +51,8 @@ #include <svx/svdattrx.hxx> // fuer MergeNotPersistAttr #include <svx/svdetc.hxx> // fuer SearchOutlinerItems #include <svx/svdopath.hxx> // fuer Crook -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache #include <editeng/eeitem.hxx> #include <svl/aeitem.hxx> #include <svl/whiter.hxx> @@ -77,11 +77,11 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////// -void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, BOOL bCopy) +void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, sal_Bool bCopy) { DBG_ASSERT(!rRect.IsEmpty(),"SetMarkedObjRect() mit leerem Rect mach keinen Sinn"); if (rRect.IsEmpty()) return; - ULONG nAnz=GetMarkedObjectCount(); + sal_uIntPtr nAnz=GetMarkedObjectCount(); if (nAnz==0) return; Rectangle aR0(GetMarkedObjRect()); DBG_ASSERT(!aR0.IsEmpty(),"SetMarkedObjRect(): GetMarkedObjRect() ist leer"); @@ -106,7 +106,7 @@ void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, BOOL bCopy) if (bCopy) CopyMarkedObj(); - for (ULONG nm=0; nm<nAnz; nm++) + for (sal_uIntPtr nm=0; nm<nAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pO=pM->GetMarkedSdrObj(); @@ -204,8 +204,8 @@ void SdrEditView::MoveMarkedObj(const Size& rSiz, bool bCopy) if (bCopy) CopyMarkedObj(); - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nm=0; nm<nMarkAnz; nm++) + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pO=pM->GetMarkedSdrObj(); @@ -237,8 +237,8 @@ void SdrEditView::ResizeMarkedObj(const Point& rRef, const Fraction& xFact, cons if (bCopy) CopyMarkedObj(); - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nm=0; nm<nMarkAnz; nm++) + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pO=pM->GetMarkedSdrObj(); @@ -257,17 +257,17 @@ void SdrEditView::ResizeMarkedObj(const Point& rRef, const Fraction& xFact, cons long SdrEditView::GetMarkedObjRotate() const { - BOOL b1st=TRUE; - BOOL bOk=TRUE; + sal_Bool b1st=sal_True; + sal_Bool bOk=sal_True; long nWink=0; - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nm=0; nm<nMarkAnz && bOk; nm++) { + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nm=0; nm<nMarkAnz && bOk; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pO=pM->GetMarkedSdrObj(); long nWink2=pO->GetRotateAngle(); if (b1st) nWink=nWink2; - else if (nWink2!=nWink) bOk=FALSE; - b1st=FALSE; + else if (nWink2!=nWink) bOk=sal_False; + b1st=sal_False; } if (!bOk) nWink=0; return nWink; @@ -390,7 +390,7 @@ void SdrEditView::MirrorMarkedObj(const Point& rRef1, const Point& rRef2, bool b EndUndo(); } -void SdrEditView::MirrorMarkedObjHorizontal(BOOL bCopy) +void SdrEditView::MirrorMarkedObjHorizontal(sal_Bool bCopy) { Point aCenter(GetMarkedObjRect().Center()); Point aPt2(aCenter); @@ -398,7 +398,7 @@ void SdrEditView::MirrorMarkedObjHorizontal(BOOL bCopy) MirrorMarkedObj(aCenter,aPt2,bCopy); } -void SdrEditView::MirrorMarkedObjVertical(BOOL bCopy) +void SdrEditView::MirrorMarkedObjVertical(sal_Bool bCopy) { Point aCenter(GetMarkedObjRect().Center()); Point aPt2(aCenter); @@ -408,17 +408,17 @@ void SdrEditView::MirrorMarkedObjVertical(BOOL bCopy) long SdrEditView::GetMarkedObjShear() const { - BOOL b1st=TRUE; - BOOL bOk=TRUE; + sal_Bool b1st=sal_True; + sal_Bool bOk=sal_True; long nWink=0; - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nm=0; nm<nMarkAnz && bOk; nm++) { + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nm=0; nm<nMarkAnz && bOk; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pO=pM->GetMarkedSdrObj(); long nWink2=pO->GetShearAngle(); if (b1st) nWink=nWink2; - else if (nWink2!=nWink) bOk=FALSE; - b1st=FALSE; + else if (nWink2!=nWink) bOk=sal_False; + b1st=sal_False; } if (nWink>SDRMAXSHEAR) nWink=SDRMAXSHEAR; if (nWink<-SDRMAXSHEAR) nWink=-SDRMAXSHEAR; @@ -443,8 +443,8 @@ void SdrEditView::ShearMarkedObj(const Point& rRef, long nWink, bool bVShear, bo CopyMarkedObj(); double nTan=tan(nWink*nPi180); - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nm=0; nm<nMarkAnz; nm++) + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pO=pM->GetMarkedSdrObj(); @@ -462,10 +462,10 @@ void SdrEditView::ShearMarkedObj(const Point& rRef, long nWink, bool bVShear, bo } void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRad, - SdrCrookMode eMode, BOOL bVertical, BOOL bNoContortion, BOOL bRotate, const Rectangle& rMarkRect) + SdrCrookMode eMode, sal_Bool bVertical, sal_Bool bNoContortion, sal_Bool bRotate, const Rectangle& rMarkRect) { SdrPathObj* pPath=PTR_CAST(SdrPathObj,pO); - BOOL bDone = FALSE; + sal_Bool bDone = sal_False; if(pPath!=NULL && !bNoContortion) { @@ -476,7 +476,7 @@ void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRa case SDRCROOK_STRETCH: CrookStretchPoly(aXPP,rRef,rRad,bVertical,rMarkRect); break; } // switch pPath->SetPathPoly(aXPP.getB2DPolyPolygon()); - bDone = TRUE; + bDone = sal_True; } if(!bDone && !pPath && pO->IsPolyObj() && 0L != pO->GetPointCount()) @@ -506,7 +506,7 @@ void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRa pO->SetPoint(aXP[(sal_uInt16)nPtNum],nPtNum); } - bDone = TRUE; + bDone = sal_True; } if(!bDone) @@ -545,7 +545,7 @@ void SdrEditView::CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookM Rectangle aMarkRect(GetMarkedObjRect()); const bool bUndo = IsUndoEnabled(); - bool bRotate=bNoContortion && eMode==SDRCROOK_ROTATE && IsRotateAllowed(FALSE); + bool bRotate=bNoContortion && eMode==SDRCROOK_ROTATE && IsRotateAllowed(sal_False); if( bUndo ) { @@ -559,8 +559,8 @@ void SdrEditView::CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookM if (bCopy) CopyMarkedObj(); - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nm=0; nm<nMarkAnz; nm++) + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pO=pM->GetMarkedSdrObj(); @@ -583,7 +583,7 @@ void SdrEditView::CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookM EndUndo(); } -void SdrEditView::ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPolygon& rDistortedRect, BOOL bNoContortion) +void SdrEditView::ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPolygon& rDistortedRect, sal_Bool bNoContortion) { SdrPathObj* pPath = PTR_CAST(SdrPathObj, pO); @@ -633,8 +633,8 @@ void SdrEditView::DistortMarkedObj(const Rectangle& rRef, const XPolygon& rDisto if (bCopy) CopyMarkedObj(); - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nm=0; nm<nMarkAnz; nm++) + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pO=pM->GetMarkedSdrObj(); @@ -660,47 +660,47 @@ void SdrEditView::DistortMarkedObj(const Rectangle& rRef, const XPolygon& rDisto //////////////////////////////////////////////////////////////////////////////////////////////////// -void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, BOOL /*bReplaceAll*/) +void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, sal_Bool /*bReplaceAll*/) { // bReplaceAll hat hier keinerlei Wirkung Rectangle aAllSnapRect(GetMarkedObjRect()); const SfxPoolItem *pPoolItem=NULL; - if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1X,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1X,sal_True,&pPoolItem)==SFX_ITEM_SET) { long n=((const SdrTransformRef1XItem*)pPoolItem)->GetValue(); SetRef1(Point(n,GetRef1().Y())); } - if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1Y,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1Y,sal_True,&pPoolItem)==SFX_ITEM_SET) { long n=((const SdrTransformRef1YItem*)pPoolItem)->GetValue(); SetRef1(Point(GetRef1().X(),n)); } - if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2X,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2X,sal_True,&pPoolItem)==SFX_ITEM_SET) { long n=((const SdrTransformRef2XItem*)pPoolItem)->GetValue(); SetRef2(Point(n,GetRef2().Y())); } - if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2Y,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2Y,sal_True,&pPoolItem)==SFX_ITEM_SET) { long n=((const SdrTransformRef2YItem*)pPoolItem)->GetValue(); SetRef2(Point(GetRef2().X(),n)); } - long nAllPosX=0; BOOL bAllPosX=FALSE; - long nAllPosY=0; BOOL bAllPosY=FALSE; - long nAllWdt=0; BOOL bAllWdt=FALSE; - long nAllHgt=0; BOOL bAllHgt=FALSE; - BOOL bDoIt=FALSE; - if (rAttr.GetItemState(SDRATTR_ALLPOSITIONX,TRUE,&pPoolItem)==SFX_ITEM_SET) { + long nAllPosX=0; sal_Bool bAllPosX=sal_False; + long nAllPosY=0; sal_Bool bAllPosY=sal_False; + long nAllWdt=0; sal_Bool bAllWdt=sal_False; + long nAllHgt=0; sal_Bool bAllHgt=sal_False; + sal_Bool bDoIt=sal_False; + if (rAttr.GetItemState(SDRATTR_ALLPOSITIONX,sal_True,&pPoolItem)==SFX_ITEM_SET) { nAllPosX=((const SdrAllPositionXItem*)pPoolItem)->GetValue(); - bAllPosX=TRUE; bDoIt=TRUE; + bAllPosX=sal_True; bDoIt=sal_True; } - if (rAttr.GetItemState(SDRATTR_ALLPOSITIONY,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_ALLPOSITIONY,sal_True,&pPoolItem)==SFX_ITEM_SET) { nAllPosY=((const SdrAllPositionYItem*)pPoolItem)->GetValue(); - bAllPosY=TRUE; bDoIt=TRUE; + bAllPosY=sal_True; bDoIt=sal_True; } - if (rAttr.GetItemState(SDRATTR_ALLSIZEWIDTH,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_ALLSIZEWIDTH,sal_True,&pPoolItem)==SFX_ITEM_SET) { nAllWdt=((const SdrAllSizeWidthItem*)pPoolItem)->GetValue(); - bAllWdt=TRUE; bDoIt=TRUE; + bAllWdt=sal_True; bDoIt=sal_True; } - if (rAttr.GetItemState(SDRATTR_ALLSIZEHEIGHT,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_ALLSIZEHEIGHT,sal_True,&pPoolItem)==SFX_ITEM_SET) { nAllHgt=((const SdrAllSizeHeightItem*)pPoolItem)->GetValue(); - bAllHgt=TRUE; bDoIt=TRUE; + bAllHgt=sal_True; bDoIt=sal_True; } if (bDoIt) { Rectangle aRect(aAllSnapRect); // !!! fuer PolyPt's und GluePt's aber bitte noch aendern !!! @@ -710,32 +710,32 @@ void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, BOOL /*bRep if (bAllHgt) aRect.Bottom()=aAllSnapRect.Top()+nAllHgt; SetMarkedObjRect(aRect); } - if (rAttr.GetItemState(SDRATTR_RESIZEXALL,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_RESIZEXALL,sal_True,&pPoolItem)==SFX_ITEM_SET) { Fraction aXFact=((const SdrResizeXAllItem*)pPoolItem)->GetValue(); ResizeMarkedObj(aAllSnapRect.TopLeft(),aXFact,Fraction(1,1)); } - if (rAttr.GetItemState(SDRATTR_RESIZEYALL,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_RESIZEYALL,sal_True,&pPoolItem)==SFX_ITEM_SET) { Fraction aYFact=((const SdrResizeYAllItem*)pPoolItem)->GetValue(); ResizeMarkedObj(aAllSnapRect.TopLeft(),Fraction(1,1),aYFact); } - if (rAttr.GetItemState(SDRATTR_ROTATEALL,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_ROTATEALL,sal_True,&pPoolItem)==SFX_ITEM_SET) { long nAngle=((const SdrRotateAllItem*)pPoolItem)->GetValue(); RotateMarkedObj(aAllSnapRect.Center(),nAngle); } - if (rAttr.GetItemState(SDRATTR_HORZSHEARALL,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_HORZSHEARALL,sal_True,&pPoolItem)==SFX_ITEM_SET) { long nAngle=((const SdrHorzShearAllItem*)pPoolItem)->GetValue(); - ShearMarkedObj(aAllSnapRect.Center(),nAngle,FALSE); + ShearMarkedObj(aAllSnapRect.Center(),nAngle,sal_False); } - if (rAttr.GetItemState(SDRATTR_VERTSHEARALL,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_VERTSHEARALL,sal_True,&pPoolItem)==SFX_ITEM_SET) { long nAngle=((const SdrVertShearAllItem*)pPoolItem)->GetValue(); - ShearMarkedObj(aAllSnapRect.Center(),nAngle,TRUE); + ShearMarkedObj(aAllSnapRect.Center(),nAngle,sal_True); } const bool bUndo = IsUndoEnabled(); // Todo: WhichRange nach Notwendigkeit ueberpruefen. - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nm=0; nm<nMarkAnz; nm++) + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { const SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); @@ -747,7 +747,7 @@ void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, BOOL /*bRep } } -void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, BOOL /*bOnlyHardAttr*/) const +void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, sal_Bool /*bOnlyHardAttr*/) const { // bOnlyHardAttr hat hier keinerlei Wirkung // Hier muss ausserdem noch der Nullpunkt und @@ -758,24 +758,24 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, BOOL /*bOnlyH long nAllSnapWdt=aAllSnapRect.GetWidth()-1; long nAllSnapHgt=aAllSnapRect.GetHeight()-1; // koennte mal zu CheckPossibilities mit rein - BOOL bMovProtect=FALSE,bMovProtectDC=FALSE; - BOOL bSizProtect=FALSE,bSizProtectDC=FALSE; - BOOL bPrintable =TRUE ,bPrintableDC=FALSE; - BOOL bVisible = TRUE, bVisibleDC=FALSE; - SdrLayerID nLayerId=0; BOOL bLayerDC=FALSE; - XubString aObjName; BOOL bObjNameDC=FALSE,bObjNameSet=FALSE; - long nSnapPosX=0; BOOL bSnapPosXDC=FALSE; - long nSnapPosY=0; BOOL bSnapPosYDC=FALSE; - long nSnapWdt=0; BOOL bSnapWdtDC=FALSE; - long nSnapHgt=0; BOOL bSnapHgtDC=FALSE; - long nLogicWdt=0; BOOL bLogicWdtDC=FALSE,bLogicWdtDiff=FALSE; - long nLogicHgt=0; BOOL bLogicHgtDC=FALSE,bLogicHgtDiff=FALSE; - long nRotAngle=0; BOOL bRotAngleDC=FALSE; - long nShrAngle=0; BOOL bShrAngleDC=FALSE; + sal_Bool bMovProtect=sal_False,bMovProtectDC=sal_False; + sal_Bool bSizProtect=sal_False,bSizProtectDC=sal_False; + sal_Bool bPrintable =sal_True ,bPrintableDC=sal_False; + sal_Bool bVisible = sal_True, bVisibleDC=sal_False; + SdrLayerID nLayerId=0; sal_Bool bLayerDC=sal_False; + XubString aObjName; sal_Bool bObjNameDC=sal_False,bObjNameSet=sal_False; + long nSnapPosX=0; sal_Bool bSnapPosXDC=sal_False; + long nSnapPosY=0; sal_Bool bSnapPosYDC=sal_False; + long nSnapWdt=0; sal_Bool bSnapWdtDC=sal_False; + long nSnapHgt=0; sal_Bool bSnapHgtDC=sal_False; + long nLogicWdt=0; sal_Bool bLogicWdtDC=sal_False,bLogicWdtDiff=sal_False; + long nLogicHgt=0; sal_Bool bLogicHgtDC=sal_False,bLogicHgtDiff=sal_False; + long nRotAngle=0; sal_Bool bRotAngleDC=sal_False; + long nShrAngle=0; sal_Bool bShrAngleDC=sal_False; Rectangle aSnapRect; Rectangle aLogicRect; - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nm=0; nm<nMarkAnz; nm++) { + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { const SdrMark* pM=GetSdrMarkByIndex(nm); const SdrObject* pObj=pM->GetMarkedSdrObj(); if (nm==0) { @@ -797,33 +797,33 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, BOOL /*bOnlyH nRotAngle=pObj->GetRotateAngle(); nShrAngle=pObj->GetShearAngle(); } else { - if (!bLayerDC && nLayerId !=pObj->GetLayer()) bLayerDC=TRUE; - if (!bMovProtectDC && bMovProtect!=pObj->IsMoveProtect()) bMovProtectDC=TRUE; - if (!bSizProtectDC && bSizProtect!=pObj->IsResizeProtect()) bSizProtectDC=TRUE; - if (!bPrintableDC && bPrintable !=pObj->IsPrintable()) bPrintableDC=TRUE; - if (!bVisibleDC && bVisible !=pObj->IsVisible()) bVisibleDC=TRUE; - if (!bRotAngleDC && nRotAngle !=pObj->GetRotateAngle()) bRotAngleDC=TRUE; - if (!bShrAngleDC && nShrAngle !=pObj->GetShearAngle()) bShrAngleDC=TRUE; + if (!bLayerDC && nLayerId !=pObj->GetLayer()) bLayerDC=sal_True; + if (!bMovProtectDC && bMovProtect!=pObj->IsMoveProtect()) bMovProtectDC=sal_True; + if (!bSizProtectDC && bSizProtect!=pObj->IsResizeProtect()) bSizProtectDC=sal_True; + if (!bPrintableDC && bPrintable !=pObj->IsPrintable()) bPrintableDC=sal_True; + if (!bVisibleDC && bVisible !=pObj->IsVisible()) bVisibleDC=sal_True; + if (!bRotAngleDC && nRotAngle !=pObj->GetRotateAngle()) bRotAngleDC=sal_True; + if (!bShrAngleDC && nShrAngle !=pObj->GetShearAngle()) bShrAngleDC=sal_True; if (!bSnapWdtDC || !bSnapHgtDC || !bSnapPosXDC || !bSnapPosYDC || !bLogicWdtDiff || !bLogicHgtDiff) { aSnapRect=pObj->GetSnapRect(); - if (nSnapPosX!=aSnapRect.Left()) bSnapPosXDC=TRUE; - if (nSnapPosY!=aSnapRect.Top()) bSnapPosYDC=TRUE; - if (nSnapWdt!=aSnapRect.GetWidth()-1) bSnapWdtDC=TRUE; - if (nSnapHgt!=aSnapRect.GetHeight()-1) bSnapHgtDC=TRUE; + if (nSnapPosX!=aSnapRect.Left()) bSnapPosXDC=sal_True; + if (nSnapPosY!=aSnapRect.Top()) bSnapPosYDC=sal_True; + if (nSnapWdt!=aSnapRect.GetWidth()-1) bSnapWdtDC=sal_True; + if (nSnapHgt!=aSnapRect.GetHeight()-1) bSnapHgtDC=sal_True; } if (!bLogicWdtDC || !bLogicHgtDC || !bLogicWdtDiff || !bLogicHgtDiff) { aLogicRect=pObj->GetLogicRect(); - if (nLogicWdt!=aLogicRect.GetWidth()-1) bLogicWdtDC=TRUE; - if (nLogicHgt!=aLogicRect.GetHeight()-1) bLogicHgtDC=TRUE; - if (!bLogicWdtDiff && aSnapRect.GetWidth()!=aLogicRect.GetWidth()) bLogicWdtDiff=TRUE; - if (!bLogicHgtDiff && aSnapRect.GetHeight()!=aLogicRect.GetHeight()) bLogicHgtDiff=TRUE; + if (nLogicWdt!=aLogicRect.GetWidth()-1) bLogicWdtDC=sal_True; + if (nLogicHgt!=aLogicRect.GetHeight()-1) bLogicHgtDC=sal_True; + if (!bLogicWdtDiff && aSnapRect.GetWidth()!=aLogicRect.GetWidth()) bLogicWdtDiff=sal_True; + if (!bLogicHgtDiff && aSnapRect.GetHeight()!=aLogicRect.GetHeight()) bLogicHgtDiff=sal_True; } } if (!bObjNameDC ) { if (!bObjNameSet) { aObjName=pObj->GetName(); } else { - if (aObjName!=pObj->GetName()) bObjNameDC=TRUE; + if (aObjName!=pObj->GetName()) bObjNameDC=sal_True; } } } @@ -863,7 +863,7 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, BOOL /*bOnlyH } } -SfxItemSet SdrEditView::GetAttrFromMarked(BOOL bOnlyHardAttr) const +SfxItemSet SdrEditView::GetAttrFromMarked(sal_Bool bOnlyHardAttr) const { SfxItemSet aSet(pMod->GetItemPool()); MergeAttrFromMarked(aSet,bOnlyHardAttr); @@ -878,7 +878,7 @@ SfxItemSet SdrEditView::GetAttrFromMarked(BOOL bOnlyHardAttr) const return aSet; } -void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, BOOL bOnlyHardAttr) const +void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr) const { sal_uInt32 nMarkAnz(GetMarkedObjectCount()); @@ -894,15 +894,15 @@ void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, BOOL bOnlyHardAttr) con { if(!bOnlyHardAttr) { - if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, FALSE)) + if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, sal_False)) rAttr.InvalidateItem(nWhich); else - rAttr.MergeValue(rSet.Get(nWhich), TRUE); + rAttr.MergeValue(rSet.Get(nWhich), sal_True); } - else if(SFX_ITEM_SET == rSet.GetItemState(nWhich, FALSE)) + else if(SFX_ITEM_SET == rSet.GetItemState(nWhich, sal_False)) { const SfxPoolItem& rItem = rSet.Get(nWhich); - rAttr.MergeValue(rItem, TRUE); + rAttr.MergeValue(rItem, sal_True); } nWhich = aIter.NextWhich(); @@ -910,19 +910,19 @@ void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, BOOL bOnlyHardAttr) con } } -void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll) +void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, sal_Bool bReplaceAll) { if (AreObjectsMarked()) { #ifdef DBG_UTIL { - BOOL bHasEEFeatureItems=FALSE; + sal_Bool bHasEEFeatureItems=sal_False; SfxItemIter aIter(rAttr); const SfxPoolItem* pItem=aIter.FirstItem(); while (!bHasEEFeatureItems && pItem!=NULL) { if (!IsInvalidItem(pItem)) { - USHORT nW=pItem->Which(); - if (nW>=EE_FEATURE_START && nW<=EE_FEATURE_END) bHasEEFeatureItems=TRUE; + sal_uInt16 nW=pItem->Which(); + if (nW>=EE_FEATURE_START && nW<=EE_FEATURE_END) bHasEEFeatureItems=sal_True; } pItem=aIter.NextItem(); } @@ -956,13 +956,13 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll) } // Joe, 2.7.98: Damit Undo nach Format.Standard auch die Textattribute korrekt restauriert - BOOL bHasEEItems=SearchOutlinerItems(rAttr,bReplaceAll); + sal_Bool bHasEEItems=SearchOutlinerItems(rAttr,bReplaceAll); // AW 030100: save additional geom info when para or char attributes // are changed and the geom form of the text object might be changed - BOOL bPossibleGeomChange(FALSE); + sal_Bool bPossibleGeomChange(sal_False); SfxWhichIter aIter(rAttr); - UINT16 nWhich = aIter.FirstWhich(); + sal_uInt16 nWhich = aIter.FirstWhich(); while(!bPossibleGeomChange && nWhich) { SfxItemState eState = rAttr.GetItemState(nWhich); @@ -975,7 +975,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll) || nWhich == SDRATTR_3DOBJ_END_ANGLE || nWhich == SDRATTR_3DSCENE_DISTANCE) { - bPossibleGeomChange = TRUE; + bPossibleGeomChange = sal_True; } } nWhich = aIter.NextWhich(); @@ -996,12 +996,12 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll) // uses it's second parameter (bInvalidAsDefault) to // remove all such items to set them to default. SfxItemSet aAttr(*rAttr.GetPool(), rAttr.GetRanges()); - aAttr.Put(rAttr, TRUE); + aAttr.Put(rAttr, sal_True); // #i38135# bool bResetAnimationTimer(false); - for (ULONG nm=0; nm<nMarkAnz; nm++) + for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj = pM->GetMarkedSdrObj(); @@ -1011,7 +1011,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll) std::vector< SdrUndoAction* > vConnectorUndoActions; SdrEdgeObj* pEdgeObj = dynamic_cast< SdrEdgeObj* >( pObj ); if ( pEdgeObj ) - bPossibleGeomChange = TRUE; + bPossibleGeomChange = sal_True; else if( bUndo ) vConnectorUndoActions = CreateConnectorUndo( *pObj ); @@ -1036,7 +1036,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll) const bool bRescueText = dynamic_cast< SdrTextObj* >(pObj) != 0; // add attribute undo - AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoAttrObject(*pObj,FALSE,bHasEEItems || bPossibleGeomChange || bRescueText)); + AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoAttrObject(*pObj,sal_False,bHasEEItems || bPossibleGeomChange || bRescueText)); } // set up a scxene updater if object is a 3d object @@ -1105,19 +1105,19 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll) SfxStyleSheet* SdrEditView::GetStyleSheetFromMarked() const { SfxStyleSheet* pRet=NULL; - BOOL b1st=TRUE; - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nm=0; nm<nMarkAnz; nm++) { + sal_Bool b1st=sal_True; + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SfxStyleSheet* pSS=pM->GetMarkedSdrObj()->GetStyleSheet(); if (b1st) pRet=pSS; else if (pRet!=pSS) return NULL; // verschiedene StyleSheets - b1st=FALSE; + b1st=sal_False; } return pRet; } -void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr) +void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr) { if (AreObjectsMarked()) { @@ -1133,8 +1133,8 @@ void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, BOOL bDontRe BegUndo(aStr); } - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nm=0; nm<nMarkAnz; nm++) + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); if( bUndo ) @@ -1153,12 +1153,12 @@ void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, BOOL bDontRe //////////////////////////////////////////////////////////////////////////////////////////////////// /* new interface src537 */ -BOOL SdrEditView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) const +sal_Bool SdrEditView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const { if(GetMarkedObjectCount()) { - rTargetSet.Put(GetAttrFromMarked(bOnlyHardAttr), FALSE); - return TRUE; + rTargetSet.Put(GetAttrFromMarked(bOnlyHardAttr), sal_False); + return sal_True; } else { @@ -1166,31 +1166,31 @@ BOOL SdrEditView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) cons } } -BOOL SdrEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll) +sal_Bool SdrEditView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll) { if (GetMarkedObjectCount()!=0) { SetAttrToMarked(rSet,bReplaceAll); - return TRUE; + return sal_True; } else { return SdrMarkView::SetAttributes(rSet,bReplaceAll); } } -SfxStyleSheet* SdrEditView::GetStyleSheet() const // SfxStyleSheet* SdrEditView::GetStyleSheet(BOOL& rOk) const +SfxStyleSheet* SdrEditView::GetStyleSheet() const // SfxStyleSheet* SdrEditView::GetStyleSheet(sal_Bool& rOk) const { if (GetMarkedObjectCount()!=0) { - //rOk=TRUE; + //rOk=sal_True; return GetStyleSheetFromMarked(); } else { return SdrMarkView::GetStyleSheet(); // SdrMarkView::GetStyleSheet(rOk); } } -BOOL SdrEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr) +sal_Bool SdrEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr) { if (GetMarkedObjectCount()!=0) { SetStyleSheetToMarked(pStyleSheet,bDontRemoveHardAttr); - return TRUE; + return sal_True; } else { return SdrMarkView::SetStyleSheet(pStyleSheet,bDontRemoveHardAttr); } @@ -1206,7 +1206,7 @@ SfxItemSet SdrEditView::GetGeoAttrFromMarked() const SDRATTR_ECKENRADIUS,SDRATTR_ECKENRADIUS, 0); if (AreObjectsMarked()) { - SfxItemSet aMarkAttr(GetAttrFromMarked(FALSE)); // wg. AutoGrowHeight und Eckenradius + SfxItemSet aMarkAttr(GetAttrFromMarked(sal_False)); // wg. AutoGrowHeight und Eckenradius Rectangle aRect(GetMarkedObjRect()); if(GetSdrPageView()) @@ -1261,16 +1261,16 @@ SfxItemSet SdrEditView::GetGeoAttrFromMarked() const // Pruefen der einzelnen Objekte, ob Objekte geschuetzt sind const SdrMarkList& rMarkList=GetMarkedObjectList(); - ULONG nMarkCount=rMarkList.GetMarkCount(); + sal_uIntPtr nMarkCount=rMarkList.GetMarkCount(); SdrObject* pObj=rMarkList.GetMark(0)->GetMarkedSdrObj(); - BOOL bPosProt=pObj->IsMoveProtect(); - BOOL bSizProt=pObj->IsResizeProtect(); - BOOL bPosProtDontCare=FALSE; - BOOL bSizProtDontCare=FALSE; - for (ULONG i=1; i<nMarkCount && (!bPosProtDontCare || !bSizProtDontCare); i++) { + sal_Bool bPosProt=pObj->IsMoveProtect(); + sal_Bool bSizProt=pObj->IsResizeProtect(); + sal_Bool bPosProtDontCare=sal_False; + sal_Bool bSizProtDontCare=sal_False; + for (sal_uIntPtr i=1; i<nMarkCount && (!bPosProtDontCare || !bSizProtDontCare); i++) { pObj=rMarkList.GetMark(i)->GetMarkedSdrObj(); - if (bPosProt!=pObj->IsMoveProtect()) bPosProtDontCare=TRUE; - if (bSizProt!=pObj->IsResizeProtect()) bSizProtDontCare=TRUE; + if (bPosProt!=pObj->IsMoveProtect()) bPosProtDontCare=sal_True; + if (bSizProt!=pObj->IsResizeProtect()) bSizProtDontCare=sal_True; } // InvalidateItem setzt das Item auf DONT_CARE @@ -1286,7 +1286,7 @@ SfxItemSet SdrEditView::GetGeoAttrFromMarked() const } SfxItemState eState=aMarkAttr.GetItemState(SDRATTR_TEXT_AUTOGROWWIDTH); - BOOL bAutoGrow=((SdrTextAutoGrowWidthItem&)(aMarkAttr.Get(SDRATTR_TEXT_AUTOGROWWIDTH))).GetValue(); + sal_Bool bAutoGrow=((SdrTextAutoGrowWidthItem&)(aMarkAttr.Get(SDRATTR_TEXT_AUTOGROWWIDTH))).GetValue(); if (eState==SFX_ITEM_DONTCARE) { aRetSet.InvalidateItem(SID_ATTR_TRANSFORM_AUTOWIDTH); } else if (eState==SFX_ITEM_SET) { @@ -1341,7 +1341,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) long nOldRotateAngle=GetMarkedObjRotate(); long nOldShearAngle=GetMarkedObjShear(); const SdrMarkList& rMarkList=GetMarkedObjectList(); - ULONG nMarkCount=rMarkList.GetMarkCount(); + sal_uIntPtr nMarkCount=rMarkList.GetMarkCount(); SdrObject* pObj=NULL; RECT_POINT eSizePoint=RP_MM; @@ -1373,56 +1373,56 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) long nShearAngle=0; long nShearX=0; long nShearY=0; - BOOL bShearVert=FALSE; + sal_Bool bShearVert=sal_False; - BOOL bChgPos=FALSE; - BOOL bChgSiz=FALSE; - BOOL bRotate=FALSE; - BOOL bShear =FALSE; + sal_Bool bChgPos=sal_False; + sal_Bool bChgSiz=sal_False; + sal_Bool bRotate=sal_False; + sal_Bool bShear =sal_False; - BOOL bSetAttr=FALSE; + sal_Bool bSetAttr=sal_False; SfxItemSet aSetAttr(pMod->GetItemPool()); const SfxPoolItem* pPoolItem=NULL; // Position - if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_POS_X,TRUE,&pPoolItem)) { + if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_POS_X,sal_True,&pPoolItem)) { nPosDX=((const SfxInt32Item*)pPoolItem)->GetValue()-aRect.Left(); - bChgPos=TRUE; + bChgPos=sal_True; } - if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_POS_Y,TRUE,&pPoolItem)){ + if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_POS_Y,sal_True,&pPoolItem)){ nPosDY=((const SfxInt32Item*)pPoolItem)->GetValue()-aRect.Top(); - bChgPos=TRUE; + bChgPos=sal_True; } // Groesse - if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_WIDTH,TRUE,&pPoolItem)) { + if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_WIDTH,sal_True,&pPoolItem)) { nSizX=((const SfxUInt32Item*)pPoolItem)->GetValue(); - bChgSiz=TRUE; + bChgSiz=sal_True; } - if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_HEIGHT,TRUE,&pPoolItem)) { + if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_HEIGHT,sal_True,&pPoolItem)) { nSizY=((const SfxUInt32Item*)pPoolItem)->GetValue(); - bChgSiz=TRUE; + bChgSiz=sal_True; } if (bChgSiz) { eSizePoint=(RECT_POINT)((const SfxAllEnumItem&)rAttr.Get(SID_ATTR_TRANSFORM_SIZE_POINT)).GetValue(); } // Rotation - if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ANGLE,TRUE,&pPoolItem)) { + if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ANGLE,sal_True,&pPoolItem)) { nRotateAngle=((const SfxInt32Item*)pPoolItem)->GetValue()-nOldRotateAngle; bRotate = (nRotateAngle != 0); } // #86909# pos rot point x - if(bRotate || SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ROT_X, TRUE ,&pPoolItem)) + if(bRotate || SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ROT_X, sal_True ,&pPoolItem)) nRotateX = ((const SfxInt32Item&)rAttr.Get(SID_ATTR_TRANSFORM_ROT_X)).GetValue(); // #86909# pos rot point y - if(bRotate || SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ROT_Y, TRUE ,&pPoolItem)) + if(bRotate || SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ROT_Y, sal_True ,&pPoolItem)) nRotateY = ((const SfxInt32Item&)rAttr.Get(SID_ATTR_TRANSFORM_ROT_Y)).GetValue(); // Shear - if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_SHEAR,TRUE,&pPoolItem)) { + if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_SHEAR,sal_True,&pPoolItem)) { long nNewShearAngle=((const SfxInt32Item*)pPoolItem)->GetValue(); if (nNewShearAngle>SDRMAXSHEAR) nNewShearAngle=SDRMAXSHEAR; if (nNewShearAngle<-SDRMAXSHEAR) nNewShearAngle=-SDRMAXSHEAR; @@ -1451,23 +1451,23 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) } // AutoGrow - if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_AUTOWIDTH,TRUE,&pPoolItem)) { - BOOL bAutoGrow=((const SfxBoolItem*)pPoolItem)->GetValue(); + if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_AUTOWIDTH,sal_True,&pPoolItem)) { + sal_Bool bAutoGrow=((const SfxBoolItem*)pPoolItem)->GetValue(); aSetAttr.Put(SdrTextAutoGrowWidthItem(bAutoGrow)); - bSetAttr=TRUE; + bSetAttr=sal_True; } - if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_AUTOHEIGHT,TRUE,&pPoolItem)) { - BOOL bAutoGrow=((const SfxBoolItem*)pPoolItem)->GetValue(); + if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_AUTOHEIGHT,sal_True,&pPoolItem)) { + sal_Bool bAutoGrow=((const SfxBoolItem*)pPoolItem)->GetValue(); aSetAttr.Put(SdrTextAutoGrowHeightItem(bAutoGrow)); - bSetAttr=TRUE; + bSetAttr=sal_True; } // Eckenradius - if (bEdgeRadiusAllowed && SFX_ITEM_SET==rAttr.GetItemState(SDRATTR_ECKENRADIUS,TRUE,&pPoolItem)) { + if (bEdgeRadiusAllowed && SFX_ITEM_SET==rAttr.GetItemState(SDRATTR_ECKENRADIUS,sal_True,&pPoolItem)) { long nRadius=((SdrEckenradiusItem*)pPoolItem)->GetValue(); aSetAttr.Put(SdrEckenradiusItem(nRadius)); - bSetAttr=TRUE; + bSetAttr=sal_True; } ForcePossibilities(); @@ -1475,7 +1475,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) BegUndo(ImpGetResStr(STR_EditTransform),GetDescriptionOfMarkedObjects()); if (bSetAttr) { - SetAttrToMarked(aSetAttr,FALSE); + SetAttrToMarked(aSetAttr,sal_False); } // Groesse und Hoehe aendern @@ -1542,7 +1542,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) } // protect position - if(SFX_ITEM_SET == rAttr.GetItemState(SID_ATTR_TRANSFORM_PROTECT_POS, TRUE, &pPoolItem)) + if(SFX_ITEM_SET == rAttr.GetItemState(SID_ATTR_TRANSFORM_PROTECT_POS, sal_True, &pPoolItem)) { const sal_Bool bProtPos(((const SfxBoolItem*)pPoolItem)->GetValue()); bool bChanged(false); @@ -1583,7 +1583,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) if(!bMoveProtect) { // protect size - if(SFX_ITEM_SET == rAttr.GetItemState(SID_ATTR_TRANSFORM_PROTECT_SIZE, TRUE, &pPoolItem)) + if(SFX_ITEM_SET == rAttr.GetItemState(SID_ATTR_TRANSFORM_PROTECT_SIZE, sal_True, &pPoolItem)) { const sal_Bool bProtSize(((const SfxBoolItem*)pPoolItem)->GetValue()); bool bChanged(false); @@ -1614,16 +1614,16 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SdrEditView::IsAlignPossible() const +sal_Bool SdrEditView::IsAlignPossible() const { // Mindestens 2 markierte Objekte, davon mind. 1 beweglich ForcePossibilities(); - ULONG nAnz=GetMarkedObjectCount(); - if (nAnz==0) return FALSE; // Nix markiert! + sal_uIntPtr nAnz=GetMarkedObjectCount(); + if (nAnz==0) return sal_False; // Nix markiert! if (nAnz==1) return bMoveAllowed; // einzelnes Obj an der Seite ausrichten return bOneOrMoreMovable; // ansonsten ist MarkCount>=2 } -void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, BOOL bBoundRects) +void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, sal_Bool bBoundRects) { if (eHor==SDRHALIGN_NONE && eVert==SDRVALIGN_NONE) return; @@ -1668,9 +1668,9 @@ void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, BOOL } Rectangle aBound; - ULONG nMarkAnz=GetMarkedObjectCount(); - ULONG nm; - BOOL bHasFixed=FALSE; + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + sal_uIntPtr nm; + sal_Bool bHasFixed=sal_False; for (nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); @@ -1681,7 +1681,7 @@ void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, BOOL { Rectangle aObjRect(bBoundRects?pObj->GetCurrentBoundRect():pObj->GetSnapRect()); aBound.Union(aObjRect); - bHasFixed=TRUE; + bHasFixed=sal_True; } } if (!bHasFixed) diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index efbb46ad62f4..4d002d1ba888 100644..100755 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -37,11 +37,11 @@ #include <svx/svdopath.hxx> // fuer CombineObjects #include <svx/svdpage.hxx> #include <svx/svdpagv.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdograf.hxx> // fuer Possibilities #include <svx/svdoole2.hxx> // und Mtf-Import -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache #include "svdfmtf.hxx" #include <svx/svdetc.hxx> #include <sfx2/basedlgs.hxx> @@ -92,13 +92,13 @@ SdrObject* SdrEditView::GetMaxToBtmObj(SdrObject* /*pObj*/) const return NULL; } -void SdrEditView::ObjOrderChanged(SdrObject* /*pObj*/, ULONG /*nOldPos*/, ULONG /*nNewPos*/) +void SdrEditView::ObjOrderChanged(SdrObject* /*pObj*/, sal_uIntPtr /*nOldPos*/, sal_uIntPtr /*nNewPos*/) { } void SdrEditView::MovMarkedToTop() { - ULONG nAnz=GetMarkedObjectCount(); + sal_uIntPtr nAnz=GetMarkedObjectCount(); if (nAnz!=0) { const bool bUndo = IsUndoEnabled(); @@ -107,14 +107,14 @@ void SdrEditView::MovMarkedToTop() BegUndo(ImpGetResStr(STR_EditMovToTop),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_MOVTOTOP); SortMarkedObjects(); - ULONG nm; + sal_uIntPtr nm; for (nm=0; nm<nAnz; nm++) { // Ordnums muessen alle stimmen! GetMarkedObjectByIndex(nm)->GetOrdNum(); } - BOOL bChg=FALSE; + sal_Bool bChg=sal_False; SdrObjList* pOL0=NULL; - ULONG nNewPos=0; + sal_uIntPtr nNewPos=0; for (nm=nAnz; nm>0;) { nm--; @@ -123,16 +123,16 @@ void SdrEditView::MovMarkedToTop() SdrObjList* pOL=pObj->GetObjList(); if (pOL!=pOL0) { - nNewPos=ULONG(pOL->GetObjCount()-1); + nNewPos=sal_uIntPtr(pOL->GetObjCount()-1); pOL0=pOL; } - ULONG nNowPos=pObj->GetOrdNumDirect(); + sal_uIntPtr nNowPos=pObj->GetOrdNumDirect(); const Rectangle& rBR=pObj->GetCurrentBoundRect(); - ULONG nCmpPos=nNowPos+1; + sal_uIntPtr nCmpPos=nNowPos+1; SdrObject* pMaxObj=GetMaxToTopObj(pObj); if (pMaxObj!=NULL) { - ULONG nMaxPos=pMaxObj->GetOrdNum(); + sal_uIntPtr nMaxPos=pMaxObj->GetOrdNum(); if (nMaxPos!=0) nMaxPos--; if (nNewPos>nMaxPos) @@ -140,25 +140,25 @@ void SdrEditView::MovMarkedToTop() if (nNewPos<nNowPos) nNewPos=nNowPos; // aber dabei auch nicht in die falsche Richtung schieben } - BOOL bEnd=FALSE; + sal_Bool bEnd=sal_False; while (nCmpPos<nNewPos && !bEnd) { SdrObject* pCmpObj=pOL->GetObj(nCmpPos); if (pCmpObj==NULL) { OSL_FAIL("MovMarkedToTop(): Vergleichsobjekt nicht gefunden"); - bEnd=TRUE; + bEnd=sal_True; } else if (pCmpObj==pMaxObj) { nNewPos=nCmpPos; nNewPos--; - bEnd=TRUE; + bEnd=sal_True; } else if (rBR.IsOver(pCmpObj->GetCurrentBoundRect())) { nNewPos=nCmpPos; - bEnd=TRUE; + bEnd=sal_True; } else { @@ -167,7 +167,7 @@ void SdrEditView::MovMarkedToTop() } if (nNowPos!=nNewPos) { - bChg=TRUE; + bChg=sal_True; pOL->SetObjectOrdNum(nNowPos,nNewPos); if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoObjectOrdNum(*pObj,nNowPos,nNewPos)); @@ -186,7 +186,7 @@ void SdrEditView::MovMarkedToTop() void SdrEditView::MovMarkedToBtm() { - ULONG nAnz=GetMarkedObjectCount(); + sal_uIntPtr nAnz=GetMarkedObjectCount(); if (nAnz!=0) { const bool bUndo = IsUndoEnabled(); @@ -195,15 +195,15 @@ void SdrEditView::MovMarkedToBtm() BegUndo(ImpGetResStr(STR_EditMovToBtm),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_MOVTOBTM); SortMarkedObjects(); - ULONG nm; + sal_uIntPtr nm; for (nm=0; nm<nAnz; nm++) { // Ordnums muessen alle stimmen! GetMarkedObjectByIndex(nm)->GetOrdNum(); } - BOOL bChg=FALSE; + sal_Bool bChg=sal_False; SdrObjList* pOL0=NULL; - ULONG nNewPos=0; + sal_uIntPtr nNewPos=0; for (nm=0; nm<nAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); @@ -214,19 +214,19 @@ void SdrEditView::MovMarkedToBtm() nNewPos=0; pOL0=pOL; } - ULONG nNowPos=pObj->GetOrdNumDirect(); + sal_uIntPtr nNowPos=pObj->GetOrdNumDirect(); const Rectangle& rBR=pObj->GetCurrentBoundRect(); - ULONG nCmpPos=nNowPos; if (nCmpPos>0) nCmpPos--; + sal_uIntPtr nCmpPos=nNowPos; if (nCmpPos>0) nCmpPos--; SdrObject* pMaxObj=GetMaxToBtmObj(pObj); if (pMaxObj!=NULL) { - ULONG nMinPos=pMaxObj->GetOrdNum()+1; + sal_uIntPtr nMinPos=pMaxObj->GetOrdNum()+1; if (nNewPos<nMinPos) nNewPos=nMinPos; // diesen nicht ueberholen. if (nNewPos>nNowPos) nNewPos=nNowPos; // aber dabei auch nicht in die falsche Richtung schieben } - BOOL bEnd=FALSE; + sal_Bool bEnd=sal_False; // nNewPos ist an dieser Stelle noch die maximale Position, // an der das Obj hinruecken darf, ohne seinen Vorgaenger // (Mehrfachselektion) zu ueberholen. @@ -236,18 +236,18 @@ void SdrEditView::MovMarkedToBtm() if (pCmpObj==NULL) { OSL_FAIL("MovMarkedToBtm(): Vergleichsobjekt nicht gefunden"); - bEnd=TRUE; + bEnd=sal_True; } else if (pCmpObj==pMaxObj) { nNewPos=nCmpPos; nNewPos++; - bEnd=TRUE; + bEnd=sal_True; } else if (rBR.IsOver(pCmpObj->GetCurrentBoundRect())) { nNewPos=nCmpPos; - bEnd=TRUE; + bEnd=sal_True; } else { @@ -256,7 +256,7 @@ void SdrEditView::MovMarkedToBtm() } if (nNowPos!=nNewPos) { - bChg=TRUE; + bChg=sal_True; pOL->SetObjectOrdNum(nNowPos,nNewPos); if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoObjectOrdNum(*pObj,nNowPos,nNewPos)); @@ -280,7 +280,7 @@ void SdrEditView::PutMarkedToTop() void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj) { - ULONG nAnz=GetMarkedObjectCount(); + sal_uIntPtr nAnz=GetMarkedObjectCount(); if (nAnz!=0) { const bool bUndo = IsUndoEnabled(); @@ -293,7 +293,7 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj) { // Damit "Vor das Objekt" auch funktioniert wenn die // markierten Objekte bereits vor dem Objekt stehen - ULONG nRefMark=TryToFindMarkedObject(pRefObj); + sal_uIntPtr nRefMark=TryToFindMarkedObject(pRefObj); SdrMark aRefMark; if (nRefMark!=CONTAINER_ENTRY_NOTFOUND) { @@ -307,14 +307,14 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj) SortMarkedObjects(); } } - ULONG nm; + sal_uIntPtr nm; for (nm=0; nm<nAnz; nm++) { // Ordnums muessen alle stimmen! GetMarkedObjectByIndex(nm)->GetOrdNum(); } - BOOL bChg=FALSE; + sal_Bool bChg=sal_False; SdrObjList* pOL0=NULL; - ULONG nNewPos=0; + sal_uIntPtr nNewPos=0; for (nm=nAnz; nm>0;) { nm--; @@ -325,14 +325,14 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj) SdrObjList* pOL=pObj->GetObjList(); if (pOL!=pOL0) { - nNewPos=ULONG(pOL->GetObjCount()-1); + nNewPos=sal_uIntPtr(pOL->GetObjCount()-1); pOL0=pOL; } - ULONG nNowPos=pObj->GetOrdNumDirect(); + sal_uIntPtr nNowPos=pObj->GetOrdNumDirect(); SdrObject* pMaxObj=GetMaxToTopObj(pObj); if (pMaxObj!=NULL) { - ULONG nMaxOrd=pMaxObj->GetOrdNum(); // geht leider nicht anders + sal_uIntPtr nMaxOrd=pMaxObj->GetOrdNum(); // geht leider nicht anders if (nMaxOrd>0) nMaxOrd--; if (nNewPos>nMaxOrd) @@ -344,7 +344,7 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj) { if (pRefObj->GetObjList()==pObj->GetObjList()) { - ULONG nMaxOrd=pRefObj->GetOrdNum(); // geht leider nicht anders + sal_uIntPtr nMaxOrd=pRefObj->GetOrdNum(); // geht leider nicht anders if (nNewPos>nMaxOrd) nNewPos=nMaxOrd; // nicht ueberholen. if (nNewPos<nNowPos) @@ -357,7 +357,7 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj) } if (nNowPos!=nNewPos) { - bChg=TRUE; + bChg=sal_True; pOL->SetObjectOrdNum(nNowPos,nNewPos); if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoObjectOrdNum(*pObj,nNowPos,nNewPos)); @@ -382,7 +382,7 @@ void SdrEditView::PutMarkedToBtm() void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj) { - ULONG nAnz=GetMarkedObjectCount(); + sal_uIntPtr nAnz=GetMarkedObjectCount(); if (nAnz!=0) { const bool bUndo = IsUndoEnabled(); @@ -395,7 +395,7 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj) { // Damit "Hinter das Objekt" auch funktioniert wenn die // markierten Objekte bereits hinter dem Objekt stehen - ULONG nRefMark=TryToFindMarkedObject(pRefObj); + sal_uIntPtr nRefMark=TryToFindMarkedObject(pRefObj); SdrMark aRefMark; if (nRefMark!=CONTAINER_ENTRY_NOTFOUND) { @@ -409,13 +409,13 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj) SortMarkedObjects(); } } - ULONG nm; + sal_uIntPtr nm; for (nm=0; nm<nAnz; nm++) { // Ordnums muessen alle stimmen! GetMarkedObjectByIndex(nm)->GetOrdNum(); } - BOOL bChg=FALSE; + sal_Bool bChg=sal_False; SdrObjList* pOL0=NULL; - ULONG nNewPos=0; + sal_uIntPtr nNewPos=0; for (nm=0; nm<nAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); @@ -425,16 +425,16 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj) nNewPos=0; pOL0=pOL; } - ULONG nNowPos=pObj->GetOrdNumDirect(); + sal_uIntPtr nNowPos=pObj->GetOrdNumDirect(); SdrObject* pMinObj=GetMaxToBtmObj(pObj); if (pMinObj!=NULL) { - ULONG nMinOrd=pMinObj->GetOrdNum()+1; // geht leider nicht anders + sal_uIntPtr nMinOrd=pMinObj->GetOrdNum()+1; // geht leider nicht anders if (nNewPos<nMinOrd) nNewPos=nMinOrd; // nicht ueberholen. if (nNewPos>nNowPos) nNewPos=nNowPos; // aber dabei auch nicht in die falsche Richtung schieben } if (pRefObj!=NULL) { if (pRefObj->GetObjList()==pObj->GetObjList()) { - ULONG nMinOrd=pRefObj->GetOrdNum(); // geht leider nicht anders + sal_uIntPtr nMinOrd=pRefObj->GetOrdNum(); // geht leider nicht anders if (nNewPos<nMinOrd) nNewPos=nMinOrd; // nicht ueberholen. if (nNewPos>nNowPos) nNewPos=nNowPos; // aber dabei auch nicht in die falsche Richtung schieben } else { @@ -442,7 +442,7 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj) } } if (nNowPos!=nNewPos) { - bChg=TRUE; + bChg=sal_True; pOL->SetObjectOrdNum(nNowPos,nNewPos); if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoObjectOrdNum(*pObj,nNowPos,nNewPos)); @@ -463,32 +463,32 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj) void SdrEditView::ReverseOrderOfMarked() { SortMarkedObjects(); - ULONG nMarkAnz=GetMarkedObjectCount(); + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); if (nMarkAnz>0) { - //BOOL bNeedBundle=FALSE; - BOOL bChg=FALSE; + //sal_Bool bNeedBundle=sal_False; + sal_Bool bChg=sal_False; bool bUndo = IsUndoEnabled(); if( bUndo ) BegUndo(ImpGetResStr(STR_EditRevOrder),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_REVORDER); - ULONG a=0; + sal_uIntPtr a=0; do { // Markierung ueber mehrere PageViews berueksichtigen - ULONG b=a+1; + sal_uIntPtr b=a+1; while (b<nMarkAnz && GetSdrPageViewOfMarkedByIndex(b) == GetSdrPageViewOfMarkedByIndex(a)) b++; b--; SdrObjList* pOL=GetSdrPageViewOfMarkedByIndex(a)->GetObjList(); - ULONG c=b; + sal_uIntPtr c=b; if (a<c) { // Sicherstellen, dass die OrdNums nicht Dirty sind GetMarkedObjectByIndex(a)->GetOrdNum(); } while (a<c) { SdrObject* pObj1=GetMarkedObjectByIndex(a); SdrObject* pObj2=GetMarkedObjectByIndex(c); - ULONG nOrd1=pObj1->GetOrdNumDirect(); - ULONG nOrd2=pObj2->GetOrdNumDirect(); + sal_uIntPtr nOrd1=pObj1->GetOrdNumDirect(); + sal_uIntPtr nOrd2=pObj2->GetOrdNumDirect(); if( bUndo ) { AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoObjectOrdNum(*pObj1,nOrd1,nOrd2)); @@ -499,7 +499,7 @@ void SdrEditView::ReverseOrderOfMarked() pOL->SetObjectOrdNum(nOrd2-1,nOrd1); // Verwendung von Replace statt SetOrdNum wg. Performance (Neuberechnung der Ordnums) a++; c--; - bChg=TRUE; + bChg=sal_True; } a=b+1; } while (a<nMarkAnz); @@ -514,30 +514,30 @@ void SdrEditView::ReverseOrderOfMarked() void SdrEditView::ImpCheckToTopBtmPossible() { - ULONG nAnz=GetMarkedObjectCount(); + sal_uIntPtr nAnz=GetMarkedObjectCount(); if (nAnz==0) return; if (nAnz==1) { // Sonderbehandlung fuer Einzelmarkierung SdrObject* pObj=GetMarkedObjectByIndex(0); SdrObjList* pOL=pObj->GetObjList(); - ULONG nMax=pOL->GetObjCount(); - ULONG nMin=0; - ULONG nObjNum=pObj->GetOrdNum(); + sal_uIntPtr nMax=pOL->GetObjCount(); + sal_uIntPtr nMin=0; + sal_uIntPtr nObjNum=pObj->GetOrdNum(); SdrObject* pRestrict=GetMaxToTopObj(pObj); if (pRestrict!=NULL) { - ULONG nRestrict=pRestrict->GetOrdNum(); + sal_uIntPtr nRestrict=pRestrict->GetOrdNum(); if (nRestrict<nMax) nMax=nRestrict; } pRestrict=GetMaxToBtmObj(pObj); if (pRestrict!=NULL) { - ULONG nRestrict=pRestrict->GetOrdNum(); + sal_uIntPtr nRestrict=pRestrict->GetOrdNum(); if (nRestrict>nMin) nMin=nRestrict; } - bToTopPossible=nObjNum<ULONG(nMax-1); + bToTopPossible=nObjNum<sal_uIntPtr(nMax-1); bToBtmPossible=nObjNum>nMin; } else { // Mehrfachselektion - ULONG nm=0; + sal_uIntPtr nm=0; SdrObjList* pOL0=NULL; long nPos0=-1; while (!bToBtmPossible && nm<nAnz) { // 'nach hinten' checken @@ -547,8 +547,8 @@ void SdrEditView::ImpCheckToTopBtmPossible() nPos0=-1; pOL0=pOL; } - ULONG nPos=pObj->GetOrdNum(); - bToBtmPossible=nPos>ULONG(nPos0+1); + sal_uIntPtr nPos=pObj->GetOrdNum(); + bToBtmPossible=nPos>sal_uIntPtr(nPos0+1); nPos0=long(nPos); nm++; } @@ -563,8 +563,8 @@ void SdrEditView::ImpCheckToTopBtmPossible() nPos0=pOL->GetObjCount(); pOL0=pOL; } - ULONG nPos=pObj->GetOrdNum(); - bToTopPossible=nPos+1<ULONG(nPos0); + sal_uIntPtr nPos=pObj->GetOrdNum(); + bToTopPossible=nPos+1<sal_uIntPtr(nPos0); nPos0=nPos; } } @@ -800,8 +800,8 @@ basegfx::B2DPolygon SdrEditView::ImpCombineToSinglePolygon(const basegfx::B2DPol struct ImpDistributeEntry { SdrObject* mpObj; - INT32 mnPos; - INT32 mnLength; + sal_Int32 mnPos; + sal_Int32 mnLength; }; typedef vector< ImpDistributeEntry*> ImpDistributeEntryList; @@ -820,7 +820,7 @@ void SdrEditView::DistributeMarkedObjects() AbstractSvxDistributeDialog *pDlg = pFact->CreateSvxDistributeDialog(NULL, aNewAttr); DBG_ASSERT(pDlg, "Dialogdiet fail!"); - UINT16 nResult = pDlg->Execute(); + sal_uInt16 nResult = pDlg->Execute(); if(nResult == RET_OK) { @@ -885,7 +885,7 @@ void SdrEditView::DistributeMarkedObjects() if(eHor == SvxDistributeHorizontalDistance) { // calc room in-between - INT32 nWidth = GetAllMarkedBoundRect().GetWidth() + 1; + sal_Int32 nWidth = GetAllMarkedBoundRect().GetWidth() + 1; double fStepWidth = ((double)nWidth - (double)nFullLength) / (double)(aEntryList.size() - 1); double fStepStart = (double)aEntryList[ 0 ]->mnPos; fStepStart += fStepWidth + (double)((aEntryList[ 0 ]->mnLength + aEntryList[ 1 ]->mnLength) / 2); @@ -895,7 +895,7 @@ void SdrEditView::DistributeMarkedObjects() { ImpDistributeEntry* pCurr = aEntryList[ i ]; ImpDistributeEntry* pNext = aEntryList[ i + 1]; - INT32 nDelta = (INT32)(fStepStart + 0.5) - pCurr->mnPos; + sal_Int32 nDelta = (sal_Int32)(fStepStart + 0.5) - pCurr->mnPos; if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pCurr->mpObj)); pCurr->mpObj->Move(Size(nDelta, 0)); @@ -905,7 +905,7 @@ void SdrEditView::DistributeMarkedObjects() else { // calc distances - INT32 nWidth = aEntryList[ aEntryList.size() - 1 ]->mnPos - aEntryList[ 0 ]->mnPos; + sal_Int32 nWidth = aEntryList[ aEntryList.size() - 1 ]->mnPos - aEntryList[ 0 ]->mnPos; double fStepWidth = (double)nWidth / (double)(aEntryList.size() - 1); double fStepStart = (double)aEntryList[ 0 ]->mnPos; fStepStart += fStepWidth; @@ -914,7 +914,7 @@ void SdrEditView::DistributeMarkedObjects() for( size_t i = 1 ; i < aEntryList.size()-1 ; ++i ) { ImpDistributeEntry* pCurr = aEntryList[ i ]; - INT32 nDelta = (INT32)(fStepStart + 0.5) - pCurr->mnPos; + sal_Int32 nDelta = (sal_Int32)(fStepStart + 0.5) - pCurr->mnPos; if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pCurr->mpObj)); pCurr->mpObj->Move(Size(nDelta, 0)); @@ -979,7 +979,7 @@ void SdrEditView::DistributeMarkedObjects() if(eVer == SvxDistributeVerticalDistance) { // calc room in-between - INT32 nHeight = GetAllMarkedBoundRect().GetHeight() + 1; + sal_Int32 nHeight = GetAllMarkedBoundRect().GetHeight() + 1; double fStepWidth = ((double)nHeight - (double)nFullLength) / (double)(aEntryList.size() - 1); double fStepStart = (double)aEntryList[ 0 ]->mnPos; fStepStart += fStepWidth + (double)((aEntryList[ 0 ]->mnLength + aEntryList[ 1 ]->mnLength) / 2); @@ -989,7 +989,7 @@ void SdrEditView::DistributeMarkedObjects() { ImpDistributeEntry* pCurr = aEntryList[ i ]; ImpDistributeEntry* pNext = aEntryList[ i + 1 ]; - INT32 nDelta = (INT32)(fStepStart + 0.5) - pCurr->mnPos; + sal_Int32 nDelta = (sal_Int32)(fStepStart + 0.5) - pCurr->mnPos; if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pCurr->mpObj)); pCurr->mpObj->Move(Size(0, nDelta)); @@ -999,7 +999,7 @@ void SdrEditView::DistributeMarkedObjects() else { // calc distances - INT32 nHeight = aEntryList[ aEntryList.size() - 1 ]->mnPos - aEntryList[ 0 ]->mnPos; + sal_Int32 nHeight = aEntryList[ aEntryList.size() - 1 ]->mnPos - aEntryList[ 0 ]->mnPos; double fStepWidth = (double)nHeight / (double)(aEntryList.size() - 1); double fStepStart = (double)aEntryList[ 0 ]->mnPos; fStepStart += fStepWidth; @@ -1008,7 +1008,7 @@ void SdrEditView::DistributeMarkedObjects() for(size_t i = 1, n = aEntryList.size()-1; i < n; ++i) { ImpDistributeEntry* pCurr = aEntryList[ i ]; - INT32 nDelta = (INT32)(fStepStart + 0.5) - pCurr->mnPos; + sal_Int32 nDelta = (sal_Int32)(fStepStart + 0.5) - pCurr->mnPos; if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pCurr->mpObj)); pCurr->mpObj->Move(Size(0, nDelta)); @@ -1047,24 +1047,24 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode) if( bUndo ) BegUndo(); - UINT32 nInsPos=0xFFFFFFFF; + sal_uInt32 nInsPos=0xFFFFFFFF; const SdrObject* pAttrObj = NULL; basegfx::B2DPolyPolygon aMergePolyPolygonA; basegfx::B2DPolyPolygon aMergePolyPolygonB; SdrObjList* pInsOL = NULL; SdrPageView* pInsPV = NULL; - BOOL bFirstObjectComplete(FALSE); + sal_Bool bFirstObjectComplete(sal_False); // make sure selected objects are contour objects // since now basegfx::tools::adaptiveSubdivide() is used, it is no longer // necessary to use ConvertMarkedToPolyObj which will subdivide curves using the old // mechanisms. In a next step the polygon clipper will even be able to clip curves... - // ConvertMarkedToPolyObj(TRUE); + // ConvertMarkedToPolyObj(sal_True); ConvertMarkedToPathObj(sal_True); OSL_ENSURE(AreObjectsMarked(), "no more objects selected after preparations (!)"); - for(UINT32 a=0;a<GetMarkedObjectCount();a++) + for(sal_uInt32 a=0;a<GetMarkedObjectCount();a++) { SdrMark* pM = GetSdrMarkByIndex(a); SdrObject* pObj = pM->GetMarkedSdrObj(); @@ -1132,7 +1132,7 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode) // was there something added to the first poly? if(!bFirstObjectComplete && aMergePolyPolygonA.count()) { - bFirstObjectComplete = TRUE; + bFirstObjectComplete = sal_True; } // move object to temporary delete list @@ -1179,7 +1179,7 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode) pInsOL->InsertObject(pPath, nInsPos, &aReason); if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath)); - MarkObj(pPath, pInsPV, FALSE, TRUE); + MarkObj(pPath, pInsPV, sal_False, sal_True); } aRemove.ForceSort(); @@ -1375,7 +1375,7 @@ void SdrEditView::CombineMarkedObjects(sal_Bool bNoPolyPoly) // in the UNDO there is no problem, but as soon as they get deleted, the // MarkList will contain deleted objects -> GPF. UnmarkAllObj(pInsPV); - MarkObj(pPath, pInsPV, FALSE, TRUE); + MarkObj(pPath, pInsPV, sal_False, sal_True); } // UndoComment aus den tatsaechlich verwendeten Objekten zusammenbauen @@ -1428,8 +1428,8 @@ sal_Bool SdrEditView::ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPolyg sal_Bool SdrEditView::ImpCanDismantle(const SdrObject* pObj, sal_Bool bMakeLines) const { - sal_Bool bOtherObjs(sal_False); // TRUE=andere Objekte ausser PathObj's vorhanden - sal_Bool bMin1PolyPoly(sal_False); // TRUE=mind. 1 PolyPolygon mit mehr als ein Polygon vorhanden + sal_Bool bOtherObjs(sal_False); // sal_True=andere Objekte ausser PathObj's vorhanden + sal_Bool bMin1PolyPoly(sal_False); // sal_True=mind. 1 PolyPolygon mit mehr als ein Polygon vorhanden SdrObjList* pOL = pObj->GetSubList(); if(pOL) @@ -1504,7 +1504,7 @@ sal_Bool SdrEditView::ImpCanDismantle(const SdrObject* pObj, sal_Bool bMakeLines return bMin1PolyPoly && !bOtherObjs; } -void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, ULONG& rPos, SdrPageView* pPV, BOOL bMakeLines) +void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, sal_uIntPtr& rPos, SdrPageView* pPV, sal_Bool bMakeLines) { const SdrPathObj* pSrcPath = PTR_CAST(SdrPathObj, pObj); const SdrObjCustomShape* pCustomShape = PTR_CAST(SdrObjCustomShape, pObj); @@ -1531,8 +1531,8 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, SdrInsertReason aReason(SDRREASON_VIEWCALL, pSrcPath); rOL.InsertObject(pPath, rPos, &aReason); if( bUndo ) - AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath, TRUE)); - MarkObj(pPath, pPV, FALSE, TRUE); + AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath, sal_True)); + MarkObj(pPath, pPV, sal_False, sal_True); rPos++; } else @@ -1566,8 +1566,8 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, SdrInsertReason aReason(SDRREASON_VIEWCALL, pSrcPath); rOL.InsertObject(pPath, rPos, &aReason); if( bUndo ) - AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath, TRUE)); - MarkObj(pPath, pPV, FALSE, TRUE); + AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath, sal_True)); + MarkObj(pPath, pPV, sal_False, sal_True); rPos++; } } @@ -1603,7 +1603,7 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, rOL.InsertObject(pCandidate, rPos, &aReason); if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pCandidate, true)); - MarkObj(pCandidate, pPV, FALSE, TRUE); + MarkObj(pCandidate, pPV, sal_False, sal_True); if(pCustomShape->HasText() && !pCustomShape->IsTextPath()) { @@ -1648,16 +1648,16 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, rOL.InsertObject(pTextObj, rPos + 1, &aReason); if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pTextObj, true)); - MarkObj(pTextObj, pPV, FALSE, TRUE); + MarkObj(pTextObj, pPV, sal_False, sal_True); } } } } } -void SdrEditView::DismantleMarkedObjects(BOOL bMakeLines) +void SdrEditView::DismantleMarkedObjects(sal_Bool bMakeLines) { - //UINT32 nCnt(0); + //sal_uInt32 nCnt(0); // Temporaere Marklist SdrMarkList aRemoveMerker; @@ -1672,8 +1672,8 @@ void SdrEditView::DismantleMarkedObjects(BOOL bMakeLines) bMakeLines ? SDRREPFUNC_OBJ_DISMANTLE_LINES : SDRREPFUNC_OBJ_DISMANTLE_POLYS); } - ULONG nm; - ULONG nAnz=GetMarkedObjectCount(); + sal_uIntPtr nm; + sal_uIntPtr nAnz=GetMarkedObjectCount(); SdrObjList* pOL0=NULL; for (nm=nAnz; nm>0;) { nm--; @@ -1684,8 +1684,8 @@ void SdrEditView::DismantleMarkedObjects(BOOL bMakeLines) if (pOL!=pOL0) { pOL0=pOL; pObj->GetOrdNum(); } // sicherstellen, dass OrdNums stimmen! if (ImpCanDismantle(pObj,bMakeLines)) { aRemoveMerker.InsertEntry(SdrMark(pObj,pM->GetPageView())); - ULONG nPos0=pObj->GetOrdNumDirect(); - ULONG nPos=nPos0+1; + sal_uIntPtr nPos0=pObj->GetOrdNumDirect(); + sal_uIntPtr nPos=nPos0+1; SdrObjList* pSubList=pObj->GetSubList(); if (pSubList!=NULL && !pObj->Is3DObj()) { SdrObjListIter aIter(*pSubList,IM_DEEPNOGROUPS); @@ -1697,7 +1697,7 @@ void SdrEditView::DismantleMarkedObjects(BOOL bMakeLines) ImpDismantleOneObject(pObj,*pOL,nPos,pPV,bMakeLines); } if( bUndo ) - AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoDeleteObject(*pObj,TRUE)); + AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoDeleteObject(*pObj,sal_True)); pOL->RemoveObject(nPos0); if( !bUndo ) @@ -1735,8 +1735,8 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp) { BegUndo(ImpGetResStr(STR_EditGroup),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_GROUP); - const ULONG nAnz = GetMarkedObjectCount(); - for(ULONG nm = nAnz; nm>0; ) + const sal_uIntPtr nAnz = GetMarkedObjectCount(); + for(sal_uIntPtr nm = nAnz; nm>0; ) { // UndoActions fuer alle betroffenen Objekte anlegen nm--; @@ -1766,9 +1766,9 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp) SdrObjList* pDstLst=NULL; // Falls alle markierten Objekte aus Fremden Obj-Listen // kommen, kommt das Gruppenobjekt an das Ende der Liste. - ULONG nInsPos=pSrcLst->GetObjCount(); - BOOL bNeedInsPos=TRUE; - for (ULONG nm=GetMarkedObjectCount(); nm>0;) + sal_uIntPtr nInsPos=pSrcLst->GetObjCount(); + sal_Bool bNeedInsPos=sal_True; + for (sal_uIntPtr nm=GetMarkedObjectCount(); nm>0;) { nm--; SdrMark* pM=GetSdrMarkByIndex(nm); @@ -1790,13 +1790,13 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp) if (pSrcLst->IsObjOrdNumsDirty()) pSrcLst->RecalcObjOrdNums(); } - BOOL bForeignList=pSrcLst!=pAktLst; - BOOL bGrouped=pSrcLst!=pPage; + sal_Bool bForeignList=pSrcLst!=pAktLst; + sal_Bool bGrouped=pSrcLst!=pPage; if (!bForeignList && bNeedInsPos) { nInsPos=pObj->GetOrdNum(); // ua, damit sind alle ObjOrdNum der Page gesetzt nInsPos++; - bNeedInsPos=FALSE; + bNeedInsPos=sal_False; } pSrcLst->RemoveObject(pObj->GetOrdNumDirect()); if (!bForeignList) @@ -1819,13 +1819,13 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp) if (pGrp!=NULL) { aNewMark.InsertEntry(SdrMark(pGrp,pPV)); - ULONG nAnz=pDstLst->GetObjCount(); + sal_uIntPtr nAnz=pDstLst->GetObjCount(); SdrInsertReason aReason(SDRREASON_VIEWCALL,pRefObj); pAktLst->InsertObject(pGrp,nInsPos,&aReason); if( bUndo ) { AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pGrp,true)); // Kein Recalc! - for (ULONG no=0; no<nAnz; no++) + for (sal_uIntPtr no=0; no<nAnz; no++) { AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoInsertObject(*pDstLst->GetObj(no))); } @@ -1858,11 +1858,11 @@ void SdrEditView::UnGroupMarked() if( bUndo ) BegUndo(String(), String(), SDRREPFUNC_OBJ_UNGROUP); - ULONG nCount=0; + sal_uIntPtr nCount=0; XubString aName1; XubString aName; - BOOL bNameOk=FALSE; - for (ULONG nm=GetMarkedObjectCount(); nm>0;) { + sal_Bool bNameOk=sal_False; + for (sal_uIntPtr nm=GetMarkedObjectCount(); nm>0;) { nm--; SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pGrp=pM->GetMarkedSdrObj(); @@ -1872,7 +1872,7 @@ void SdrEditView::UnGroupMarked() if (nCount==1) { pGrp->TakeObjNameSingul(aName); // Bezeichnung der Gruppe holen pGrp->TakeObjNamePlural(aName1); // Bezeichnung der Gruppe holen - bNameOk=TRUE; + bNameOk=sal_True; } else { if (nCount==2) aName=aName1; // Pluralname setzen if (bNameOk) { @@ -1880,17 +1880,17 @@ void SdrEditView::UnGroupMarked() pGrp->TakeObjNamePlural(aStr); // Bezeichnung der Gruppe holen if(!aStr.Equals(aName)) - bNameOk = FALSE; + bNameOk = sal_False; } } - ULONG nDstCnt=pGrp->GetOrdNum(); + sal_uIntPtr nDstCnt=pGrp->GetOrdNum(); SdrObjList* pDstLst=pM->GetPageView()->GetObjList(); // FIRST move contained objects to parent of group, so that // the contained objects are NOT migrated to the UNDO-ItemPool // when AddUndo(new SdrUndoDelObj(*pGrp)) is called. - ULONG nAnz=pSrcLst->GetObjCount(); - ULONG no; + sal_uIntPtr nAnz=pSrcLst->GetObjCount(); + sal_uIntPtr no; if( bUndo ) { @@ -1912,7 +1912,7 @@ void SdrEditView::UnGroupMarked() // Kein SortCheck beim einfuegen in die MarkList, denn das // wuerde wg. pObj->GetOrdNum() jedesmal ein RecalcOrdNums() // provozieren: - aNewMark.InsertEntry(SdrMark(pObj,pM->GetPageView()),FALSE); + aNewMark.InsertEntry(SdrMark(pObj,pM->GetPageView()),sal_False); } if( bUndo ) @@ -1943,7 +1943,7 @@ void SdrEditView::UnGroupMarked() if (nCount!=0) { - GetMarkedObjectListWriteAccess().Merge(aNewMark,TRUE); // Durch das obige Einsortieren ist aNewMark genau verkehrtherum + GetMarkedObjectListWriteAccess().Merge(aNewMark,sal_True); // Durch das obige Einsortieren ist aNewMark genau verkehrtherum MarkListHasChanged(); } } @@ -1958,7 +1958,7 @@ void SdrEditView::UnGroupMarked() // //////////////////////////////////////////////////////////////////////////////////////////////////// -SdrObject* SdrEditView::ImpConvertOneObj(SdrObject* pObj, BOOL bPath, BOOL bLineToArea) +SdrObject* SdrEditView::ImpConvertOneObj(SdrObject* pObj, sal_Bool bPath, sal_Bool bLineToArea) { SdrObject* pNewObj = pObj->ConvertToPolyObj(bPath, bLineToArea); if (pNewObj!=NULL) @@ -1980,12 +1980,12 @@ SdrObject* SdrEditView::ImpConvertOneObj(SdrObject* pObj, BOOL bPath, BOOL bLine return pNewObj; } -void SdrEditView::ImpConvertTo(BOOL bPath, BOOL bLineToArea) +void SdrEditView::ImpConvertTo(sal_Bool bPath, sal_Bool bLineToArea) { - BOOL bMrkChg=FALSE; + sal_Bool bMrkChg=sal_False; if (AreObjectsMarked()) { - ULONG nMarkAnz=GetMarkedObjectCount(); - USHORT nDscrID=0; + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + sal_uInt16 nDscrID=0; if(bLineToArea) { if(nMarkAnz == 1) @@ -2007,7 +2007,7 @@ void SdrEditView::ImpConvertTo(BOOL bPath, BOOL bLineToArea) BegUndo(ImpGetResStr(nDscrID),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_CONVERTTOPOLY); } } - for (ULONG nm=nMarkAnz; nm>0;) { + for (sal_uIntPtr nm=nMarkAnz; nm>0;) { nm--; SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); @@ -2022,7 +2022,7 @@ void SdrEditView::ImpConvertTo(BOOL bPath, BOOL bLineToArea) } else { SdrObject* pNewObj=ImpConvertOneObj(pObj,bPath,bLineToArea); if (pNewObj!=NULL) { - bMrkChg=TRUE; + bMrkChg=sal_True; GetMarkedObjectListWriteAccess().ReplaceMark(SdrMark(pNewObj,pPV),nm); } } @@ -2033,14 +2033,14 @@ void SdrEditView::ImpConvertTo(BOOL bPath, BOOL bLineToArea) } } -void SdrEditView::ConvertMarkedToPathObj(BOOL bLineToArea) +void SdrEditView::ConvertMarkedToPathObj(sal_Bool bLineToArea) { - ImpConvertTo(TRUE, bLineToArea); + ImpConvertTo(sal_True, bLineToArea); } -void SdrEditView::ConvertMarkedToPolyObj(BOOL bLineToArea) +void SdrEditView::ConvertMarkedToPolyObj(sal_Bool bLineToArea) { - ImpConvertTo(FALSE, bLineToArea); + ImpConvertTo(sal_False, bLineToArea); } //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -2063,9 +2063,9 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo) SortMarkedObjects(); SdrMarkList aForTheDescription; SdrMarkList aNewMarked; - ULONG nAnz=GetMarkedObjectCount(); + sal_uIntPtr nAnz=GetMarkedObjectCount(); - for (ULONG nm=nAnz; nm>0;) + for (sal_uIntPtr nm=nAnz; nm>0;) { // Undo Objekte fuer alle neuen Objekte erzeugen // zwischen den Metafiles auf Abbruch testen if( pProgrInfo != NULL ) @@ -2080,10 +2080,10 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo) SdrObject* pObj=pM->GetMarkedSdrObj(); SdrPageView* pPV=pM->GetPageView(); SdrObjList* pOL=pObj->GetObjList(); - ULONG nInsPos=pObj->GetOrdNum()+1; + sal_uIntPtr nInsPos=pObj->GetOrdNum()+1; SdrGrafObj* pGraf=PTR_CAST(SdrGrafObj,pObj); SdrOle2Obj* pOle2=PTR_CAST(SdrOle2Obj,pObj); - ULONG nInsAnz=0; + sal_uIntPtr nInsAnz=0; if (pGraf!=NULL && pGraf->HasGDIMetaFile()) { ImpSdrGDIMetaFileImport aFilter(*pMod); @@ -2101,8 +2101,8 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo) } if (nInsAnz!=0) { - ULONG nObj=nInsPos; - for (ULONG i=0; i<nInsAnz; i++) + sal_uIntPtr nObj=nInsPos; + for (sal_uIntPtr i=0; i<nInsAnz; i++) { if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pOL->GetObj(nObj))); @@ -2131,7 +2131,7 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo) if(aNewMarked.GetMarkCount()) { // Neue Selektion bilden - for(ULONG a(0); a < aNewMarked.GetMarkCount(); a++) + for(sal_uIntPtr a(0); a < aNewMarked.GetMarkCount(); a++) { GetMarkedObjectListWriteAccess().InsertEntry(*aNewMarked.GetMark(a)); } diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index a6155954aee0..d0cb45fe3d61 100644..100755 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -50,12 +50,12 @@ #include <editeng/editobj.hxx> #include <editeng/outlobj.hxx> #include <editeng/scripttypeitem.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdoutl.hxx> #include <svx/sdtfchim.hxx> #include <svx/svdotext.hxx> #include <svx/svdundo.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include "svx/svdpagv.hxx" #include "svx/svdpage.hxx" #include "svx/svdetc.hxx" // fuer GetDraftFillColor @@ -67,36 +67,36 @@ #include <svx/svdoutl.hxx> #include <svx/svddrgv.hxx> // fuer SetSolidDragging() -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache -#include "globl3d.hxx" +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache +#include "svx/globl3d.hxx" #include <editeng/outliner.hxx> #include <editeng/adjitem.hxx> #include <svtools/colorcfg.hxx> #include <vcl/svapp.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> //////////////////////////////////////////////////////////////////////////////////////////////////// void SdrObjEditView::ImpClearVars() { - bQuickTextEditMode=TRUE; - bMacroMode=TRUE; + bQuickTextEditMode=sal_True; + bMacroMode=sal_True; pTextEditOutliner=NULL; pTextEditOutlinerView=NULL; pTextEditPV=NULL; pTextEditWin=NULL; pTextEditCursorMerker=NULL; pEditPara=NULL; - bTextEditNewObj=FALSE; - bMacroDown=FALSE; + bTextEditNewObj=sal_False; + bMacroDown=sal_False; pMacroObj=NULL; pMacroPV=NULL; pMacroWin=NULL; nMacroTol=0; - bTextEditDontDelete=FALSE; - bTextEditOnlyOneView=FALSE; + bTextEditDontDelete=sal_False; + bTextEditOnlyOneView=sal_False; } SdrObjEditView::SdrObjEditView(SdrModel* pModel1, OutputDevice* pOut): @@ -116,7 +116,7 @@ SdrObjEditView::~SdrObjEditView() //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SdrObjEditView::IsAction() const +sal_Bool SdrObjEditView::IsAction() const { return IsMacroObj() || SdrGlueEditView::IsAction(); } @@ -184,10 +184,10 @@ void SdrObjEditView::ModelHasChanged() if (IsTextEdit()) { SdrTextObj* pTextObj=dynamic_cast<SdrTextObj*>( mxTextEditObj.get() ); if (pTextObj!=NULL) { - ULONG nOutlViewAnz=pTextEditOutliner->GetViewCount(); - BOOL bAreaChg=FALSE; - BOOL bAnchorChg=FALSE; - BOOL bColorChg=FALSE; + sal_uIntPtr nOutlViewAnz=pTextEditOutliner->GetViewCount(); + sal_Bool bAreaChg=sal_False; + sal_Bool bAnchorChg=sal_False; + sal_Bool bColorChg=sal_False; bool bContourFrame=pTextObj->IsContourTextFrame(); EVAnchorMode eNewAnchor(ANCHOR_VCENTER_HCENTER); Rectangle aOldArea(aMinTextEditArea); @@ -211,34 +211,34 @@ void SdrObjEditView::ModelHasChanged() pTextEditOutliner->GetMinAutoPaperSize()!=aPaperMin1 || pTextEditOutliner->GetMaxAutoPaperSize()!=aPaperMax1) { aTextEditArea=aEditArea1; aMinTextEditArea=aMinArea1; - pTextEditOutliner->SetUpdateMode(FALSE); + pTextEditOutliner->SetUpdateMode(sal_False); pTextEditOutliner->SetMinAutoPaperSize(aPaperMin1); pTextEditOutliner->SetMaxAutoPaperSize(aPaperMax1); pTextEditOutliner->SetPaperSize(Size(0,0)); // Damit der Outliner neu formatiert if (!bContourFrame) { pTextEditOutliner->ClearPolygon(); - ULONG nStat=pTextEditOutliner->GetControlWord(); + sal_uIntPtr nStat=pTextEditOutliner->GetControlWord(); nStat|=EE_CNTRL_AUTOPAGESIZE; pTextEditOutliner->SetControlWord(nStat); } else { - ULONG nStat=pTextEditOutliner->GetControlWord(); + sal_uIntPtr nStat=pTextEditOutliner->GetControlWord(); nStat&=~EE_CNTRL_AUTOPAGESIZE; pTextEditOutliner->SetControlWord(nStat); Rectangle aAnchorRect; pTextObj->TakeTextAnchorRect(aAnchorRect); - pTextObj->ImpSetContourPolygon(*pTextEditOutliner,aAnchorRect, TRUE); + pTextObj->ImpSetContourPolygon(*pTextEditOutliner,aAnchorRect, sal_True); } - for (ULONG nOV=0; nOV<nOutlViewAnz; nOV++) { + for (sal_uIntPtr nOV=0; nOV<nOutlViewAnz; nOV++) { OutlinerView* pOLV=pTextEditOutliner->GetView(nOV); - ULONG nStat0=pOLV->GetControlWord(); - ULONG nStat=nStat0; + sal_uIntPtr nStat0=pOLV->GetControlWord(); + sal_uIntPtr nStat=nStat0; // AutoViewSize nur wenn nicht KontourFrame. if (!bContourFrame) nStat|=EV_CNTRL_AUTOSIZE; else nStat&=~EV_CNTRL_AUTOSIZE; if (nStat!=nStat0) pOLV->SetControlWord(nStat); } - pTextEditOutliner->SetUpdateMode(TRUE); - bAreaChg=TRUE; + pTextEditOutliner->SetUpdateMode(sal_True); + bAreaChg=sal_True; } } if (pTextEditOutlinerView!=NULL) { // Fuellfarbe und Anker checken @@ -266,13 +266,13 @@ void SdrObjEditView::ModelHasChanged() // again on ModelHasChanged(). if (bContourFrame || bAreaChg || bAnchorChg || bColorChg) { - for (ULONG nOV=0; nOV<nOutlViewAnz; nOV++) + for (sal_uIntPtr nOV=0; nOV<nOutlViewAnz; nOV++) { OutlinerView* pOLV=pTextEditOutliner->GetView(nOV); { // Alten OutlinerView-Bereich invalidieren Window* pWin=pOLV->GetWindow(); Rectangle aTmpRect(aOldArea); - USHORT nPixSiz=pOLV->GetInvalidateMore()+1; + sal_uInt16 nPixSiz=pOLV->GetInvalidateMore()+1; Size aMore(pWin->PixelToLogic(Size(nPixSiz,nPixSiz))); aTmpRect.Left()-=aMore.Width(); aTmpRect.Right()+=aMore.Width(); @@ -321,7 +321,7 @@ void SdrObjEditView::ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectang aBlankRect.Union(aMinTextEditArea); Rectangle aPixRect(pWin->LogicToPixel(aBlankRect)); aBlankRect.Intersection(rRect); - rOutlView.GetOutliner()->SetUpdateMode(TRUE); // Bugfix #22596# + rOutlView.GetOutliner()->SetUpdateMode(sal_True); // Bugfix #22596# rOutlView.Paint(aBlankRect); if(!bModifyMerk) @@ -358,7 +358,7 @@ void SdrObjEditView::ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectang aOuterPix.Bottom()+=nPixSiz; bool bMerk(pWin->IsMapModeEnabled()); - pWin->EnableMapMode(FALSE); + pWin->EnableMapMode(sal_False); PolyPolygon aPolyPoly( 2 ); svtools::ColorConfig aColorConfig; @@ -418,32 +418,32 @@ void SdrObjEditView::ImpInvalidateOutlinerView(OutlinerView& rOutlView) const aOuterPix.Bottom()+=nPixSiz; bool bMerk(pWin->IsMapModeEnabled()); - pWin->EnableMapMode(FALSE); + pWin->EnableMapMode(sal_False); pWin->Invalidate(aOuterPix); pWin->EnableMapMode(bMerk); } } } -OutlinerView* SdrObjEditView::ImpMakeOutlinerView(Window* pWin, BOOL /*bNoPaint*/, OutlinerView* pGivenView) const +OutlinerView* SdrObjEditView::ImpMakeOutlinerView(Window* pWin, sal_Bool /*bNoPaint*/, OutlinerView* pGivenView) const { // Hintergrund Color aBackground(GetTextEditBackgroundColor(*this)); SdrTextObj* pText = dynamic_cast< SdrTextObj * >( mxTextEditObj.get() ); - BOOL bTextFrame=pText!=NULL && pText->IsTextFrame(); - BOOL bContourFrame=pText!=NULL && pText->IsContourTextFrame(); + sal_Bool bTextFrame=pText!=NULL && pText->IsTextFrame(); + sal_Bool bContourFrame=pText!=NULL && pText->IsContourTextFrame(); // OutlinerView erzeugen OutlinerView* pOutlView=pGivenView; - pTextEditOutliner->SetUpdateMode(FALSE); + pTextEditOutliner->SetUpdateMode(sal_False); if (pOutlView==NULL) pOutlView=new OutlinerView(pTextEditOutliner,pWin); else pOutlView->SetWindow(pWin); // Scrollen verbieten - ULONG nStat=pOutlView->GetControlWord(); + sal_uIntPtr nStat=pOutlView->GetControlWord(); nStat&=~EV_CNTRL_AUTOSCROLL; // AutoViewSize nur wenn nicht KontourFrame. if (!bContourFrame) nStat|=EV_CNTRL_AUTOSIZE; if (bTextFrame) { - USHORT nPixSiz=aHdl.GetHdlSize()*2+1; + sal_uInt16 nPixSiz=aHdl.GetHdlSize()*2+1; nStat|=EV_CNTRL_INVONEMORE; pOutlView->SetInvalidateMore(nPixSiz); } @@ -455,12 +455,12 @@ OutlinerView* SdrObjEditView::ImpMakeOutlinerView(Window* pWin, BOOL /*bNoPaint* pTextEditOutliner->SetFixedCellHeight(((const SdrTextFixedCellHeightItem&)pText->GetMergedItem(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue()); } pOutlView->SetOutputArea(aTextEditArea); - pTextEditOutliner->SetUpdateMode(TRUE); + pTextEditOutliner->SetUpdateMode(sal_True); ImpInvalidateOutlinerView(*pOutlView); return pOutlView; } -BOOL SdrObjEditView::IsTextEditFrame() const +sal_Bool SdrObjEditView::IsTextEditFrame() const { SdrTextObj* pText = dynamic_cast< SdrTextObj* >( mxTextEditObj.get() ); return pText!=NULL && pText->IsTextFrame(); @@ -488,7 +488,7 @@ IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI) if (pTextObj!=NULL) { Color* pTxtCol=NULL; Color* pFldCol=NULL; - bOk=pTextObj->CalcFieldValue(pFI->GetField(),pFI->GetPara(),pFI->GetPos(),TRUE,pTxtCol,pFldCol,rStr); + bOk=pTextObj->CalcFieldValue(pFI->GetField(),pFI->GetPara(),pFI->GetPos(),sal_True,pTxtCol,pFldCol,rStr); if (bOk) { if (pTxtCol!=NULL) { pFI->SetTxtColor(*pTxtCol); @@ -506,7 +506,7 @@ IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI) Link aDrawOutlLink=rDrawOutl.GetCalcFieldValueHdl(); if (!bOk && aDrawOutlLink.IsSet()) { aDrawOutlLink.Call(pFI); - bOk = (BOOL)rStr.Len(); + bOk = (sal_Bool)rStr.Len(); } if (!bOk && aOldCalcFieldValueLink.IsSet()) { return aOldCalcFieldValueLink.Call(pFI); @@ -524,7 +524,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit( SdrEndTextEdit(); if( dynamic_cast< SdrTextObj* >( pObj ) == 0 ) - return FALSE; // currently only possible with text objects + return sal_False; // currently only possible with text objects if(bGrabFocus && pWin) { @@ -605,7 +605,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit( pTextEditOutliner->ForceAutoColor( aOptions.GetIsAutomaticFontColor() ); } - BOOL bEmpty = mxTextEditObj->GetOutlinerParaObject()==NULL; + sal_Bool bEmpty = mxTextEditObj->GetOutlinerParaObject()==NULL; aOldCalcFieldValueLink=pTextEditOutliner->GetCalcFieldValueHdl(); // Der FieldHdl muss von SdrBeginTextEdit gesetzt sein, da dor ein UpdateFields gerufen wird. @@ -623,7 +623,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit( SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( mxTextEditObj.get() ); DBG_ASSERT( pTextObj, "svx::SdrObjEditView::BegTextEdit(), no text object?" ); if( !pTextObj ) - return FALSE; + return sal_False; // #111096# Switch off evtl. running TextAnimation pTextObj->SetTextAnimationAllowed(sal_False); @@ -643,8 +643,8 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit( Rectangle aTextRect; Rectangle aAnchorRect; - pTextObj->TakeTextRect(*pTextEditOutliner, aTextRect, TRUE, - &aAnchorRect /* #97097# Give TRUE here, not FALSE */); + pTextObj->TakeTextRect(*pTextEditOutliner, aTextRect, sal_True, + &aAnchorRect /* #97097# Give sal_True here, not sal_False */); if ( !pTextObj->IsContourTextFrame() ) { @@ -662,7 +662,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit( aMinTextEditArea.Move(aPvOfs.X(),aPvOfs.Y()); pTextEditCursorMerker=pWin->GetCursor(); - aHdl.SetMoveOutside(TRUE); + aHdl.SetMoveOutside(sal_True); // #i72757# // Since IsMarkHdlWhenTextEdit() is ignored, it is necessary @@ -672,7 +672,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit( pTextEditOutlinerView=ImpMakeOutlinerView(pWin,!bEmpty,pGivenOutlinerView); // check if this view is already inserted - ULONG i2,nCount = pTextEditOutliner->GetViewCount(); + sal_uIntPtr i2,nCount = pTextEditOutliner->GetViewCount(); for( i2 = 0; i2 < nCount; i2++ ) { if( pTextEditOutliner->GetView(i2) == pTextEditOutlinerView ) @@ -682,8 +682,8 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit( if( i2 == nCount ) pTextEditOutliner->InsertView(pTextEditOutlinerView,0); - aHdl.SetMoveOutside(FALSE); - aHdl.SetMoveOutside(TRUE); + aHdl.SetMoveOutside(sal_False); + aHdl.SetMoveOutside(sal_True); //OLMRefreshAllIAOManagers(); // alle Wins als OutlinerView beim Outliner anmelden @@ -783,7 +783,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit( //HMHif (bMarkHdlWhenTextEdit) { //HMH HideMarkHdl(); //HMH} - aHdl.SetMoveOutside(FALSE); + aHdl.SetMoveOutside(sal_False); //HMHShowMarkHdl(); return sal_False; @@ -816,7 +816,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally) if (pTEOutliner!=NULL) { - BOOL bModified=pTEOutliner->IsModified(); + sal_Bool bModified=pTEOutliner->IsModified(); if (pTEOutlinerView!=NULL) { pTEOutlinerView->HideCursor(); @@ -870,7 +870,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally) } // Loeschung des gesamten TextObj checken SdrUndoAction* pDelUndo=NULL; - BOOL bDelObj=FALSE; + sal_Bool bDelObj=sal_False; SdrTextObj* pTextObj=PTR_CAST(SdrTextObj,pTEObj); if (pTextObj!=NULL && bTextEditNewObj) { @@ -934,11 +934,11 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally) AdjustMarkHdl(); } // alle OutlinerViews loeschen - for (ULONG i=pTEOutliner->GetViewCount(); i>0;) + for (sal_uIntPtr i=pTEOutliner->GetViewCount(); i>0;) { i--; OutlinerView* pOLV=pTEOutliner->GetView(i); - USHORT nMorePix=pOLV->GetInvalidateMore() + 10; // solaris aw033 test #i# + sal_uInt16 nMorePix=pOLV->GetInvalidateMore() + 10; // solaris aw033 test #i# Window* pWin=pOLV->GetWindow(); Rectangle aRect(pOLV->GetOutputArea()); pTEOutliner->RemoveView(i); @@ -977,7 +977,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally) //HMH if (bMarkHdlWhenTextEdit) { //HMH HideMarkHdl(); //HMH } - aHdl.SetMoveOutside(FALSE); + aHdl.SetMoveOutside(sal_False); if (eRet!=SDRENDTEXTEDIT_UNCHANGED) //HMH { //HMH ShowMarkHdl(); // Handles kommen ansonsten via Broadcast @@ -1029,8 +1029,8 @@ OutlinerView* SdrObjEditView::ImpFindOutlinerView(Window* pWin) const if (pWin==NULL) return NULL; if (pTextEditOutliner==NULL) return NULL; OutlinerView* pNewView=NULL; - ULONG nWinAnz=pTextEditOutliner->GetViewCount(); - for (ULONG i=0; i<nWinAnz && pNewView==NULL; i++) { + sal_uIntPtr nWinAnz=pTextEditOutliner->GetViewCount(); + for (sal_uIntPtr i=0; i<nWinAnz && pNewView==NULL; i++) { OutlinerView* pView=pTextEditOutliner->GetView(i); if (pView->GetWindow()==pWin) pNewView=pView; } @@ -1057,9 +1057,9 @@ void SdrObjEditView::SetTextEditWin(Window* pWin) } } -BOOL SdrObjEditView::IsTextEditHit(const Point& rHit, short nTol) const +sal_Bool SdrObjEditView::IsTextEditHit(const Point& rHit, short nTol) const { - BOOL bOk=FALSE; + sal_Bool bOk=sal_False; if(mxTextEditObj.is()) { nTol=ImpGetHitTolLogic(nTol,NULL); @@ -1095,9 +1095,9 @@ BOOL SdrObjEditView::IsTextEditHit(const Point& rHit, short nTol) const return bOk; } -BOOL SdrObjEditView::IsTextEditFrameHit(const Point& rHit) const +sal_Bool SdrObjEditView::IsTextEditFrameHit(const Point& rHit) const { - BOOL bOk=FALSE; + sal_Bool bOk=sal_False; if(mxTextEditObj.is()) { SdrTextObj* pText= dynamic_cast<SdrTextObj*>(mxTextEditObj.get()); @@ -1106,7 +1106,7 @@ BOOL SdrObjEditView::IsTextEditFrameHit(const Point& rHit) const { Window* pWin=pOLV->GetWindow(); if (pText!=NULL && pText->IsTextFrame() && pOLV!=NULL && pWin!=NULL) { - USHORT nPixSiz=pOLV->GetInvalidateMore(); + sal_uInt16 nPixSiz=pOLV->GetInvalidateMore(); Rectangle aEditArea(aMinTextEditArea); aEditArea.Union(pOLV->GetOutputArea()); if (!aEditArea.IsInside(rHit)) { @@ -1143,7 +1143,7 @@ void SdrObjEditView::AddTextEditOfs(MouseEvent& rMEvt) const //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SdrObjEditView::KeyInput(const KeyEvent& rKEvt, Window* pWin) +sal_Bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, Window* pWin) { if(pTextEditOutlinerView) { @@ -1172,16 +1172,16 @@ BOOL SdrObjEditView::KeyInput(const KeyEvent& rKEvt, Window* pWin) if (pItemBrowser!=NULL) pItemBrowser->SetDirty(); #endif ImpMakeTextCursorAreaVisible(); - return TRUE; + return sal_True; } } return SdrGlueEditView::KeyInput(rKEvt,pWin); } -BOOL SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin) +sal_Bool SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin) { if (pTextEditOutlinerView!=NULL) { - BOOL bPostIt=pTextEditOutliner->IsInSelectionMode(); + sal_Bool bPostIt=pTextEditOutliner->IsInSelectionMode(); if (!bPostIt) { Point aPt(rMEvt.GetPosPixel()); if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt); @@ -1203,17 +1203,17 @@ BOOL SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin) if (pItemBrowser!=NULL) pItemBrowser->SetDirty(); #endif ImpMakeTextCursorAreaVisible(); - return TRUE; + return sal_True; } } } return SdrGlueEditView::MouseButtonDown(rMEvt,pWin); } -BOOL SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin) +sal_Bool SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin) { if (pTextEditOutlinerView!=NULL) { - BOOL bPostIt=pTextEditOutliner->IsInSelectionMode(); + sal_Bool bPostIt=pTextEditOutliner->IsInSelectionMode(); if (!bPostIt) { Point aPt(rMEvt.GetPosPixel()); if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt); @@ -1234,18 +1234,18 @@ BOOL SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin) if (pItemBrowser!=NULL) pItemBrowser->SetDirty(); #endif ImpMakeTextCursorAreaVisible(); - return TRUE; + return sal_True; } } } return SdrGlueEditView::MouseButtonUp(rMEvt,pWin); } -BOOL SdrObjEditView::MouseMove(const MouseEvent& rMEvt, Window* pWin) +sal_Bool SdrObjEditView::MouseMove(const MouseEvent& rMEvt, Window* pWin) { if (pTextEditOutlinerView!=NULL) { - BOOL bSelMode=pTextEditOutliner->IsInSelectionMode(); - BOOL bPostIt=bSelMode; + sal_Bool bSelMode=pTextEditOutliner->IsInSelectionMode(); + sal_Bool bPostIt=bSelMode; if (!bPostIt) { Point aPt(rMEvt.GetPosPixel()); if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt); @@ -1266,21 +1266,21 @@ BOOL SdrObjEditView::MouseMove(const MouseEvent& rMEvt, Window* pWin) if (pItemBrowser!=NULL) pItemBrowser->SetDirty(); #endif ImpMakeTextCursorAreaVisible(); - return TRUE; + return sal_True; } } } return SdrGlueEditView::MouseMove(rMEvt,pWin); } -BOOL SdrObjEditView::Command(const CommandEvent& rCEvt, Window* pWin) +sal_Bool SdrObjEditView::Command(const CommandEvent& rCEvt, Window* pWin) { - // solange bis die OutlinerView einen BOOL zurueckliefert + // solange bis die OutlinerView einen sal_Bool zurueckliefert // bekommt sie nur COMMAND_STARTDRAG if (pTextEditOutlinerView!=NULL) { if (rCEvt.GetCommand()==COMMAND_STARTDRAG) { - BOOL bPostIt=pTextEditOutliner->IsInSelectionMode() || !rCEvt.IsMouseEvent(); + sal_Bool bPostIt=pTextEditOutliner->IsInSelectionMode() || !rCEvt.IsMouseEvent(); if (!bPostIt && rCEvt.IsMouseEvent()) { Point aPt(rCEvt.GetMousePosPixel()); if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt); @@ -1304,19 +1304,19 @@ BOOL SdrObjEditView::Command(const CommandEvent& rCEvt, Window* pWin) if (pItemBrowser!=NULL) pItemBrowser->SetDirty(); #endif ImpMakeTextCursorAreaVisible(); - return TRUE; + return sal_True; } } else // if (rCEvt.GetCommand() == COMMAND_VOICE ) { pTextEditOutlinerView->Command(rCEvt); - return TRUE; + return sal_True; } } return SdrGlueEditView::Command(rCEvt,pWin); } -BOOL SdrObjEditView::Cut(ULONG nFormat) +sal_Bool SdrObjEditView::Cut(sal_uIntPtr nFormat) { if (pTextEditOutliner!=NULL) { pTextEditOutlinerView->Cut(); @@ -1324,23 +1324,23 @@ BOOL SdrObjEditView::Cut(ULONG nFormat) if (pItemBrowser!=NULL) pItemBrowser->SetDirty(); #endif ImpMakeTextCursorAreaVisible(); - return TRUE; + return sal_True; } else { return SdrGlueEditView::Cut(nFormat); } } -BOOL SdrObjEditView::Yank(ULONG nFormat) +sal_Bool SdrObjEditView::Yank(sal_uIntPtr nFormat) { if (pTextEditOutliner!=NULL) { pTextEditOutlinerView->Copy(); - return TRUE; + return sal_True; } else { return SdrGlueEditView::Yank(nFormat); } } -BOOL SdrObjEditView::Paste(Window* pWin, ULONG nFormat) +sal_Bool SdrObjEditView::Paste(Window* pWin, sal_uIntPtr nFormat) { if (pTextEditOutliner!=NULL) { if (pWin!=NULL) { @@ -1355,7 +1355,7 @@ BOOL SdrObjEditView::Paste(Window* pWin, ULONG nFormat) if (pItemBrowser!=NULL) pItemBrowser->SetDirty(); #endif ImpMakeTextCursorAreaVisible(); - return TRUE; + return sal_True; } else { return SdrGlueEditView::Paste(pWin,nFormat); } @@ -1363,9 +1363,9 @@ BOOL SdrObjEditView::Paste(Window* pWin, ULONG nFormat) //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SdrObjEditView::ImpIsTextEditAllSelected() const +sal_Bool SdrObjEditView::ImpIsTextEditAllSelected() const { - BOOL bRet=FALSE; + sal_Bool bRet=sal_False; if (pTextEditOutliner!=NULL && pTextEditOutlinerView!=NULL) { if(SdrTextObj::HasTextImpl( pTextEditOutliner ) ) @@ -1374,25 +1374,25 @@ BOOL SdrObjEditView::ImpIsTextEditAllSelected() const Paragraph* pLastPara=pTextEditOutliner->GetParagraph( nParaAnz > 1 ? nParaAnz - 1 : 0 ); ESelection aESel(pTextEditOutlinerView->GetSelection()); - if (aESel.nStartPara==0 && aESel.nStartPos==0 && aESel.nEndPara==USHORT(nParaAnz-1)) + if (aESel.nStartPara==0 && aESel.nStartPos==0 && aESel.nEndPara==sal_uInt16(nParaAnz-1)) { XubString aStr(pTextEditOutliner->GetText(pLastPara)); if(aStr.Len() == aESel.nEndPos) - bRet = TRUE; + bRet = sal_True; } // und nun auch noch fuer den Fall, das rueckwaerts selektiert wurde - if (!bRet && aESel.nEndPara==0 && aESel.nEndPos==0 && aESel.nStartPara==USHORT(nParaAnz-1)) + if (!bRet && aESel.nEndPara==0 && aESel.nEndPos==0 && aESel.nStartPara==sal_uInt16(nParaAnz-1)) { XubString aStr(pTextEditOutliner->GetText(pLastPara)); if(aStr.Len() == aESel.nStartPos) - bRet = TRUE; + bRet = sal_True; } } else { - bRet=TRUE; + bRet=sal_True; } } return bRet; @@ -1411,9 +1411,9 @@ void SdrObjEditView::ImpMakeTextCursorAreaVisible() } } -USHORT SdrObjEditView::GetScriptType() const +sal_uInt16 SdrObjEditView::GetScriptType() const { - USHORT nScriptType = 0; + sal_uInt16 nScriptType = 0; if( IsTextEdit() ) { @@ -1445,11 +1445,11 @@ USHORT SdrObjEditView::GetScriptType() const } /* new interface src537 */ -BOOL SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) const +sal_Bool SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const { if( mxSelectionController.is() ) if( mxSelectionController->GetAttributes( rTargetSet, bOnlyHardAttr ) ) - return TRUE; + return sal_True; if(IsTextEdit()) { @@ -1469,8 +1469,8 @@ BOOL SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) c if(pTextEditOutlinerView) { // FALSE= InvalidItems nicht al Default, sondern als "Loecher" betrachten - rTargetSet.Put(pTextEditOutlinerView->GetAttribs(), FALSE); - rTargetSet.Put( SvxScriptTypeItem( pTextEditOutlinerView->GetSelectedScriptType() ), FALSE ); + rTargetSet.Put(pTextEditOutlinerView->GetAttribs(), sal_False); + rTargetSet.Put( SvxScriptTypeItem( pTextEditOutlinerView->GetSelectedScriptType() ), sal_False ); } if(GetMarkedObjectCount()==1 && GetMarkedObjectByIndex(0)==mxTextEditObj.get()) @@ -1478,7 +1478,7 @@ BOOL SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) c MergeNotPersistAttrFromMarked(rTargetSet, bOnlyHardAttr); } - return TRUE; + return sal_True; } else { @@ -1486,11 +1486,11 @@ BOOL SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) c } } -BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll) +sal_Bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll) { - BOOL bRet=FALSE; - BOOL bTextEdit=pTextEditOutlinerView!=NULL && mxTextEditObj.is(); - BOOL bAllTextSelected=ImpIsTextEditAllSelected(); + sal_Bool bRet=sal_False; + sal_Bool bTextEdit=pTextEditOutlinerView!=NULL && mxTextEditObj.is(); + sal_Bool bAllTextSelected=ImpIsTextEditAllSelected(); SfxItemSet* pModifiedSet=NULL; const SfxItemSet* pSet=&rSet; //const SvxAdjustItem* pParaJust=NULL; @@ -1510,16 +1510,16 @@ BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll) { #ifdef DBG_UTIL { - BOOL bHasEEFeatureItems=FALSE; + sal_Bool bHasEEFeatureItems=sal_False; SfxItemIter aIter(rSet); const SfxPoolItem* pItem=aIter.FirstItem(); while (!bHasEEFeatureItems && pItem!=NULL) { if (!IsInvalidItem(pItem)) { - USHORT nW=pItem->Which(); + sal_uInt16 nW=pItem->Which(); if (nW>=EE_FEATURE_START && nW<=EE_FEATURE_END) - bHasEEFeatureItems=TRUE; + bHasEEFeatureItems=sal_True; } pItem=aIter.NextItem(); @@ -1534,8 +1534,8 @@ BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll) } #endif - BOOL bOnlyEEItems; - BOOL bNoEEItems=!SearchOutlinerItems(*pSet,bReplaceAll,&bOnlyEEItems); + sal_Bool bOnlyEEItems; + sal_Bool bNoEEItems=!SearchOutlinerItems(*pSet,bReplaceAll,&bOnlyEEItems); // alles selektiert? -> Attrs auch an den Rahmen // und falls keine EEItems, dann Attrs nur an den Rahmen if (bAllTextSelected || bNoEEItems) @@ -1569,7 +1569,7 @@ BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll) mxTextEditObj->SetMergedItemSetAndBroadcast(*pSet, bReplaceAll); FlushComeBackTimer(); // Damit ModeHasChanged sofort kommt - bRet=TRUE; + bRet=sal_True; } } else if (!bOnlyEEItems) @@ -1577,15 +1577,15 @@ BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll) // sonst Set ggf. splitten // Es wird nun ein ItemSet aSet gemacht, in den die EE_Items von // *pSet nicht enhalten ist (ansonsten ist es eine Kopie). - USHORT* pNewWhichTable=RemoveWhichRange(pSet->GetRanges(),EE_ITEMS_START,EE_ITEMS_END); + sal_uInt16* pNewWhichTable=RemoveWhichRange(pSet->GetRanges(),EE_ITEMS_START,EE_ITEMS_END); SfxItemSet aSet(pMod->GetItemPool(),pNewWhichTable); /*90353*/ delete[] pNewWhichTable; SfxWhichIter aIter(aSet); - USHORT nWhich=aIter.FirstWhich(); + sal_uInt16 nWhich=aIter.FirstWhich(); while (nWhich!=0) { const SfxPoolItem* pItem; - SfxItemState eState=pSet->GetItemState(nWhich,FALSE,&pItem); + SfxItemState eState=pSet->GetItemState(nWhich,sal_False,&pItem); if (eState==SFX_ITEM_SET) aSet.Put(*pItem); nWhich=aIter.NextWhich(); } @@ -1614,14 +1614,14 @@ BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll) } } FlushComeBackTimer(); - bRet=TRUE; + bRet=sal_True; } if(!bNoEEItems) { // und nun die Attribute auch noch an die EditEngine if (bReplaceAll) { // Am Outliner kann man leider nur alle Attribute platthauen - pTextEditOutlinerView->RemoveAttribs( TRUE ); + pTextEditOutlinerView->RemoveAttribs( sal_True ); } pTextEditOutlinerView->SetAttribs(rSet); @@ -1632,7 +1632,7 @@ BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll) ImpMakeTextCursorAreaVisible(); } - bRet=TRUE; + bRet=sal_True; } if (pModifiedSet!=NULL) delete pModifiedSet; @@ -1660,12 +1660,12 @@ SfxStyleSheet* SdrObjEditView::GetStyleSheet() const return pSheet; } -BOOL SdrObjEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr) +sal_Bool SdrObjEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr) { if( mxSelectionController.is() ) { if( mxSelectionController->SetStyleSheet( pStyleSheet, bDontRemoveHardAttr ) ) - return TRUE; + return sal_True; } // if we are currently in edit mode we must also set the stylesheet @@ -1675,8 +1675,8 @@ BOOL SdrObjEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveH { Outliner* pOutliner = pTextEditOutlinerView->GetOutliner(); - const ULONG nParaCount = pOutliner->GetParagraphCount(); - ULONG nPara; + const sal_uIntPtr nParaCount = pOutliner->GetParagraphCount(); + sal_uIntPtr nPara; for( nPara = 0; nPara < nParaCount; nPara++ ) { pOutliner->SetStyleSheet( nPara, pStyleSheet ); @@ -1694,7 +1694,7 @@ void SdrObjEditView::AddWindowToPaintView(OutputDevice* pNewWin) if(mxTextEditObj.is() && !bTextEditOnlyOneView && pNewWin->GetOutDevType()==OUTDEV_WINDOW) { - OutlinerView* pOutlView=ImpMakeOutlinerView((Window*)pNewWin,FALSE,NULL); + OutlinerView* pOutlView=ImpMakeOutlinerView((Window*)pNewWin,sal_False,NULL); pTextEditOutliner->InsertView(pOutlView); } } @@ -1705,7 +1705,7 @@ void SdrObjEditView::DeleteWindowFromPaintView(OutputDevice* pOldWin) if(mxTextEditObj.is() && !bTextEditOnlyOneView && pOldWin->GetOutDevType()==OUTDEV_WINDOW) { - for (ULONG i=pTextEditOutliner->GetViewCount(); i>0;) { + for (sal_uIntPtr i=pTextEditOutliner->GetViewCount(); i>0;) { i--; OutlinerView* pOLV=pTextEditOutliner->GetView(i); if (pOLV && pOLV->GetWindow()==(Window*)pOldWin) { @@ -1715,7 +1715,7 @@ void SdrObjEditView::DeleteWindowFromPaintView(OutputDevice* pOldWin) } } -BOOL SdrObjEditView::IsTextEditInSelectionMode() const +sal_Bool SdrObjEditView::IsTextEditInSelectionMode() const { return pTextEditOutliner!=NULL && pTextEditOutliner->IsInSelectionMode(); } @@ -1732,17 +1732,17 @@ BOOL SdrObjEditView::IsTextEditInSelectionMode() const // //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SdrObjEditView::BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, Window* pWin) +sal_Bool SdrObjEditView::BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, Window* pWin) { - BOOL bRet=FALSE; + sal_Bool bRet=sal_False; BrkMacroObj(); if (pObj!=NULL && pPV!=NULL && pWin!=NULL && pObj->HasMacro()) { nTol=ImpGetHitTolLogic(nTol,NULL); pMacroObj=pObj; pMacroPV=pPV; pMacroWin=pWin; - bMacroDown=FALSE; - nMacroTol=USHORT(nTol); + bMacroDown=sal_False; + nMacroTol=sal_uInt16(nTol); aMacroDownPos=rPnt; MovMacroObj(rPnt); } @@ -1761,7 +1761,7 @@ void SdrObjEditView::ImpMacroUp(const Point& rUpPos) aHitRec.pPageView=pMacroPV; aHitRec.pOut=pMacroWin; pMacroObj->PaintMacro(*pMacroWin,Rectangle(),aHitRec); - bMacroDown=FALSE; + bMacroDown=sal_False; } } @@ -1775,10 +1775,10 @@ void SdrObjEditView::ImpMacroDown(const Point& rDownPos) aHitRec.nTol=nMacroTol; aHitRec.pVisiLayer=&pMacroPV->GetVisibleLayers(); aHitRec.pPageView=pMacroPV; - aHitRec.bDown=TRUE; + aHitRec.bDown=sal_True; aHitRec.pOut=pMacroWin; pMacroObj->PaintMacro(*pMacroWin,Rectangle(),aHitRec); - bMacroDown=TRUE; + bMacroDown=sal_True; } } @@ -1793,7 +1793,7 @@ void SdrObjEditView::MovMacroObj(const Point& rPnt) aHitRec.pPageView=pMacroPV; aHitRec.bDown=bMacroDown; aHitRec.pOut=pMacroWin; - BOOL bDown=pMacroObj->IsMacroHit(aHitRec); + sal_Bool bDown=pMacroObj->IsMacroHit(aHitRec); if (bDown) ImpMacroDown(rPnt); else ImpMacroUp(rPnt); } @@ -1809,7 +1809,7 @@ void SdrObjEditView::BrkMacroObj() } } -BOOL SdrObjEditView::EndMacroObj() +sal_Bool SdrObjEditView::EndMacroObj() { if (pMacroObj!=NULL && bMacroDown) { ImpMacroUp(aMacroDownPos); @@ -1819,7 +1819,7 @@ BOOL SdrObjEditView::EndMacroObj() aHitRec.nTol=nMacroTol; aHitRec.pVisiLayer=&pMacroPV->GetVisibleLayers(); aHitRec.pPageView=pMacroPV; - aHitRec.bDown=TRUE; + aHitRec.bDown=sal_True; aHitRec.pOut=pMacroWin; bool bRet=pMacroObj->DoMacro(aHitRec); pMacroObj=NULL; @@ -1828,7 +1828,7 @@ BOOL SdrObjEditView::EndMacroObj() return bRet; } else { BrkMacroObj(); - return FALSE; + return sal_False; } } @@ -1921,7 +1921,7 @@ void SdrObjEditView::OnEndPasteOrDrop( PasteOrDropInfos* ) // applications can derive from these virtual methods to do something before a drop or paste operation } -bool SdrObjEditView::SupportsFormatPaintbrush( UINT32 nObjectInventor, UINT16 nObjectIdentifier ) const +bool SdrObjEditView::SupportsFormatPaintbrush( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ) const { if( nObjectInventor != SdrInventor && nObjectInventor != E3dInventor ) return false; @@ -1971,9 +1971,9 @@ bool SdrObjEditView::SupportsFormatPaintbrush( UINT32 nObjectInventor, UINT16 nO } } -static const USHORT* GetFormatRangeImpl( bool bTextOnly ) +static const sal_uInt16* GetFormatRangeImpl( bool bTextOnly ) { - static const USHORT gRanges[] = { + static const sal_uInt16 gRanges[] = { SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, SDRATTR_GRAF_FIRST, SDRATTR_GRAF_LAST, SDRATTR_TABLE_FIRST, SDRATTR_TABLE_LAST, @@ -2003,7 +2003,7 @@ bool SdrObjEditView::TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFor } else { - const BOOL bOnlyHardAttr = FALSE; + const sal_Bool bOnlyHardAttr = sal_False; rFormatSet->Put( GetAttrFromMarked(bOnlyHardAttr) ); } return true; @@ -2012,14 +2012,14 @@ bool SdrObjEditView::TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFor return false; } -static SfxItemSet CreatePaintSet( const USHORT *pRanges, SfxItemPool& rPool, const SfxItemSet& rSourceSet, const SfxItemSet& rTargetSet, bool bNoCharacterFormats, bool bNoParagraphFormats ) +static SfxItemSet CreatePaintSet( const sal_uInt16 *pRanges, SfxItemPool& rPool, const SfxItemSet& rSourceSet, const SfxItemSet& rTargetSet, bool bNoCharacterFormats, bool bNoParagraphFormats ) { SfxItemSet aPaintSet( rPool, pRanges ); while( *pRanges ) { - USHORT nWhich = *pRanges++; - const USHORT nLastWhich = *pRanges++; + sal_uInt16 nWhich = *pRanges++; + const sal_uInt16 nLastWhich = *pRanges++; if( bNoCharacterFormats && (nWhich == EE_CHAR_START) ) continue; @@ -2088,7 +2088,7 @@ void SdrObjEditView::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoChar // All formating items (see ranges above) that are unequal in selected shape and // the format paintbrush are hard set on the selected shape. - const USHORT* pRanges = rFormatSet.GetRanges(); + const sal_uInt16* pRanges = rFormatSet.GetRanges(); bool bTextOnly = true; while( *pRanges ) @@ -2104,7 +2104,7 @@ void SdrObjEditView::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoChar if( !bTextOnly ) { SfxItemSet aPaintSet( CreatePaintSet( GetFormatRangeImpl(false), *rShapeSet.GetPool(), rFormatSet, rShapeSet, bNoCharacterFormats, bNoParagraphFormats ) ); - const BOOL bReplaceAll = FALSE; + const sal_Bool bReplaceAll = sal_False; SetAttrToMarked(aPaintSet, bReplaceAll); } @@ -2132,7 +2132,7 @@ void SdrObjEditView::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoChar if( !aSel.HasRange() ) pOLV->SetSelection( rEditEngine.GetWord( aSel, com::sun::star::i18n::WordType::DICTIONARY_WORD ) ); - const BOOL bRemoveParaAttribs = !bNoParagraphFormats; + const sal_Bool bRemoveParaAttribs = !bNoParagraphFormats; pOLV->RemoveAttribsKeepLanguages( bRemoveParaAttribs ); SfxItemSet aSet( pOLV->GetAttribs() ); SfxItemSet aPaintSet( CreatePaintSet(GetFormatRangeImpl(true), *aSet.GetPool(), rFormatSet, aSet, bNoCharacterFormats, bNoParagraphFormats ) ); diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 2e3a4388c7e8..d34a5df97c42 100644..100755 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -32,12 +32,12 @@ #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/embed/EmbedStates.hpp> #include <svx/svdetc.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdmodel.hxx> #include <svx/svdtrans.hxx> -#include "svdglob.hxx" -#include "svdstr.hrc" -#include "svdviter.hxx" +#include "svx/svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdviter.hxx" #include <svx/svdview.hxx> #include <svx/svdoutl.hxx> #include <vcl/bmpacc.hxx> @@ -152,8 +152,8 @@ void OLEObjCache::UnloadOnDemand() { // more objects than configured cache size try to remove objects // of course not the freshly inserted one at nIndex=0 - ULONG nCount2 = Count(); - ULONG nIndex = nCount2-1; + sal_uIntPtr nCount2 = Count(); + sal_uIntPtr nIndex = nCount2-1; while( nIndex && nCount2 > nSize ) { SdrOle2Obj* pUnloadObj = (SdrOle2Obj*) GetObject(nIndex--); @@ -172,7 +172,7 @@ void OLEObjCache::UnloadOnDemand() uno::Reference< frame::XModel > xUnloadModel( xUnloadObj->getComponent(), uno::UNO_QUERY ); if ( xUnloadModel.is() ) { - for ( ULONG nCheckInd = 0; nCheckInd < Count(); nCheckInd++ ) + for ( sal_uIntPtr nCheckInd = 0; nCheckInd < Count(); nCheckInd++ ) { SdrOle2Obj* pCacheObj = (SdrOle2Obj*) GetObject(nCheckInd); if ( pCacheObj && pCacheObj != pUnloadObj ) @@ -196,7 +196,7 @@ void OLEObjCache::UnloadOnDemand() } } -void OLEObjCache::SetSize(ULONG nNewSize) +void OLEObjCache::SetSize(sal_uIntPtr nNewSize) { nSize = nNewSize; } @@ -212,11 +212,11 @@ void OLEObjCache::InsertObj(SdrOle2Obj* pObj) } // get the old position of the object to know whether it is already in container - ULONG nOldPos = GetPos( pObj ); + sal_uIntPtr nOldPos = GetPos( pObj ); // insert object into first position Remove( nOldPos ); - Insert(pObj, (ULONG) 0L); + Insert(pObj, (sal_uIntPtr) 0L); if ( nOldPos == CONTAINER_ENTRY_NOTFOUND ) { @@ -230,9 +230,9 @@ void OLEObjCache::RemoveObj(SdrOle2Obj* pObj) Remove(pObj); } -BOOL OLEObjCache::UnloadObj(SdrOle2Obj* pObj) +sal_Bool OLEObjCache::UnloadObj(SdrOle2Obj* pObj) { - BOOL bUnloaded = FALSE; + sal_Bool bUnloaded = sal_False; if (pObj) { //#i80528# The old mechanism is completely useless, only taking into account if @@ -260,9 +260,9 @@ IMPL_LINK(OLEObjCache, UnloadCheckHdl, AutoTimer*, /*pTim*/) return 0; } -void ContainerSorter::DoSort(ULONG a, ULONG b) const +void ContainerSorter::DoSort(sal_uIntPtr a, sal_uIntPtr b) const { - ULONG nAnz=rCont.Count(); + sal_uIntPtr nAnz=rCont.Count(); if (b>nAnz) b=nAnz; if (b>0) b--; if (a<b) ImpSubSort(a,b); @@ -307,8 +307,8 @@ public: int ImpUShortContainerSorter::Compare(const void* pElem1, const void* pElem2) const { - USHORT n1=USHORT(ULONG(pElem1)); - USHORT n2=USHORT(ULONG(pElem2)); + sal_uInt16 n1=sal_uInt16(sal_uIntPtr(pElem1)); + sal_uInt16 n2=sal_uInt16(sal_uIntPtr(pElem2)); return n1<n2 ? -1 : n1>n2 ? 1 : 0; } @@ -330,10 +330,10 @@ public: // Kein Clipping in die Metafileaufzeichnung GDIMetaFile* pMtf=rOut.GetConnectMetaFile(); if (pMtf!=NULL && (!pMtf->IsRecord() || pMtf->IsPause())) pMtf=NULL; - if (pMtf!=NULL) pMtf->Pause(TRUE); + if (pMtf!=NULL) pMtf->Pause(sal_True); if (bClip) rOut.SetClipRegion(aClip); else rOut.SetClipRegion(); - if (pMtf!=NULL) pMtf->Pause(FALSE); + if (pMtf!=NULL) pMtf->Pause(sal_False); } }; @@ -349,7 +349,7 @@ public: aBckgrdColor( rOut.GetBackground().GetColor() ), aFont (rOut.GetFont()) {} - ImpColorMerk(const OutputDevice& rOut, USHORT nMode) + ImpColorMerk(const OutputDevice& rOut, sal_uInt16 nMode) { if ( (nMode & SDRHDC_SAVEPEN) == SDRHDC_SAVEPEN ) aLineColor = rOut.GetLineColor(); @@ -364,7 +364,7 @@ public: aFont=rOut.GetFont(); } - void Restore(OutputDevice& rOut, USHORT nMode=SDRHDC_SAVEPENANDBRUSHANDFONT) + void Restore(OutputDevice& rOut, sal_uInt16 nMode=SDRHDC_SAVEPENANDBRUSHANDFONT) { if ( (nMode & SDRHDC_SAVEPEN) == SDRHDC_SAVEPEN) rOut.SetLineColor( aLineColor ); @@ -386,7 +386,7 @@ public: const Color& GetLineColor() const { return aLineColor; } }; -ImpSdrHdcMerk::ImpSdrHdcMerk(const OutputDevice& rOut, USHORT nNewMode, bool bAutoMerk): +ImpSdrHdcMerk::ImpSdrHdcMerk(const OutputDevice& rOut, sal_uInt16 nNewMode, bool bAutoMerk): pFarbMerk(NULL), pClipMerk(NULL), pLineColorMerk(NULL), @@ -422,7 +422,7 @@ void ImpSdrHdcMerk::Save(const OutputDevice& rOut) if ((nMode & SDRHDC_SAVECLIPPING) ==SDRHDC_SAVECLIPPING) pClipMerk=new ImpClipMerk(rOut); - USHORT nCol=nMode & SDRHDC_SAVEPENANDBRUSHANDFONT; + sal_uInt16 nCol=nMode & SDRHDC_SAVEPENANDBRUSHANDFONT; if (nCol==SDRHDC_SAVEPEN) pLineColorMerk=new Color( rOut.GetLineColor() ); @@ -432,14 +432,14 @@ void ImpSdrHdcMerk::Save(const OutputDevice& rOut) pFarbMerk=new ImpColorMerk(rOut,nCol); } -void ImpSdrHdcMerk::Restore(OutputDevice& rOut, USHORT nMask) const +void ImpSdrHdcMerk::Restore(OutputDevice& rOut, sal_uInt16 nMask) const { nMask&=nMode; // nur restaurieren, was auch gesichert wurde if ((nMask & SDRHDC_SAVECLIPPING) ==SDRHDC_SAVECLIPPING && pClipMerk!=NULL) pClipMerk->Restore(rOut); - USHORT nCol=nMask & SDRHDC_SAVEPENANDBRUSHANDFONT; + sal_uInt16 nCol=nMask & SDRHDC_SAVEPENANDBRUSHANDFONT; if (nCol==SDRHDC_SAVEPEN) { @@ -565,7 +565,7 @@ bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol) for(sal_uInt32 nX(0L); nX < nWidth; nX += nXStep) { const BitmapColor& rCol2 = (pAccess->HasPalette()) - ? pAccess->GetPaletteColor((BYTE)pAccess->GetPixel(nY, nX)) + ? pAccess->GetPaletteColor((sal_uInt8)pAccess->GetPixel(nY, nX)) : pAccess->GetPixel(nY, nX); nRt += rCol2.GetRed(); @@ -579,7 +579,7 @@ bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol) nGn /= nAnz; nBl /= nAnz; - rCol = Color(UINT8(nRt), UINT8(nGn), UINT8(nBl)); + rCol = Color(sal_uInt8(nRt), sal_uInt8(nGn), sal_uInt8(nBl)); bRetval = true; } @@ -631,7 +631,7 @@ void SdrEngineDefaults::LanguageHasChanged() //////////////////////////////////////////////////////////////////////////////////////////////////// -SdrOutliner* SdrMakeOutliner( USHORT nOutlinerMode, SdrModel* pModel ) +SdrOutliner* SdrMakeOutliner( sal_uInt16 nOutlinerMode, SdrModel* pModel ) { //SdrEngineDefaults& rDefaults = SdrEngineDefaults::GetDefaults(); @@ -697,47 +697,47 @@ String GetResourceString(sal_uInt16 nResID) //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SearchOutlinerItems(const SfxItemSet& rSet, BOOL bInklDefaults, BOOL* pbOnlyEE) +sal_Bool SearchOutlinerItems(const SfxItemSet& rSet, sal_Bool bInklDefaults, sal_Bool* pbOnlyEE) { - BOOL bHas=FALSE; - BOOL bOnly=TRUE; - BOOL bLookOnly=pbOnlyEE!=NULL; + sal_Bool bHas=sal_False; + sal_Bool bOnly=sal_True; + sal_Bool bLookOnly=pbOnlyEE!=NULL; SfxWhichIter aIter(rSet); - USHORT nWhich=aIter.FirstWhich(); + sal_uInt16 nWhich=aIter.FirstWhich(); while (((bLookOnly && bOnly) || !bHas) && nWhich!=0) { // bei bInklDefaults ist der gesamte Which-Range // ausschlaggebend, ansonsten nur die gesetzten Items // Disabled und DontCare wird als Loch im Which-Range betrachtet SfxItemState eState=rSet.GetItemState(nWhich); if ((eState==SFX_ITEM_DEFAULT && bInklDefaults) || eState==SFX_ITEM_SET) { - if (nWhich<EE_ITEMS_START || nWhich>EE_ITEMS_END) bOnly=FALSE; - else bHas=TRUE; + if (nWhich<EE_ITEMS_START || nWhich>EE_ITEMS_END) bOnly=sal_False; + else bHas=sal_True; } nWhich=aIter.NextWhich(); } - if (!bHas) bOnly=FALSE; + if (!bHas) bOnly=sal_False; if (pbOnlyEE!=NULL) *pbOnlyEE=bOnly; return bHas; } -USHORT* RemoveWhichRange(const USHORT* pOldWhichTable, USHORT nRangeBeg, USHORT nRangeEnd) +sal_uInt16* RemoveWhichRange(const sal_uInt16* pOldWhichTable, sal_uInt16 nRangeBeg, sal_uInt16 nRangeEnd) { // insgesamt sind 6 Faelle moeglich (je Range): // [Beg..End] zu entfernender Range // [b..e] [b..e] [b..e] Fall 1,3,2: egal, ganz weg, egal + Ranges // [b........e] [b........e] Fall 4,5 : Bereich verkleinern | in // [b......................e] Fall 6 : Splitting + pOldWhichTable - USHORT nAnz=0; + sal_uInt16 nAnz=0; while (pOldWhichTable[nAnz]!=0) nAnz++; nAnz++; // nAnz muesste nun in jedem Fall eine ungerade Zahl sein (0 am Ende des Arrays) DBG_ASSERT((nAnz&1)==1,"Joe: RemoveWhichRange: WhichTable hat keine ungerade Anzahl von Eintraegen"); - USHORT nAlloc=nAnz; + sal_uInt16 nAlloc=nAnz; // benoetigte Groesse des neuen Arrays ermitteln - USHORT nNum=nAnz-1; + sal_uInt16 nNum=nAnz-1; while (nNum!=0) { nNum-=2; - USHORT nBeg=pOldWhichTable[nNum]; - USHORT nEnd=pOldWhichTable[nNum+1]; + sal_uInt16 nBeg=pOldWhichTable[nNum]; + sal_uInt16 nEnd=pOldWhichTable[nNum+1]; if (nEnd<nRangeBeg) /*nCase=1*/ ; else if (nBeg>nRangeEnd) /* nCase=2 */ ; else if (nBeg>=nRangeBeg && nEnd<=nRangeEnd) /* nCase=3 */ nAlloc-=2; @@ -746,15 +746,15 @@ USHORT* RemoveWhichRange(const USHORT* pOldWhichTable, USHORT nRangeBeg, USHORT else /* nCase=6 */ nAlloc+=2; } - USHORT* pNewWhichTable=new USHORT[nAlloc]; - memcpy(pNewWhichTable,pOldWhichTable,nAlloc*sizeof(USHORT)); + sal_uInt16* pNewWhichTable=new sal_uInt16[nAlloc]; + memcpy(pNewWhichTable,pOldWhichTable,nAlloc*sizeof(sal_uInt16)); pNewWhichTable[nAlloc-1]=0; // im Falle 3 fehlt die 0 am Ende // nun die unerwuenschten Ranges entfernen nNum=nAlloc-1; while (nNum!=0) { nNum-=2; - USHORT nBeg=pNewWhichTable[nNum]; - USHORT nEnd=pNewWhichTable[nNum+1]; + sal_uInt16 nBeg=pNewWhichTable[nNum]; + sal_uInt16 nEnd=pNewWhichTable[nNum+1]; unsigned nCase=0; if (nEnd<nRangeBeg) nCase=1; else if (nBeg>nRangeEnd) nCase=2; @@ -764,14 +764,14 @@ USHORT* RemoveWhichRange(const USHORT* pOldWhichTable, USHORT nRangeBeg, USHORT else nCase=6; switch (nCase) { case 3: { - unsigned nTailBytes=(nAnz-(nNum+2))*sizeof(USHORT); + unsigned nTailBytes=(nAnz-(nNum+2))*sizeof(sal_uInt16); memcpy(&pNewWhichTable[nNum],&pNewWhichTable[nNum+2],nTailBytes); nAnz-=2; // Merken: Array hat sich verkleinert } break; case 4: pNewWhichTable[nNum+1]=nRangeBeg-1; break; case 5: pNewWhichTable[nNum]=nRangeEnd+1; break; case 6: { - unsigned nTailBytes=(nAnz-(nNum+2))*sizeof(USHORT); + unsigned nTailBytes=(nAnz-(nNum+2))*sizeof(sal_uInt16); memcpy(&pNewWhichTable[nNum+4],&pNewWhichTable[nNum+2],nTailBytes); nAnz+=2; // Merken: Array hat sich vergroessert pNewWhichTable[nNum+2]=nRangeEnd+1; @@ -803,13 +803,13 @@ SvdProgressInfo::SvdProgressInfo( Link *_pLink ) nCurInsert = 0; } -void SvdProgressInfo::Init( ULONG _nSumActionCount, ULONG _nObjCount ) +void SvdProgressInfo::Init( sal_uIntPtr _nSumActionCount, sal_uIntPtr _nObjCount ) { nSumActionCount = _nSumActionCount; nObjCount = _nObjCount; } -BOOL SvdProgressInfo::ReportActions( ULONG nAnzActions ) +sal_Bool SvdProgressInfo::ReportActions( sal_uIntPtr nAnzActions ) { nSumCurAction += nAnzActions; nCurAction += nAnzActions; @@ -819,7 +819,7 @@ BOOL SvdProgressInfo::ReportActions( ULONG nAnzActions ) return pLink->Call(NULL) == 1L; } -BOOL SvdProgressInfo::ReportInserts( ULONG nAnzInserts ) +sal_Bool SvdProgressInfo::ReportInserts( sal_uIntPtr nAnzInserts ) { nSumCurAction += nAnzInserts; nCurInsert += nAnzInserts; @@ -827,23 +827,23 @@ BOOL SvdProgressInfo::ReportInserts( ULONG nAnzInserts ) return pLink->Call(NULL) == 1L; } -BOOL SvdProgressInfo::ReportRescales( ULONG nAnzRescales ) +sal_Bool SvdProgressInfo::ReportRescales( sal_uIntPtr nAnzRescales ) { nSumCurAction += nAnzRescales; return pLink->Call(NULL) == 1L; } -void SvdProgressInfo::SetActionCount( ULONG _nActionCount ) +void SvdProgressInfo::SetActionCount( sal_uIntPtr _nActionCount ) { nActionCount = _nActionCount; } -void SvdProgressInfo::SetInsertCount( ULONG _nInsertCount ) +void SvdProgressInfo::SetInsertCount( sal_uIntPtr _nInsertCount ) { nInsertCount = _nInsertCount; } -BOOL SvdProgressInfo::SetNextObject() +sal_Bool SvdProgressInfo::SetNextObject() { nActionCount = 0; nCurAction = 0; @@ -879,7 +879,7 @@ namespace bool bRet(false); bool bMaster(rList.GetPage() ? rList.GetPage()->IsMasterPage() : false); - for(ULONG no(rList.GetObjCount()); !bRet && no > 0; ) + for(sal_uIntPtr no(rList.GetObjCount()); !bRet && no > 0; ) { no--; SdrObject* pObj = rList.GetObj(no); @@ -963,17 +963,17 @@ namespace if(!rStyleSettings.GetHighContrastMode()) { // search in page - const USHORT SPOTCOUNT(5); + const sal_uInt16 SPOTCOUNT(5); Point aSpotPos[SPOTCOUNT]; Color aSpotColor[SPOTCOUNT]; - ULONG nHeight( rArea.GetSize().Height() ); - ULONG nWidth( rArea.GetSize().Width() ); - ULONG nWidth14 = nWidth / 4; - ULONG nHeight14 = nHeight / 4; - ULONG nWidth34 = ( 3 * nWidth ) / 4; - ULONG nHeight34 = ( 3 * nHeight ) / 4; - - USHORT i; + sal_uIntPtr nHeight( rArea.GetSize().Height() ); + sal_uIntPtr nWidth( rArea.GetSize().Width() ); + sal_uIntPtr nWidth14 = nWidth / 4; + sal_uIntPtr nHeight14 = nHeight / 4; + sal_uIntPtr nWidth34 = ( 3 * nWidth ) / 4; + sal_uIntPtr nHeight34 = ( 3 * nHeight ) / 4; + + sal_uInt16 i; for ( i = 0; i < SPOTCOUNT; i++ ) { // five spots are used @@ -1028,14 +1028,14 @@ namespace impGetSdrPageFillColor(rPage, aSpotPos[i], rTextEditPV, rTextEditPV.GetVisibleLayers(), aSpotColor[i], false); } - USHORT aMatch[SPOTCOUNT]; + sal_uInt16 aMatch[SPOTCOUNT]; for ( i = 0; i < SPOTCOUNT; i++ ) { // were same spot colors found? aMatch[i] = 0; - for ( USHORT j = 0; j < SPOTCOUNT; j++ ) + for ( sal_uInt16 j = 0; j < SPOTCOUNT; j++ ) { if( j != i ) { @@ -1050,7 +1050,7 @@ namespace // highest weight to center spot aBackground = aSpotColor[0]; - for ( USHORT nMatchCount = SPOTCOUNT - 1; nMatchCount > 1; nMatchCount-- ) + for ( sal_uInt16 nMatchCount = SPOTCOUNT - 1; nMatchCount > 1; nMatchCount-- ) { // which spot color was found most? for ( i = 0; i < SPOTCOUNT; i++ ) diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index caee836e9f2a..fe986ef215fa 100644..100755 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -58,7 +58,7 @@ #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> #include <svx/svdobj.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdotext.hxx> #include <svx/svdorect.hxx> #include <svx/svdocirc.hxx> @@ -83,10 +83,10 @@ ImpSdrGDIMetaFileImport::ImpSdrGDIMetaFileImport(SdrModel& rModel): maLineJoin(basegfx::B2DLINEJOIN_NONE), maDash(XDASH_RECT, 0, 0, 0, 0, 0), fScaleX(0.0),fScaleY(0.0), - bFntDirty(TRUE), - bLastObjWasPolyWithoutLine(FALSE),bNoLine(FALSE),bNoFill(FALSE),bLastObjWasLine(FALSE) + bFntDirty(sal_True), + bLastObjWasPolyWithoutLine(sal_False),bNoLine(sal_False),bNoFill(sal_False),bLastObjWasLine(sal_False) { - aVD.EnableOutput(FALSE); + aVD.EnableOutput(sal_False); // #i111954# init to no fill and no line initially aVD.SetLineColor(); @@ -106,15 +106,15 @@ ImpSdrGDIMetaFileImport::~ImpSdrGDIMetaFileImport() delete pTextAttr; } -ULONG ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf, +sal_uIntPtr ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf, SdrObjList& rOL, - ULONG nInsPos, + sal_uIntPtr nInsPos, SvdProgressInfo *pProgrInfo) { pPage = rOL.GetPage(); GDIMetaFile* pTmpMtf=NULL; GDIMetaFile* pMtf = (GDIMetaFile*) &rMtf; - ULONG nActionAnz=pMtf->GetActionCount(); + sal_uIntPtr nActionAnz=pMtf->GetActionCount(); sal_Bool bError = sal_False; @@ -150,13 +150,13 @@ ULONG ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf, if(65000 < nActionAnz) { nActionAnz = 65000; - bError = TRUE; + bError = sal_True; } if(pProgrInfo) pProgrInfo->SetActionCount(nActionAnz); - ULONG nActionsToReport = 0; + sal_uIntPtr nActionsToReport = 0; for( MetaAction* pAct = pMtf->FirstAction(); pAct; pAct = pMtf->NextAction() ) { @@ -221,7 +221,7 @@ ULONG ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf, // MapMode-Scaling vornehmen MapScaling(); // Objekte in vorgegebenes Rechteck hineinskalieren - ULONG nAnz=aTmpList.GetObjCount(); + sal_uIntPtr nAnz=aTmpList.GetObjCount(); // Beim berechnen der Fortschrittsanzeige wird GetActionCount()*3 benutzt. // Da in aTmpList allerdings weniger eintraege als GetActionCount() @@ -241,7 +241,7 @@ ULONG ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf, // alle in aTmpList zwischengespeicherten Objekte nun in rOL ab der Position nInsPos einfuegen if (nInsPos>rOL.GetObjCount()) nInsPos=rOL.GetObjCount(); SdrInsertReason aReason(SDRREASON_VIEWCALL); - for (ULONG i=0; i<nAnz; i++) + for (sal_uIntPtr i=0; i<nAnz; i++) { SdrObject* pObj=aTmpList.GetObj(i); rOL.NbcInsertObject(pObj,nInsPos,&aReason); @@ -272,7 +272,7 @@ ULONG ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf, void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, bool bForceTextAttr) { - bNoLine = FALSE; bNoFill = FALSE; + bNoLine = sal_False; bNoFill = sal_False; bool bLine = !bForceTextAttr; bool bFill = (pObj==NULL) || (pObj->IsClosedObj() && !bForceTextAttr); bool bText = bForceTextAttr || (pObj!=NULL && pObj->GetOutlinerParaObject()!=NULL); @@ -322,7 +322,7 @@ void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, bool bForceTextAttr } } else - bNoLine = TRUE; + bNoLine = sal_True; if ( bFill ) { @@ -335,7 +335,7 @@ void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, bool bForceTextAttr pFillAttr->Put(XFillStyleItem(XFILL_NONE)); } else - bNoFill = TRUE; + bNoFill = sal_True; if ( bText && bFntDirty ) { @@ -362,7 +362,7 @@ void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, bool bForceTextAttr pTextAttr->Put(SvxContourItem(aFnt.IsOutline(), EE_CHAR_OUTLINE)); pTextAttr->Put(SvxColorItem(aFnt.GetColor(), EE_CHAR_COLOR)); //... svxfont textitem svditext - bFntDirty=FALSE; + bFntDirty=sal_False; } if (pObj!=NULL) { @@ -439,8 +439,8 @@ void ImpSdrGDIMetaFileImport::InsertObj( SdrObject* pObj, sal_Bool bScale ) } else { - bLastObjWasPolyWithoutLine = FALSE; - bLastObjWasLine = FALSE; + bLastObjWasPolyWithoutLine = sal_False; + bLastObjWasLine = sal_False; } } } @@ -773,7 +773,7 @@ void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const XubString& rS if ( aFnt.GetWidth() || ( rAct.GetType() == META_STRETCHTEXT_ACTION ) ) { pText->ClearMergedItem( SDRATTR_TEXT_AUTOGROWWIDTH ); - pText->SetMergedItem( SdrTextAutoGrowHeightItem( FALSE ) ); + pText->SetMergedItem( SdrTextAutoGrowHeightItem( sal_False ) ); // don't let the margins eat the space needed for the text pText->SetMergedItem ( SdrTextUpperDistItem (0)); pText->SetMergedItem ( SdrTextLowerDistItem (0)); @@ -787,7 +787,7 @@ void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const XubString& rS pText->SetModel( pModel ); pText->SetLayer( nLayer ); pText->NbcSetText( rStr ); - SetAttributes( pText, TRUE ); + SetAttributes( pText, sal_True ); pText->SetSnapRect( aTextRect ); if (!aFnt.IsTransparent()) @@ -928,8 +928,8 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaMapModeAction& rAct) { MapScaling(); rAct.Execute(&aVD); - bLastObjWasPolyWithoutLine=FALSE; - bLastObjWasLine=FALSE; + bLastObjWasPolyWithoutLine=sal_False; + bLastObjWasLine=sal_False; } void ImpSdrGDIMetaFileImport::MapScaling() @@ -979,7 +979,7 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaCommentAction& rAct, GDIMetaFile* pM aXGradient.SetGradientStyle((XGradientStyle)rGrad.GetStyle()); aXGradient.SetStartColor(rGrad.GetStartColor()); aXGradient.SetEndColor(rGrad.GetEndColor()); - aXGradient.SetAngle((USHORT)rGrad.GetAngle()); + aXGradient.SetAngle((sal_uInt16)rGrad.GetAngle()); aXGradient.SetBorder(rGrad.GetBorder()); aXGradient.SetXOffset(rGrad.GetOfsX()); aXGradient.SetYOffset(rGrad.GetOfsY()); diff --git a/svx/source/svdraw/svdfmtf.hxx b/svx/source/svdraw/svdfmtf.hxx index 5bfea33ad849..a38a482c9c12 100644..100755 --- a/svx/source/svdraw/svdfmtf.hxx +++ b/svx/source/svdraw/svdfmtf.hxx @@ -58,11 +58,11 @@ public: {} void Clear() { aList.Clear(); } - ULONG GetObjCount() const { return aList.Count(); } - SdrObject* GetObj(ULONG nNum) const { return (SdrObject*)aList.GetObject(nNum); } - SdrObject* operator[](ULONG nNum) const { return (SdrObject*)aList.GetObject(nNum); } - void InsertObject(SdrObject* pObj, ULONG nPos=CONTAINER_APPEND) { aList.Insert(pObj,nPos); } - void RemoveObject(ULONG nPos) { aList.Remove(nPos); } + sal_uLong GetObjCount() const { return aList.Count(); } + SdrObject* GetObj(sal_uLong nNum) const { return (SdrObject*)aList.GetObject(nNum); } + SdrObject* operator[](sal_uLong nNum) const { return (SdrObject*)aList.GetObject(nNum); } + void InsertObject(SdrObject* pObj, sal_uLong nPos=CONTAINER_APPEND) { aList.Insert(pObj,nPos); } + void RemoveObject(sal_uLong nPos) { aList.Remove(nPos); } }; //************************************************************ @@ -75,7 +75,7 @@ protected: SdrObjRefList aTmpList; VirtualDevice aVD; Rectangle aScaleRect; - ULONG nMapScalingOfs; // ab hier nocht nicht mit MapScaling bearbeitet + sal_uLong nMapScalingOfs; // ab hier nocht nicht mit MapScaling bearbeitet SfxItemSet* pLineAttr; SfxItemSet* pFillAttr; SfxItemSet* pTextAttr; @@ -131,12 +131,12 @@ protected: void DoAction(MetaFillColorAction & rAct) { rAct.Execute(&aVD); } void DoAction(MetaTextColorAction & rAct) { rAct.Execute(&aVD); } void DoAction(MetaTextFillColorAction & rAct) { rAct.Execute(&aVD); } - void DoAction(MetaFontAction & rAct) { rAct.Execute(&aVD); bFntDirty=TRUE; } - void DoAction(MetaTextAlignAction & rAct) { rAct.Execute(&aVD); bFntDirty=TRUE; } + void DoAction(MetaFontAction & rAct) { rAct.Execute(&aVD); bFntDirty=sal_True; } + void DoAction(MetaTextAlignAction & rAct) { rAct.Execute(&aVD); bFntDirty=sal_True; } void DoAction(MetaClipRegionAction & rAct) { rAct.Execute(&aVD); } void DoAction(MetaRasterOpAction & rAct) { rAct.Execute(&aVD); } void DoAction(MetaPushAction & rAct) { rAct.Execute(&aVD); } - void DoAction(MetaPopAction & rAct) { rAct.Execute(&aVD); bFntDirty=TRUE; } + void DoAction(MetaPopAction & rAct) { rAct.Execute(&aVD); bFntDirty=sal_True; } void DoAction(MetaMoveClipRegionAction & rAct) { rAct.Execute(&aVD); } void DoAction(MetaISectRectClipRegionAction& rAct) { rAct.Execute(&aVD); } void DoAction(MetaISectRegionClipRegionAction& rAct) { rAct.Execute(&aVD); } @@ -154,7 +154,7 @@ protected: public: ImpSdrGDIMetaFileImport(SdrModel& rModel); ~ImpSdrGDIMetaFileImport(); - ULONG DoImport(const GDIMetaFile& rMtf, SdrObjList& rDestList, ULONG nInsPos=CONTAINER_APPEND, SvdProgressInfo *pProgrInfo = NULL); + sal_uLong DoImport(const GDIMetaFile& rMtf, SdrObjList& rDestList, sal_uLong nInsPos=CONTAINER_APPEND, SvdProgressInfo *pProgrInfo = NULL); void SetLayer(SdrLayerID nLay) { nLayer=nLay; } SdrLayerID GetLayer() const { return nLayer; } void SetScaleRect(const Rectangle& rRect) { aScaleRect=rRect; } diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx index b108cceffed7..11061c0ea02a 100644..100755 --- a/svx/source/svdraw/svdglev.cxx +++ b/svx/source/svdraw/svdglev.cxx @@ -33,8 +33,8 @@ #include <math.h> #include <svx/svdundo.hxx> -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache #include <svx/svdpagv.hxx> #include <svx/svdglue.hxx> #include <svx/svdtrans.hxx> @@ -58,14 +58,14 @@ SdrGlueEditView::~SdrGlueEditView() //////////////////////////////////////////////////////////////////////////////////////////////////// -void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, BOOL bConst, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5) +void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, sal_Bool bConst, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5) { - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nm=0; nm<nMarkAnz; nm++) { + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrUShortCont* pPts=pM->GetMarkedGluePoints(); - ULONG nPtAnz=pPts==NULL ? 0 : pPts->GetCount(); + sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->GetCount(); if (nPtAnz!=0) { SdrGluePointList* pGPL=NULL; if (bConst) { @@ -79,10 +79,10 @@ void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, BOOL bConst, co if(!bConst && IsUndoEnabled() ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj)); - for (ULONG nPtNum=0; nPtNum<nPtAnz; nPtNum++) + for (sal_uIntPtr nPtNum=0; nPtNum<nPtAnz; nPtNum++) { - USHORT nPtId=pPts->GetObject(nPtNum); - USHORT nGlueIdx=pGPL->FindGluePoint(nPtId); + sal_uInt16 nPtId=pPts->GetObject(nPtNum); + sal_uInt16 nGlueIdx=pGPL->FindGluePoint(nPtId); if (nGlueIdx!=SDRGLUEPOINT_NOTFOUND) { SdrGluePoint& rGP=(*pGPL)[nGlueIdx]; @@ -104,38 +104,38 @@ void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, BOOL bConst, co static void ImpGetEscDir(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pnThisEsc, const void* pnRet, const void*, const void*) { - USHORT& nRet=*(USHORT*)pnRet; - BOOL& bFirst=*(BOOL*)pbFirst; + sal_uInt16& nRet=*(sal_uInt16*)pnRet; + sal_Bool& bFirst=*(sal_Bool*)pbFirst; if (nRet!=FUZZY) { - USHORT nEsc=rGP.GetEscDir(); - BOOL bOn=(nEsc & *(USHORT*)pnThisEsc)!=0; - if (bFirst) { nRet=bOn; bFirst=FALSE; } + sal_uInt16 nEsc=rGP.GetEscDir(); + sal_Bool bOn=(nEsc & *(sal_uInt16*)pnThisEsc)!=0; + if (bFirst) { nRet=bOn; bFirst=sal_False; } else if (nRet!=bOn) nRet=FUZZY; } } -TRISTATE SdrGlueEditView::IsMarkedGluePointsEscDir(USHORT nThisEsc) const +TRISTATE SdrGlueEditView::IsMarkedGluePointsEscDir(sal_uInt16 nThisEsc) const { ForceUndirtyMrkPnt(); - BOOL bFirst=TRUE; - USHORT nRet=FALSE; - ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetEscDir,TRUE,&bFirst,&nThisEsc,&nRet); + sal_Bool bFirst=sal_True; + sal_uInt16 nRet=sal_False; + ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetEscDir,sal_True,&bFirst,&nThisEsc,&nRet); return (TRISTATE)nRet; } static void ImpSetEscDir(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pnThisEsc, const void* pbOn, const void*, const void*, const void*) { - USHORT nEsc=rGP.GetEscDir(); - if (*(BOOL*)pbOn) nEsc|=*(USHORT*)pnThisEsc; - else nEsc&=~*(USHORT*)pnThisEsc; + sal_uInt16 nEsc=rGP.GetEscDir(); + if (*(sal_Bool*)pbOn) nEsc|=*(sal_uInt16*)pnThisEsc; + else nEsc&=~*(sal_uInt16*)pnThisEsc; rGP.SetEscDir(nEsc); } -void SdrGlueEditView::SetMarkedGluePointsEscDir(USHORT nThisEsc, BOOL bOn) +void SdrGlueEditView::SetMarkedGluePointsEscDir(sal_uInt16 nThisEsc, sal_Bool bOn) { ForceUndirtyMrkPnt(); BegUndo(ImpGetResStr(STR_EditSetGlueEscDir),GetDescriptionOfMarkedGluePoints()); - ImpDoMarkedGluePoints(ImpSetEscDir,FALSE,&nThisEsc,&bOn); + ImpDoMarkedGluePoints(ImpSetEscDir,sal_False,&nThisEsc,&bOn); EndUndo(); } @@ -143,11 +143,11 @@ void SdrGlueEditView::SetMarkedGluePointsEscDir(USHORT nThisEsc, BOOL bOn) static void ImpGetPercent(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pnRet, const void*, const void*, const void*) { - USHORT& nRet=*(USHORT*)pnRet; - BOOL& bFirst=*(BOOL*)pbFirst; + sal_uInt16& nRet=*(sal_uInt16*)pnRet; + sal_Bool& bFirst=*(sal_Bool*)pbFirst; if (nRet!=FUZZY) { bool bOn=rGP.IsPercent(); - if (bFirst) { nRet=bOn; bFirst=FALSE; } + if (bFirst) { nRet=bOn; bFirst=sal_False; } else if ((nRet!=0)!=bOn) nRet=FUZZY; } } @@ -155,24 +155,24 @@ static void ImpGetPercent(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const vo TRISTATE SdrGlueEditView::IsMarkedGluePointsPercent() const { ForceUndirtyMrkPnt(); - BOOL bFirst=TRUE; - USHORT nRet=TRUE; - ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetPercent,TRUE,&bFirst,&nRet); + sal_Bool bFirst=sal_True; + sal_uInt16 nRet=sal_True; + ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetPercent,sal_True,&bFirst,&nRet); return (TRISTATE)nRet; } static void ImpSetPercent(SdrGluePoint& rGP, const SdrObject* pObj, const void* pbOn, const void*, const void*, const void*, const void*) { Point aPos(rGP.GetAbsolutePos(*pObj)); - rGP.SetPercent(*(BOOL*)pbOn); + rGP.SetPercent(*(sal_Bool*)pbOn); rGP.SetAbsolutePos(aPos,*pObj); } -void SdrGlueEditView::SetMarkedGluePointsPercent(BOOL bOn) +void SdrGlueEditView::SetMarkedGluePointsPercent(sal_Bool bOn) { ForceUndirtyMrkPnt(); BegUndo(ImpGetResStr(STR_EditSetGluePercent),GetDescriptionOfMarkedGluePoints()); - ImpDoMarkedGluePoints(ImpSetPercent,FALSE,&bOn); + ImpDoMarkedGluePoints(ImpSetPercent,sal_False,&bOn); EndUndo(); } @@ -180,61 +180,61 @@ void SdrGlueEditView::SetMarkedGluePointsPercent(BOOL bOn) static void ImpGetAlign(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pbDontCare, const void* pbVert, const void* pnRet, const void*) { - USHORT& nRet=*(USHORT*)pnRet; - BOOL& bFirst=*(BOOL*)pbFirst; - BOOL& bDontCare=*(BOOL*)pbDontCare; - BOOL bVert=*(BOOL*)pbVert; + sal_uInt16& nRet=*(sal_uInt16*)pnRet; + sal_Bool& bFirst=*(sal_Bool*)pbFirst; + sal_Bool& bDontCare=*(sal_Bool*)pbDontCare; + sal_Bool bVert=*(sal_Bool*)pbVert; if (!bDontCare) { - USHORT nAlg=0; + sal_uInt16 nAlg=0; if (bVert) { nAlg=rGP.GetVertAlign(); } else { nAlg=rGP.GetHorzAlign(); } - if (bFirst) { nRet=nAlg; bFirst=FALSE; } + if (bFirst) { nRet=nAlg; bFirst=sal_False; } else if (nRet!=nAlg) { if (bVert) { nRet=SDRVERTALIGN_DONTCARE; } else { nRet=SDRHORZALIGN_DONTCARE; } - bDontCare=TRUE; + bDontCare=sal_True; } } } -USHORT SdrGlueEditView::GetMarkedGluePointsAlign(BOOL bVert) const +sal_uInt16 SdrGlueEditView::GetMarkedGluePointsAlign(sal_Bool bVert) const { ForceUndirtyMrkPnt(); - BOOL bFirst=TRUE; - BOOL bDontCare=FALSE; - USHORT nRet=0; - ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetAlign,TRUE,&bFirst,&bDontCare,&bVert,&nRet); + sal_Bool bFirst=sal_True; + sal_Bool bDontCare=sal_False; + sal_uInt16 nRet=0; + ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetAlign,sal_True,&bFirst,&bDontCare,&bVert,&nRet); return nRet; } static void ImpSetAlign(SdrGluePoint& rGP, const SdrObject* pObj, const void* pbVert, const void* pnAlign, const void*, const void*, const void*) { Point aPos(rGP.GetAbsolutePos(*pObj)); - if (*(BOOL*)pbVert) { // bVert? - rGP.SetVertAlign(*(USHORT*)pnAlign); + if (*(sal_Bool*)pbVert) { // bVert? + rGP.SetVertAlign(*(sal_uInt16*)pnAlign); } else { - rGP.SetHorzAlign(*(USHORT*)pnAlign); + rGP.SetHorzAlign(*(sal_uInt16*)pnAlign); } rGP.SetAbsolutePos(aPos,*pObj); } -void SdrGlueEditView::SetMarkedGluePointsAlign(BOOL bVert, USHORT nAlign) +void SdrGlueEditView::SetMarkedGluePointsAlign(sal_Bool bVert, sal_uInt16 nAlign) { ForceUndirtyMrkPnt(); BegUndo(ImpGetResStr(STR_EditSetGlueAlign),GetDescriptionOfMarkedGluePoints()); - ImpDoMarkedGluePoints(ImpSetAlign,FALSE,&bVert,&nAlign); + ImpDoMarkedGluePoints(ImpSetAlign,sal_False,&bVert,&nAlign); EndUndo(); } //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SdrGlueEditView::IsDeleteMarkedGluePointsPossible() const +sal_Bool SdrGlueEditView::IsDeleteMarkedGluePointsPossible() const { return HasMarkedGluePoints(); } @@ -247,13 +247,13 @@ void SdrGlueEditView::DeleteMarkedGluePoints() if( bUndo ) BegUndo(ImpGetResStr(STR_EditDelete),GetDescriptionOfMarkedGluePoints(),SDRREPFUNC_OBJ_DELETE); - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nm=0; nm<nMarkAnz; nm++) + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrUShortCont* pPts=pM->GetMarkedGluePoints(); - ULONG nPtAnz=pPts==NULL ? 0 : pPts->GetCount(); + sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->GetCount(); if (nPtAnz!=0) { SdrGluePointList* pGPL=pObj->ForceGluePointList(); @@ -262,10 +262,10 @@ void SdrGlueEditView::DeleteMarkedGluePoints() if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj)); - for (ULONG nPtNum=0; nPtNum<nPtAnz; nPtNum++) + for (sal_uIntPtr nPtNum=0; nPtNum<nPtAnz; nPtNum++) { - USHORT nPtId=pPts->GetObject(nPtNum); - USHORT nGlueIdx=pGPL->FindGluePoint(nPtId); + sal_uInt16 nPtId=pPts->GetObject(nPtNum); + sal_uInt16 nGlueIdx=pGPL->FindGluePoint(nPtId); if (nGlueIdx!=SDRGLUEPOINT_NOTFOUND) { pGPL->Delete(nGlueIdx); @@ -292,28 +292,28 @@ void SdrGlueEditView::ImpCopyMarkedGluePoints() if( bUndo ) BegUndo(); - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nm=0; nm<nMarkAnz; nm++) + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); SdrUShortCont* pPts=pM->GetMarkedGluePoints(); SdrGluePointList* pGPL=pObj->ForceGluePointList(); - ULONG nPtAnz=pPts==NULL ? 0 : pPts->GetCount(); + sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->GetCount(); if (nPtAnz!=0 && pGPL!=NULL) { if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj)); - for (ULONG nPtNum=0; nPtNum<nPtAnz; nPtNum++) + for (sal_uIntPtr nPtNum=0; nPtNum<nPtAnz; nPtNum++) { - USHORT nPtId=pPts->GetObject(nPtNum); - USHORT nGlueIdx=pGPL->FindGluePoint(nPtId); + sal_uInt16 nPtId=pPts->GetObject(nPtNum); + sal_uInt16 nGlueIdx=pGPL->FindGluePoint(nPtId); if (nGlueIdx!=SDRGLUEPOINT_NOTFOUND) { SdrGluePoint aNewGP((*pGPL)[nGlueIdx]); // GluePoint klonen - USHORT nNewIdx=pGPL->Insert(aNewGP); // und einfuegen - USHORT nNewId=(*pGPL)[nNewIdx].GetId(); // Id des neuen GluePoints ermitteln + sal_uInt16 nNewIdx=pGPL->Insert(aNewGP); // und einfuegen + sal_uInt16 nNewId=(*pGPL)[nNewIdx].GetId(); // Id des neuen GluePoints ermitteln pPts->Replace(nNewId,nPtNum); // und diesen markieren (anstelle des alten) } } @@ -330,12 +330,12 @@ void SdrGlueEditView::ImpCopyMarkedGluePoints() void SdrGlueEditView::ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5) { - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nm=0; nm<nMarkAnz; nm++) { + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrUShortCont* pPts=pM->GetMarkedGluePoints(); - ULONG nPtAnz=pPts==NULL ? 0 : pPts->GetCount(); + sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->GetCount(); if (nPtAnz!=0) { SdrGluePointList* pGPL=pObj->ForceGluePointList(); if (pGPL!=NULL) @@ -343,9 +343,9 @@ void SdrGlueEditView::ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const vo if( IsUndoEnabled() ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj)); - for (ULONG nPtNum=0; nPtNum<nPtAnz; nPtNum++) { - USHORT nPtId=pPts->GetObject(nPtNum); - USHORT nGlueIdx=pGPL->FindGluePoint(nPtId); + for (sal_uIntPtr nPtNum=0; nPtNum<nPtAnz; nPtNum++) { + sal_uInt16 nPtId=pPts->GetObject(nPtNum); + sal_uInt16 nGlueIdx=pGPL->FindGluePoint(nPtId); if (nGlueIdx!=SDRGLUEPOINT_NOTFOUND) { SdrGluePoint& rGP=(*pGPL)[nGlueIdx]; Point aPos(rGP.GetAbsolutePos(*pObj)); diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx index 849815a83a7d..737542d43fe0 100644..100755 --- a/svx/source/svdraw/svdglue.cxx +++ b/svx/source/svdraw/svdglue.cxx @@ -160,7 +160,7 @@ void SdrGluePoint::SetAlignAngle(long nWink) else if (nWink<33750) nAlign=SDRHORZALIGN_RIGHT |SDRVERTALIGN_BOTTOM; } -long SdrGluePoint::EscDirToAngle(USHORT nEsc) const +long SdrGluePoint::EscDirToAngle(sal_uInt16 nEsc) const { switch (nEsc) { case SDRESC_RIGHT : return 0; @@ -171,7 +171,7 @@ long SdrGluePoint::EscDirToAngle(USHORT nEsc) const return 0; } -USHORT SdrGluePoint::EscAngleToDir(long nWink) const +sal_uInt16 SdrGluePoint::EscAngleToDir(long nWink) const { nWink=NormAngle360(nWink); if (nWink>=31500 || nWink<4500) return SDRESC_RIGHT; @@ -191,8 +191,8 @@ void SdrGluePoint::Rotate(const Point& rRef, long nWink, double sn, double cs, c SetAlignAngle(GetAlignAngle()+nWink); } // Austrittsrichtungen drehen - USHORT nEscDir0=nEscDir; - USHORT nEscDir1=0; + sal_uInt16 nEscDir0=nEscDir; + sal_uInt16 nEscDir1=0; if ((nEscDir0&SDRESC_LEFT )!=0) nEscDir1|=EscAngleToDir(EscDirToAngle(SDRESC_LEFT )+nWink); if ((nEscDir0&SDRESC_TOP )!=0) nEscDir1|=EscAngleToDir(EscDirToAngle(SDRESC_TOP )+nWink); if ((nEscDir0&SDRESC_RIGHT )!=0) nEscDir1|=EscAngleToDir(EscDirToAngle(SDRESC_RIGHT )+nWink); @@ -220,8 +220,8 @@ void SdrGluePoint::Mirror(const Point& rRef1, const Point& rRef2, long nWink, co SetAlignAngle(nAW); } // Austrittsrichtungen spiegeln - USHORT nEscDir0=nEscDir; - USHORT nEscDir1=0; + sal_uInt16 nEscDir0=nEscDir; + sal_uInt16 nEscDir1=0; if ((nEscDir0&SDRESC_LEFT)!=0) { long nEW=EscDirToAngle(SDRESC_LEFT); nEW+=2*(nWink-nEW); @@ -261,7 +261,7 @@ void SdrGluePoint::Draw(OutputDevice& rOut, const SdrObject* pObj) const bool bMapMerk=rOut.IsMapModeEnabled(); Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos()); aPt=rOut.LogicToPixel(aPt); - rOut.EnableMapMode(FALSE); + rOut.EnableMapMode(sal_False); long x=aPt.X(),y=aPt.Y(); // Groesse erstmal fest auf 7 Pixel rOut.SetLineColor( aBackPenColor ); @@ -296,7 +296,7 @@ void SdrGluePoint::Invalidate(Window& rWin, const SdrObject* pObj) const bool bMapMerk=rWin.IsMapModeEnabled(); Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos()); aPt=rWin.LogicToPixel(aPt); - rWin.EnableMapMode(FALSE); + rWin.EnableMapMode(sal_False); long x=aPt.X(),y=aPt.Y(); // Groesse erstmal fest auf 7 Pixel // #111096# @@ -318,8 +318,8 @@ bool SdrGluePoint::IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrO void SdrGluePointList::Clear() { - USHORT nAnz=GetCount(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=GetCount(); + for (sal_uInt16 i=0; i<nAnz; i++) { delete GetObject(i); } aList.Clear(); @@ -328,8 +328,8 @@ void SdrGluePointList::Clear() void SdrGluePointList::operator=(const SdrGluePointList& rSrcList) { if (GetCount()!=0) Clear(); - USHORT nAnz=rSrcList.GetCount(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rSrcList.GetCount(); + for (sal_uInt16 i=0; i<nAnz; i++) { Insert(rSrcList[i]); } } @@ -337,13 +337,13 @@ void SdrGluePointList::operator=(const SdrGluePointList& rSrcList) // Die Id's der Klebepunkte in der Liste sind stets streng monoton steigend! // Ggf. wird dem neuen Klebepunkt eine neue Id zugewiesen (wenn diese bereits // vergeben ist). Die Id 0 ist reserviert. -USHORT SdrGluePointList::Insert(const SdrGluePoint& rGP) +sal_uInt16 SdrGluePointList::Insert(const SdrGluePoint& rGP) { SdrGluePoint* pGP=new SdrGluePoint(rGP); - USHORT nId=pGP->GetId(); - USHORT nAnz=GetCount(); - USHORT nInsPos=nAnz; - USHORT nLastId=nAnz!=0 ? GetObject(nAnz-1)->GetId() : 0; + sal_uInt16 nId=pGP->GetId(); + sal_uInt16 nAnz=GetCount(); + sal_uInt16 nInsPos=nAnz; + sal_uInt16 nLastId=nAnz!=0 ? GetObject(nAnz-1)->GetId() : 0; DBG_ASSERT(nLastId>=nAnz,"SdrGluePointList::Insert(): nLastId<nAnz"); bool bHole = nLastId>nAnz; if (nId<=nLastId) { @@ -351,9 +351,9 @@ USHORT SdrGluePointList::Insert(const SdrGluePoint& rGP) nId=nLastId+1; } else { bool bBrk = false; - for (USHORT nNum=0; nNum<nAnz && !bBrk; nNum++) { + for (sal_uInt16 nNum=0; nNum<nAnz && !bBrk; nNum++) { const SdrGluePoint* pGP2=GetObject(nNum); - USHORT nTmpId=pGP2->GetId(); + sal_uInt16 nTmpId=pGP2->GetId(); if (nTmpId==nId) { nId=nLastId+1; // bereits vorhanden bBrk = true; @@ -372,35 +372,35 @@ USHORT SdrGluePointList::Insert(const SdrGluePoint& rGP) void SdrGluePointList::Invalidate(Window& rWin, const SdrObject* pObj) const { - USHORT nAnz=GetCount(); - for (USHORT nNum=0; nNum<nAnz; nNum++) { + sal_uInt16 nAnz=GetCount(); + for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) { GetObject(nNum)->Invalidate(rWin,pObj); } } -USHORT SdrGluePointList::FindGluePoint(USHORT nId) const +sal_uInt16 SdrGluePointList::FindGluePoint(sal_uInt16 nId) const { // Hier noch einen optimaleren Suchalgorithmus implementieren. // Die Liste sollte stets sortiert sein!!!! - USHORT nAnz=GetCount(); - USHORT nRet=SDRGLUEPOINT_NOTFOUND; - for (USHORT nNum=0; nNum<nAnz && nRet==SDRGLUEPOINT_NOTFOUND; nNum++) { + sal_uInt16 nAnz=GetCount(); + sal_uInt16 nRet=SDRGLUEPOINT_NOTFOUND; + for (sal_uInt16 nNum=0; nNum<nAnz && nRet==SDRGLUEPOINT_NOTFOUND; nNum++) { const SdrGluePoint* pGP=GetObject(nNum); if (pGP->GetId()==nId) nRet=nNum; } return nRet; } -USHORT SdrGluePointList::HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, bool bBack, bool bNext, USHORT nId0) const +sal_uInt16 SdrGluePointList::HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, bool bBack, bool bNext, sal_uInt16 nId0) const { - USHORT nAnz=GetCount(); - USHORT nRet=SDRGLUEPOINT_NOTFOUND; - USHORT nNum=bBack ? 0 : nAnz; + sal_uInt16 nAnz=GetCount(); + sal_uInt16 nRet=SDRGLUEPOINT_NOTFOUND; + sal_uInt16 nNum=bBack ? 0 : nAnz; while ((bBack ? nNum<nAnz : nNum>0) && nRet==SDRGLUEPOINT_NOTFOUND) { if (!bBack) nNum--; const SdrGluePoint* pGP=GetObject(nNum); if (bNext) { - if (pGP->GetId()==nId0) bNext=FALSE; + if (pGP->GetId()==nId0) bNext=sal_False; } else { if (pGP->IsHit(rPnt,rOut,pObj)) nRet=nNum; } @@ -411,16 +411,16 @@ USHORT SdrGluePointList::HitTest(const Point& rPnt, const OutputDevice& rOut, co void SdrGluePointList::SetReallyAbsolute(bool bOn, const SdrObject& rObj) { - USHORT nAnz=GetCount(); - for (USHORT nNum=0; nNum<nAnz; nNum++) { + sal_uInt16 nAnz=GetCount(); + for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) { GetObject(nNum)->SetReallyAbsolute(bOn,rObj); } } void SdrGluePointList::Rotate(const Point& rRef, long nWink, double sn, double cs, const SdrObject* pObj) { - USHORT nAnz=GetCount(); - for (USHORT nNum=0; nNum<nAnz; nNum++) { + sal_uInt16 nAnz=GetCount(); + for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) { GetObject(nNum)->Rotate(rRef,nWink,sn,cs,pObj); } } @@ -434,16 +434,16 @@ void SdrGluePointList::Mirror(const Point& rRef1, const Point& rRef2, const SdrO void SdrGluePointList::Mirror(const Point& rRef1, const Point& rRef2, long nWink, const SdrObject* pObj) { - USHORT nAnz=GetCount(); - for (USHORT nNum=0; nNum<nAnz; nNum++) { + sal_uInt16 nAnz=GetCount(); + for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) { GetObject(nNum)->Mirror(rRef1,rRef2,nWink,pObj); } } void SdrGluePointList::Shear(const Point& rRef, long nWink, double tn, bool bVShear, const SdrObject* pObj) { - USHORT nAnz=GetCount(); - for (USHORT nNum=0; nNum<nAnz; nNum++) { + sal_uInt16 nAnz=GetCount(); + for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) { GetObject(nNum)->Shear(rRef,nWink,tn,bVShear,pObj); } } diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index b06a3dd8db07..837dcb9c4a17 100644..100755 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -42,8 +42,8 @@ #include <vcl/bmpacc.hxx> #include <svx/sxekitm.hxx> -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" #include <svx/svdmodel.hxx> #include "gradtrns.hxx" @@ -63,7 +63,7 @@ #include <svx/sdr/overlay/overlaytriangle.hxx> #include <svx/sdr/overlay/overlayhatchrect.hxx> #include <svx/sdrpagewindow.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <vcl/svapp.hxx> #include <svx/sdr/overlay/overlaypolypolygon.hxx> #include <vcl/lazydelete.hxx> @@ -89,10 +89,10 @@ class SdrHdlBitmapSet BitmapEx& impGetOrCreateTargetBitmap(sal_uInt16 nIndex, const Rectangle& rRectangle); public: - SdrHdlBitmapSet(UINT16 nResId); + SdrHdlBitmapSet(sal_uInt16 nResId); ~SdrHdlBitmapSet(); - const BitmapEx& GetBitmapEx(BitmapMarkerKind eKindOfMarker, UINT16 nInd=0); + const BitmapEx& GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd=0); }; //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -100,7 +100,7 @@ public: #define INDEX_COUNT (6) #define INDIVIDUAL_COUNT (4) -SdrHdlBitmapSet::SdrHdlBitmapSet(UINT16 nResId) +SdrHdlBitmapSet::SdrHdlBitmapSet(sal_uInt16 nResId) : maMarkersBitmap(), // 14 kinds (BitmapMarkerKind) use index [0..5], 4 extra maRealMarkers((KIND_COUNT * INDEX_COUNT) + INDIVIDUAL_COUNT) @@ -133,7 +133,7 @@ BitmapEx& SdrHdlBitmapSet::impGetOrCreateTargetBitmap(sal_uInt16 nIndex, const R } // change getting of bitmap to use the big ressource bitmap -const BitmapEx& SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, UINT16 nInd) +const BitmapEx& SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd) { // fill in size and source position in maMarkersBitmap const sal_uInt16 nYPos(nInd * 11); @@ -298,9 +298,9 @@ SdrHdl::SdrHdl(): nPolyNum(0), nPPntNum(0), nSourceHdlNum(0), - bSelect(FALSE), - b1PixMore(FALSE), - bPlusHdl(FALSE), + bSelect(sal_False), + b1PixMore(sal_False), + bPlusHdl(sal_False), mbMoveOutside(false), mbMouseOver(false) { @@ -317,9 +317,9 @@ SdrHdl::SdrHdl(const Point& rPnt, SdrHdlKind eNewKind): nPolyNum(0), nPPntNum(0), nSourceHdlNum(0), - bSelect(FALSE), - b1PixMore(FALSE), - bPlusHdl(FALSE), + bSelect(sal_False), + b1PixMore(sal_False), + bPlusHdl(sal_False), mbMoveOutside(false), mbMouseOver(false) { @@ -330,7 +330,7 @@ SdrHdl::~SdrHdl() GetRidOfIAObject(); } -void SdrHdl::Set1PixMore(BOOL bJa) +void SdrHdl::Set1PixMore(sal_Bool bJa) { if(b1PixMore != bJa) { @@ -375,7 +375,7 @@ void SdrHdl::SetPos(const Point& rPnt) } } -void SdrHdl::SetSelected(BOOL bJa) +void SdrHdl::SetSelected(sal_Bool bJa) { if(bSelect != bJa) { @@ -435,7 +435,7 @@ void SdrHdl::CreateB2dIAObject() BitmapColorIndex eColIndex = LightGreen; BitmapMarkerKind eKindOfMarker = Rect_7x7; - BOOL bRot = pHdlList->IsRotateShear(); + sal_Bool bRot = pHdlList->IsRotateShear(); if(pObj) eColIndex = (bSelect) ? Cyan : LightCyan; if(bRot) @@ -723,17 +723,17 @@ BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd { // #101688# AnchorTR for SW, take top right as (0,0) pRetval = new ::sdr::overlay::OverlayAnimatedBitmapEx(rPos, aBmpEx1, aBmpEx2, nBlinkTime, - (UINT16)(aBmpEx1.GetSizePixel().Width() - 1), 0, - (UINT16)(aBmpEx2.GetSizePixel().Width() - 1), 0); + (sal_uInt16)(aBmpEx1.GetSizePixel().Width() - 1), 0, + (sal_uInt16)(aBmpEx2.GetSizePixel().Width() - 1), 0); } else { // create centered handle as default pRetval = new ::sdr::overlay::OverlayAnimatedBitmapEx(rPos, aBmpEx1, aBmpEx2, nBlinkTime, - (UINT16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1, - (UINT16)(aBmpEx1.GetSizePixel().Height() - 1) >> 1, - (UINT16)(aBmpEx2.GetSizePixel().Width() - 1) >> 1, - (UINT16)(aBmpEx2.GetSizePixel().Height() - 1) >> 1); + (sal_uInt16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1, + (sal_uInt16)(aBmpEx1.GetSizePixel().Height() - 1) >> 1, + (sal_uInt16)(aBmpEx2.GetSizePixel().Width() - 1) >> 1, + (sal_uInt16)(aBmpEx2.GetSizePixel().Height() - 1) >> 1); } } else @@ -751,7 +751,7 @@ BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd { // #101688# AnchorTR for SW, take top right as (0,0) pRetval = new ::sdr::overlay::OverlayBitmapEx(rPos, aBmpEx, - (UINT16)(aBmpEx.GetSizePixel().Width() - 1), 0); + (sal_uInt16)(aBmpEx.GetSizePixel().Width() - 1), 0); } else { @@ -794,9 +794,9 @@ bool SdrHdl::IsHdlHit(const Point& rPnt) const Pointer SdrHdl::GetPointer() const { PointerStyle ePtr=POINTER_MOVE; - const BOOL bSize=eKind>=HDL_UPLFT && eKind<=HDL_LWRGT; - const BOOL bRot=pHdlList!=NULL && pHdlList->IsRotateShear(); - const BOOL bDis=pHdlList!=NULL && pHdlList->IsDistortShear(); + const sal_Bool bSize=eKind>=HDL_UPLFT && eKind<=HDL_LWRGT; + const sal_Bool bRot=pHdlList!=NULL && pHdlList->IsRotateShear(); + const sal_Bool bDis=pHdlList!=NULL && pHdlList->IsDistortShear(); if (bSize && pHdlList!=NULL && (bRot || bDis)) { switch (eKind) { case HDL_UPLFT: case HDL_UPRGT: @@ -826,7 +826,7 @@ Pointer SdrHdl::GetPointer() const while (nHdlWink<0) nHdlWink+=36000; while (nHdlWink>=36000) nHdlWink-=36000; nHdlWink/=4500; - switch ((BYTE)nHdlWink) { + switch ((sal_uInt8)nHdlWink) { case 0: ePtr=POINTER_ESIZE; break; case 1: ePtr=POINTER_NESIZE; break; case 2: ePtr=POINTER_NSIZE; break; @@ -862,7 +862,7 @@ Pointer SdrHdl::GetPointer() const } // #97016# II -BOOL SdrHdl::IsFocusHdl() const +sal_Bool SdrHdl::IsFocusHdl() const { switch(eKind) { @@ -877,9 +877,9 @@ BOOL SdrHdl::IsFocusHdl() const { // if it's a activated TextEdit, it's moved to extended points if(pHdlList && pHdlList->IsMoveOutside()) - return FALSE; + return sal_False; else - return TRUE; + return sal_True; } case HDL_MOVE: // Handle zum Verschieben des Objekts @@ -906,12 +906,12 @@ BOOL SdrHdl::IsFocusHdl() const case HDL_USER: { - return TRUE; + return sal_True; } default: { - return FALSE; + return sal_False; } } } @@ -932,7 +932,7 @@ bool SdrHdl::isMouseOver() const //////////////////////////////////////////////////////////////////////////////////////////////////// // class SdrHdlColor -SdrHdlColor::SdrHdlColor(const Point& rRef, Color aCol, const Size& rSize, BOOL bLum) +SdrHdlColor::SdrHdlColor(const Point& rRef, Color aCol, const Size& rSize, sal_Bool bLum) : SdrHdl(rRef, HDL_COLR), aMarkerSize(rSize), bUseLuminance(bLum) @@ -978,8 +978,8 @@ void SdrHdlColor::CreateB2dIAObject() ::sdr::overlay::OverlayBitmapEx( aPosition, BitmapEx(aBmpCol), - (UINT16)(aBmpCol.GetSizePixel().Width() - 1) >> 1, - (UINT16)(aBmpCol.GetSizePixel().Height() - 1) >> 1 + (sal_uInt16)(aBmpCol.GetSizePixel().Width() - 1) >> 1, + (sal_uInt16)(aBmpCol.GetSizePixel().Height() - 1) >> 1 ); DBG_ASSERT(pNewOverlayObject, "Got NO new IAO!"); @@ -1010,8 +1010,8 @@ Bitmap SdrHdlColor::CreateColorDropper(Color aCol) if(pWrite) { // draw outer border - INT32 nWidth = aMarkerSize.Width(); - INT32 nHeight = aMarkerSize.Height(); + sal_Int32 nWidth = aMarkerSize.Width(); + sal_Int32 nHeight = aMarkerSize.Height(); pWrite->SetLineColor(Color(COL_LIGHTGRAY)); pWrite->DrawLine(Point(0, 0), Point(0, nHeight - 1)); @@ -1047,7 +1047,7 @@ Bitmap SdrHdlColor::CreateColorDropper(Color aCol) Color SdrHdlColor::GetLuminance(const Color& rCol) { - UINT8 aLum = rCol.GetLuminance(); + sal_uInt8 aLum = rCol.GetLuminance(); Color aRetval(aLum, aLum, aLum); return aRetval; } @@ -1057,7 +1057,7 @@ void SdrHdlColor::CallColorChangeLink() aColorChangeHdl.Call(this); } -void SdrHdlColor::SetColor(Color aNew, BOOL bCallLink) +void SdrHdlColor::SetColor(Color aNew, sal_Bool bCallLink) { if(IsUseLuminance()) aNew = GetLuminance(aNew); @@ -1091,7 +1091,7 @@ void SdrHdlColor::SetSize(const Size& rNew) //////////////////////////////////////////////////////////////////////////////////////////////////// // class SdrHdlGradient -SdrHdlGradient::SdrHdlGradient(const Point& rRef1, const Point& rRef2, BOOL bGrad) +SdrHdlGradient::SdrHdlGradient(const Point& rRef1, const Point& rRef2, sal_Bool bGrad) : SdrHdl(rRef1, bGrad ? HDL_GRAD : HDL_TRNS), pColHdl1(NULL), pColHdl2(NULL), @@ -1146,8 +1146,8 @@ void SdrHdlGradient::CreateB2dIAObject() double fHalfArrowWidth = (0.05 * 0.5) * fVecLen; aVec.normalize(); basegfx::B2DVector aPerpend(-aVec.getY(), aVec.getX()); - INT32 nMidX = (INT32)(aPos.X() + aVec.getX() * fLongPercentArrow); - INT32 nMidY = (INT32)(aPos.Y() + aVec.getY() * fLongPercentArrow); + sal_Int32 nMidX = (sal_Int32)(aPos.X() + aVec.getX() * fLongPercentArrow); + sal_Int32 nMidY = (sal_Int32)(aPos.Y() + aVec.getY() * fLongPercentArrow); Point aMidPoint(nMidX, nMidY); basegfx::B2DPoint aPosition(aPos.X(), aPos.Y()); @@ -1164,10 +1164,10 @@ void SdrHdlGradient::CreateB2dIAObject() maOverlayGroup.append(*pNewOverlayObject); // arrowhead - Point aLeft(aMidPoint.X() + (INT32)(aPerpend.getX() * fHalfArrowWidth), - aMidPoint.Y() + (INT32)(aPerpend.getY() * fHalfArrowWidth)); - Point aRight(aMidPoint.X() - (INT32)(aPerpend.getX() * fHalfArrowWidth), - aMidPoint.Y() - (INT32)(aPerpend.getY() * fHalfArrowWidth)); + Point aLeft(aMidPoint.X() + (sal_Int32)(aPerpend.getX() * fHalfArrowWidth), + aMidPoint.Y() + (sal_Int32)(aPerpend.getY() * fHalfArrowWidth)); + Point aRight(aMidPoint.X() - (sal_Int32)(aPerpend.getX() * fHalfArrowWidth), + aMidPoint.Y() - (sal_Int32)(aPerpend.getY() * fHalfArrowWidth)); basegfx::B2DPoint aPositionLeft(aLeft.X(), aLeft.Y()); basegfx::B2DPoint aPositionRight(aRight.X(), aRight.Y()); @@ -1195,11 +1195,11 @@ void SdrHdlGradient::CreateB2dIAObject() IMPL_LINK(SdrHdlGradient, ColorChangeHdl, SdrHdl*, /*pHdl*/) { if(GetObj()) - FromIAOToItem(GetObj(), TRUE, TRUE); + FromIAOToItem(GetObj(), sal_True, sal_True); return 0; } -void SdrHdlGradient::FromIAOToItem(SdrObject* _pObj, BOOL bSetItemOnObject, BOOL bUndo) +void SdrHdlGradient::FromIAOToItem(SdrObject* _pObj, sal_Bool bSetItemOnObject, sal_Bool bUndo) { // from IAO positions and colors to gradient const SfxItemSet& rSet = _pObj->GetMergedItemSet(); @@ -1536,13 +1536,13 @@ Pointer ImpEdgeHdl::GetPointer() const return Pointer(POINTER_SSIZE); } -BOOL ImpEdgeHdl::IsHorzDrag() const +sal_Bool ImpEdgeHdl::IsHorzDrag() const { SdrEdgeObj* pEdge=PTR_CAST(SdrEdgeObj,pObj); if (pEdge==NULL) - return FALSE; + return sal_False; if (nObjHdlNum<=1) - return FALSE; + return sal_False; SdrEdgeKind eEdgeKind = ((SdrEdgeKindItem&)(pEdge->GetObjectItem(SDRATTR_EDGEKIND))).GetValue(); @@ -1555,11 +1555,11 @@ BOOL ImpEdgeHdl::IsHorzDrag() const { long nWink=nObjHdlNum==2 ? rInfo.nAngle1 : rInfo.nAngle2; if (nWink==0 || nWink==18000) - return TRUE; + return sal_True; else - return FALSE; + return sal_False; } - return FALSE; + return sal_False; } //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -1742,7 +1742,7 @@ int ImpSdrHdlListSorter::Compare(const void* pElem1, const void* pElem2) const { // #48763# if (eKind1==eKind2) return (long)pElem1<(long)pElem2 ? -1 : 1; // Notloesung, um immer die gleiche Sortierung zu haben - return (USHORT)eKind1<(USHORT)eKind2 ? -1 : 1; + return (sal_uInt16)eKind1<(sal_uInt16)eKind2 ? -1 : 1; } else return nNum1<nNum2 ? -1 : 1; @@ -1863,7 +1863,7 @@ void SdrHdlList::TravelFocusHdl(sal_Bool bForward) if(aList.Count()) { // take care of old handle - const ULONG nOldHdlNum(mnFocusIndex); + const sal_uIntPtr nOldHdlNum(mnFocusIndex); SdrHdl* pOld = GetHdl(nOldHdlNum); //SDOsal_Bool bRefresh(sal_False); @@ -1890,7 +1890,7 @@ void SdrHdlList::TravelFocusHdl(sal_Bool bForward) qsort(pHdlAndIndex, aList.Count(), sizeof(ImplHdlAndIndex), ImplSortHdlFunc); // #105678# look for old num in sorted array - ULONG nOldHdl(nOldHdlNum); + sal_uIntPtr nOldHdl(nOldHdlNum); if(nOldHdlNum != CONTAINER_ENTRY_NOTFOUND) { @@ -1905,7 +1905,7 @@ void SdrHdlList::TravelFocusHdl(sal_Bool bForward) } // #105678# build new HdlNum - ULONG nNewHdl(nOldHdl); + sal_uIntPtr nNewHdl(nOldHdl); // #105678# do the focus travel if(bForward) @@ -2004,7 +2004,7 @@ void SdrHdlList::SetFocusHdl(SdrHdl* pNew) if(!pActual || pActual != pNew) { - ULONG nNewHdlNum = GetHdlNum(pNew); + sal_uIntPtr nNewHdlNum = GetHdlNum(pNew); if(nNewHdlNum != CONTAINER_ENTRY_NOTFOUND) { @@ -2053,10 +2053,10 @@ SdrHdlList::SdrHdlList(SdrMarkView* pV) aList(1024,32,32) { nHdlSize = 3; - bRotateShear = FALSE; - bMoveOutside = FALSE; - bDistortShear = FALSE; - bFineHandles = FALSE; + bRotateShear = sal_False; + bMoveOutside = sal_False; + bDistortShear = sal_False; + bFineHandles = sal_False; } SdrHdlList::~SdrHdlList() @@ -2064,7 +2064,7 @@ SdrHdlList::~SdrHdlList() Clear(); } -void SdrHdlList::SetHdlSize(USHORT nSiz) +void SdrHdlList::SetHdlSize(sal_uInt16 nSiz) { if(nHdlSize != nSiz) { @@ -2072,7 +2072,7 @@ void SdrHdlList::SetHdlSize(USHORT nSiz) nHdlSize = nSiz; // propagate change to IAOs - for(UINT32 i=0; i<GetHdlCount(); i++) + for(sal_uInt32 i=0; i<GetHdlCount(); i++) { SdrHdl* pHdl = GetHdl(i); pHdl->Touch(); @@ -2080,7 +2080,7 @@ void SdrHdlList::SetHdlSize(USHORT nSiz) } } -void SdrHdlList::SetMoveOutside(BOOL bOn) +void SdrHdlList::SetMoveOutside(sal_Bool bOn) { if(bMoveOutside != bOn) { @@ -2088,7 +2088,7 @@ void SdrHdlList::SetMoveOutside(BOOL bOn) bMoveOutside = bOn; // propagate change to IAOs - for(UINT32 i=0; i<GetHdlCount(); i++) + for(sal_uInt32 i=0; i<GetHdlCount(); i++) { SdrHdl* pHdl = GetHdl(i); pHdl->Touch(); @@ -2096,17 +2096,17 @@ void SdrHdlList::SetMoveOutside(BOOL bOn) } } -void SdrHdlList::SetRotateShear(BOOL bOn) +void SdrHdlList::SetRotateShear(sal_Bool bOn) { bRotateShear = bOn; } -void SdrHdlList::SetDistortShear(BOOL bOn) +void SdrHdlList::SetDistortShear(sal_Bool bOn) { bDistortShear = bOn; } -void SdrHdlList::SetFineHdl(BOOL bOn) +void SdrHdlList::SetFineHdl(sal_Bool bOn) { if(bFineHandles != bOn) { @@ -2114,7 +2114,7 @@ void SdrHdlList::SetFineHdl(BOOL bOn) bFineHandles = bOn; // propagate change to IAOs - for(UINT32 i=0; i<GetHdlCount(); i++) + for(sal_uInt32 i=0; i<GetHdlCount(); i++) { SdrHdl* pHdl = GetHdl(i); pHdl->Touch(); @@ -2122,7 +2122,7 @@ void SdrHdlList::SetFineHdl(BOOL bOn) } } -SdrHdl* SdrHdlList::RemoveHdl(ULONG nNum) +SdrHdl* SdrHdlList::RemoveHdl(sal_uIntPtr nNum) { SdrHdl* pRetval = (SdrHdl*)aList.Remove(nNum); @@ -2131,15 +2131,15 @@ SdrHdl* SdrHdlList::RemoveHdl(ULONG nNum) void SdrHdlList::Clear() { - for (ULONG i=0; i<GetHdlCount(); i++) + for (sal_uIntPtr i=0; i<GetHdlCount(); i++) { SdrHdl* pHdl=GetHdl(i); delete pHdl; } aList.Clear(); - bRotateShear=FALSE; - bDistortShear=FALSE; + bRotateShear=sal_False; + bDistortShear=sal_False; } void SdrHdlList::Sort() @@ -2171,21 +2171,21 @@ void SdrHdlList::Sort() } } -ULONG SdrHdlList::GetHdlNum(const SdrHdl* pHdl) const +sal_uIntPtr SdrHdlList::GetHdlNum(const SdrHdl* pHdl) const { if (pHdl==NULL) return CONTAINER_ENTRY_NOTFOUND; - ULONG nPos=aList.GetPos(pHdl); + sal_uIntPtr nPos=aList.GetPos(pHdl); return nPos; } -void SdrHdlList::AddHdl(SdrHdl* pHdl, BOOL bAtBegin) +void SdrHdlList::AddHdl(SdrHdl* pHdl, sal_Bool bAtBegin) { if (pHdl!=NULL) { if (bAtBegin) { - aList.Insert(pHdl,ULONG(0)); + aList.Insert(pHdl,sal_uIntPtr(0)); } else { @@ -2195,11 +2195,11 @@ void SdrHdlList::AddHdl(SdrHdl* pHdl, BOOL bAtBegin) } } -SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt, BOOL bBack, BOOL bNext, SdrHdl* pHdl0) const +SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt, sal_Bool bBack, sal_Bool bNext, SdrHdl* pHdl0) const { SdrHdl* pRet=NULL; - ULONG nAnz=GetHdlCount(); - ULONG nNum=bBack ? 0 : nAnz; + sal_uIntPtr nAnz=GetHdlCount(); + sal_uIntPtr nNum=bBack ? 0 : nAnz; while ((bBack ? nNum<nAnz : nNum>0) && pRet==NULL) { if (!bBack) @@ -2208,7 +2208,7 @@ SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt, BOOL bBack, BOOL bNext, SdrH if (bNext) { if (pHdl==pHdl0) - bNext=FALSE; + bNext=sal_False; } else { @@ -2224,7 +2224,7 @@ SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt, BOOL bBack, BOOL bNext, SdrH SdrHdl* SdrHdlList::GetHdl(SdrHdlKind eKind1) const { SdrHdl* pRet=NULL; - for (ULONG i=0; i<GetHdlCount() && pRet==NULL; i++) + for (sal_uIntPtr i=0; i<GetHdlCount() && pRet==NULL; i++) { SdrHdl* pHdl=GetHdl(i); if (pHdl->GetKind()==eKind1) @@ -2347,17 +2347,17 @@ void SdrCropHdl::CreateB2dIAObject() const sal_uInt32 nBlinkTime = sal::static_int_cast<sal_uInt32>(rStyleSettings.GetCursorBlinkTime()); pOverlayObject = new ::sdr::overlay::OverlayAnimatedBitmapEx(aPosition, aBmpEx1, aBmpEx2, nBlinkTime, - (UINT16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1, - (UINT16)(aBmpEx1.GetSizePixel().Height() - 1) >> 1, - (UINT16)(aBmpEx2.GetSizePixel().Width() - 1) >> 1, - (UINT16)(aBmpEx2.GetSizePixel().Height() - 1) >> 1); + (sal_uInt16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1, + (sal_uInt16)(aBmpEx1.GetSizePixel().Height() - 1) >> 1, + (sal_uInt16)(aBmpEx2.GetSizePixel().Width() - 1) >> 1, + (sal_uInt16)(aBmpEx2.GetSizePixel().Height() - 1) >> 1); } else { // create centered handle as default pOverlayObject = new ::sdr::overlay::OverlayBitmapEx(aPosition, aBmpEx1, - (UINT16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1, - (UINT16)(aBmpEx1.GetSizePixel().Height() - 1) >> 1); + (sal_uInt16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1, + (sal_uInt16)(aBmpEx1.GetSizePixel().Height() - 1) >> 1); } // OVERLAYMANAGER diff --git a/svx/source/svdraw/svdhlpln.cxx b/svx/source/svdraw/svdhlpln.cxx index 409720ba0dc6..30d4dd31824b 100644..100755 --- a/svx/source/svdraw/svdhlpln.cxx +++ b/svx/source/svdraw/svdhlpln.cxx @@ -48,7 +48,7 @@ Pointer SdrHelpLine::GetPointer() const } // switch } -bool SdrHelpLine::IsHit(const Point& rPnt, USHORT nTolLog, const OutputDevice& rOut) const +bool SdrHelpLine::IsHit(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const { Size a1Pix(rOut.PixelToLogic(Size(1,1))); bool bXHit=rPnt.X()>=aPos.X()-nTolLog && rPnt.X()<=aPos.X()+nTolLog+a1Pix.Width(); @@ -64,7 +64,7 @@ bool SdrHelpLine::IsHit(const Point& rPnt, USHORT nTolLog, const OutputDevice& r } } break; } // switch - return FALSE; + return sal_False; } Rectangle SdrHelpLine::GetBoundRect(const OutputDevice& rOut) const @@ -106,8 +106,8 @@ bool SdrHelpLine::IsVisibleEqual( const SdrHelpLine& rHelpLine, const OutputDevi void SdrHelpLineList::Clear() { - USHORT nAnz=GetCount(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=GetCount(); + for (sal_uInt16 i=0; i<nAnz; i++) { delete GetObject(i); } aList.Clear(); @@ -116,8 +116,8 @@ void SdrHelpLineList::Clear() void SdrHelpLineList::operator=(const SdrHelpLineList& rSrcList) { Clear(); - USHORT nAnz=rSrcList.GetCount(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rSrcList.GetCount(); + for (sal_uInt16 i=0; i<nAnz; i++) { Insert(rSrcList[i]); } } @@ -125,10 +125,10 @@ void SdrHelpLineList::operator=(const SdrHelpLineList& rSrcList) bool SdrHelpLineList::operator==(const SdrHelpLineList& rSrcList) const { bool bEqual = false; - USHORT nAnz=GetCount(); + sal_uInt16 nAnz=GetCount(); if (nAnz==rSrcList.GetCount()) { bEqual = true; - for (USHORT i=0; i<nAnz && bEqual; i++) { + for (sal_uInt16 i=0; i<nAnz && bEqual; i++) { if (*GetObject(i)!=*rSrcList.GetObject(i)) { bEqual = false; } @@ -137,10 +137,10 @@ bool SdrHelpLineList::operator==(const SdrHelpLineList& rSrcList) const return bEqual; } -USHORT SdrHelpLineList::HitTest(const Point& rPnt, USHORT nTolLog, const OutputDevice& rOut) const +sal_uInt16 SdrHelpLineList::HitTest(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const { - USHORT nAnz=GetCount(); - for (USHORT i=nAnz; i>0;) { + sal_uInt16 nAnz=GetCount(); + for (sal_uInt16 i=nAnz; i>0;) { i--; if (GetObject(i)->IsHit(rPnt,nTolLog,rOut)) return i; } diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index c3bdd67c63da..40ff18e2628b 100644..100755 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -37,7 +37,7 @@ #define _STDLIB_H #endif -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <editeng/flditem.hxx> #include <editeng/editdata.hxx> #include <svx/svdpool.hxx> @@ -67,7 +67,7 @@ #include <svl/rectitem.hxx> #include <svl/rngitem.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -92,18 +92,18 @@ public: XubString aName; XubString aValue; SfxItemState eState; - UINT16 nWhichId; + sal_uInt16 nWhichId; TypeId pType; ItemType eItemType; - INT32 nVal; - INT32 nMin; - INT32 nMax; + sal_Int32 nVal; + sal_Int32 nMin; + sal_Int32 nMax; - BOOL bComment; - BOOL bIsNum; - BOOL bCanNum; + sal_Bool bComment; + sal_Bool bIsNum; + sal_Bool bCanNum; public: ImpItemListRow() @@ -114,14 +114,14 @@ public: nVal(0), nMin(0), nMax(0), - bComment(FALSE), - bIsNum(FALSE), - bCanNum(FALSE) + bComment(sal_False), + bIsNum(sal_False), + bCanNum(sal_False) {} XubString GetItemTypeStr() const; - BOOL operator==(const ImpItemListRow& rEntry) const; - BOOL operator!=(const ImpItemListRow& rEntry) const { return !operator==(rEntry); } + sal_Bool operator==(const ImpItemListRow& rEntry) const; + sal_Bool operator!=(const ImpItemListRow& rEntry) const { return !operator==(rEntry); } }; XubString ImpItemListRow::GetItemTypeStr() const @@ -156,7 +156,7 @@ XubString ImpItemListRow::GetItemTypeStr() const return aStr; } -BOOL ImpItemListRow::operator==(const ImpItemListRow& rEntry) const +sal_Bool ImpItemListRow::operator==(const ImpItemListRow& rEntry) const { return (aName.Equals(rEntry.aName) && aValue.Equals(rEntry.aValue) @@ -196,7 +196,7 @@ void ImpItemEdit::KeyInput(const KeyEvent& rKEvt) { _SdrItemBrowserControl* pBrowseMerk = pBrowse; - UINT16 nKeyCode(rKEvt.GetKeyCode().GetCode() + rKEvt.GetKeyCode().GetModifier()); + sal_uInt16 nKeyCode(rKEvt.GetKeyCode().GetCode() + rKEvt.GetKeyCode().GetModifier()); if(nKeyCode == KEY_RETURN) { @@ -248,13 +248,13 @@ void _SdrItemBrowserControl::ImpCtor() nLastWhich = 0; nLastWhichOben = 0; // not implemented yet nLastWhichUnten = 0; // not implemented yet - bWhichesButNames = FALSE; - bDontHideIneffectiveItems = FALSE; - bDontSortItems = FALSE; - bShowWhichIds = FALSE; - bShowRealValues = FALSE; - bShowWhichIds = TRUE; // not implemented yet - bShowRealValues = TRUE; // not implemented yet + bWhichesButNames = sal_False; + bDontHideIneffectiveItems = sal_False; + bDontSortItems = sal_False; + bShowWhichIds = sal_False; + bShowRealValues = sal_False; + bShowWhichIds = sal_True; // not implemented yet + bShowRealValues = sal_True; // not implemented yet rtl_TextEncoding aTextEncoding = gsl_getSystemTextEncoding(); @@ -295,8 +295,8 @@ void _SdrItemBrowserControl::ImpCtor() void _SdrItemBrowserControl::Clear() { - ULONG nAnz=aList.Count(); - for (ULONG nNum=0; nNum<nAnz; nNum++) { + sal_uIntPtr nAnz=aList.Count(); + for (sal_uIntPtr nNum=0; nNum<nAnz; nNum++) { delete ImpGetEntry(nNum); } aList.Clear(); @@ -308,13 +308,13 @@ long _SdrItemBrowserControl::GetRowCount() const return aList.Count(); } -BOOL _SdrItemBrowserControl::SeekRow(long nRow) +sal_Bool _SdrItemBrowserControl::SeekRow(long nRow) { nAktPaintRow=nRow; - return TRUE; + return sal_True; } -String _SdrItemBrowserControl::GetCellText(long _nRow, USHORT _nColId) const +String _SdrItemBrowserControl::GetCellText(long _nRow, sal_uInt16 _nColId) const { String sRet; if ( _nRow >= 0 && _nRow < (sal_Int32)aList.Count() ) @@ -357,9 +357,9 @@ String _SdrItemBrowserControl::GetCellText(long _nRow, USHORT _nColId) const return sRet; } -void _SdrItemBrowserControl::PaintField(OutputDevice& rDev, const Rectangle& rRect, USHORT nColumnId) const +void _SdrItemBrowserControl::PaintField(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId) const { - if (nAktPaintRow<0 || (ULONG)nAktPaintRow>=aList.Count()) { + if (nAktPaintRow<0 || (sal_uIntPtr)nAktPaintRow>=aList.Count()) { return; } Rectangle aR(rRect); @@ -383,22 +383,22 @@ void _SdrItemBrowserControl::PaintField(OutputDevice& rDev, const Rectangle& rRe } } -ULONG _SdrItemBrowserControl::GetCurrentPos() const +sal_uIntPtr _SdrItemBrowserControl::GetCurrentPos() const { - ULONG nRet=CONTAINER_ENTRY_NOTFOUND; + sal_uIntPtr nRet=CONTAINER_ENTRY_NOTFOUND; if (GetSelectRowCount()==1) { long nPos=((BrowseBox*)this)->FirstSelectedRow(); - if (nPos>=0 && (ULONG)nPos<aList.Count()) { - nRet=(ULONG)nPos; + if (nPos>=0 && (sal_uIntPtr)nPos<aList.Count()) { + nRet=(sal_uIntPtr)nPos; } } return nRet; } -USHORT _SdrItemBrowserControl::GetCurrentWhich() const +sal_uInt16 _SdrItemBrowserControl::GetCurrentWhich() const { - USHORT nRet=0; - ULONG nPos=GetCurrentPos(); + sal_uInt16 nRet=0; + sal_uIntPtr nPos=GetCurrentPos(); if (nPos!=CONTAINER_ENTRY_NOTFOUND) { nRet=ImpGetEntry(nPos)->nWhichId; } @@ -407,7 +407,7 @@ USHORT _SdrItemBrowserControl::GetCurrentWhich() const void _SdrItemBrowserControl::DoubleClick(const BrowserMouseEvent&) { - ULONG nPos=GetCurrentPos(); + sal_uIntPtr nPos=GetCurrentPos(); if (nPos!=CONTAINER_ENTRY_NOTFOUND) { BegChangeEntry(nPos); } @@ -415,9 +415,9 @@ void _SdrItemBrowserControl::DoubleClick(const BrowserMouseEvent&) void _SdrItemBrowserControl::KeyInput(const KeyEvent& rKEvt) { - USHORT nKeyCode=rKEvt.GetKeyCode().GetCode()+rKEvt.GetKeyCode().GetModifier(); + sal_uInt16 nKeyCode=rKEvt.GetKeyCode().GetCode()+rKEvt.GetKeyCode().GetModifier(); bool bAusgewertet = false; - ULONG nPos=GetCurrentPos(); + sal_uIntPtr nPos=GetCurrentPos(); if (nPos!=CONTAINER_ENTRY_NOTFOUND) { if (nKeyCode==KEY_RETURN) { if (BegChangeEntry(nPos)) bAusgewertet = true; @@ -467,7 +467,7 @@ void _SdrItemBrowserControl::Select() void _SdrItemBrowserControl::ImpSaveWhich() { - USHORT nWh=GetCurrentWhich(); + sal_uInt16 nWh=GetCurrentWhich(); if (nWh!=0) { long nPos=GetCurrentPos(); long nTop=GetTopRow(); @@ -485,12 +485,12 @@ void _SdrItemBrowserControl::ImpRestoreWhich() { if (nLastWhich!=0) { bool bFnd = false; - ULONG nAnz=aList.Count(); - ULONG nNum; + sal_uIntPtr nAnz=aList.Count(); + sal_uIntPtr nNum; for (nNum=0; nNum<nAnz && !bFnd; nNum++) { ImpItemListRow* pEntry=ImpGetEntry(nNum); if (!pEntry->bComment) { - USHORT nWh=pEntry->nWhichId; + sal_uInt16 nWh=pEntry->nWhichId; if (nWh==nLastWhich) bFnd = true; } } @@ -505,7 +505,7 @@ void _SdrItemBrowserControl::ImpRestoreWhich() } } -bool _SdrItemBrowserControl::BegChangeEntry(ULONG nPos) +bool _SdrItemBrowserControl::BegChangeEntry(sal_uIntPtr nPos) { BrkChangeEntry(); bool bRet = false; @@ -513,7 +513,7 @@ bool _SdrItemBrowserControl::BegChangeEntry(ULONG nPos) if (pEntry!=NULL && !pEntry->bComment) { SetMode(MYBROWSEMODE & ~BROWSER_KEEPHIGHLIGHT); pEditControl=new ImpItemEdit(&GetDataWindow(),this,0/*|WB_BORDER|WB_3DLOOK*/); - Rectangle aRect(GetFieldRectPixel(nPos,ITEMBROWSER_VALUECOL_ID,FALSE)); + Rectangle aRect(GetFieldRectPixel(nPos,ITEMBROWSER_VALUECOL_ID,sal_False)); aRect.Left()+=2; // Kleiner Offset fuer's Edit, damit's pixelgenau stimmt aRect.Right()--; pEditControl->SetPosSizePixel(aRect.TopLeft(),aRect.GetSize()); @@ -574,7 +574,7 @@ void _SdrItemBrowserControl::BrkChangeEntry() } } -void _SdrItemBrowserControl::ImpSetEntry(const ImpItemListRow& rEntry, ULONG nEntryNum) +void _SdrItemBrowserControl::ImpSetEntry(const ImpItemListRow& rEntry, sal_uIntPtr nEntryNum) { ImpItemListRow* pAktEntry=ImpGetEntry(nEntryNum); if (pAktEntry==NULL) { @@ -601,19 +601,19 @@ void _SdrItemBrowserControl::ImpSetEntry(const ImpItemListRow& rEntry, ULONG nEn } } -bool ImpGetItem(const SfxItemSet& rSet, USHORT nWhich, const SfxPoolItem*& rpItem) +bool ImpGetItem(const SfxItemSet& rSet, sal_uInt16 nWhich, const SfxPoolItem*& rpItem) { - SfxItemState eState=rSet.GetItemState(nWhich,TRUE,&rpItem); + SfxItemState eState=rSet.GetItemState(nWhich,sal_True,&rpItem); if (eState==SFX_ITEM_DEFAULT) { rpItem=&rSet.Get(nWhich); } return (eState==SFX_ITEM_DEFAULT || eState==SFX_ITEM_SET) && rpItem!=NULL; } -bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent) +bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rIndent) { rIndent=0; - if (pSet==NULL) return FALSE; + if (pSet==NULL) return sal_False; const SfxPoolItem* pItem=NULL; bool bRet = false; switch (nWhich) { @@ -630,21 +630,21 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent) rIndent=1; if (ImpGetItem(*pSet,XATTR_LINESTYLE,pItem)) { XLineStyle eLineStyle=((const XLineStyleItem*)pItem)->GetValue(); - if (eLineStyle==XLINE_NONE) return TRUE; - if (eLineStyle!=XLINE_DASH && nWhich==XATTR_LINEDASH) return TRUE; + if (eLineStyle==XLINE_NONE) return sal_True; + if (eLineStyle!=XLINE_DASH && nWhich==XATTR_LINEDASH) return sal_True; } if (nWhich==XATTR_LINESTART || nWhich==XATTR_LINESTARTCENTER) { rIndent=2; if (ImpGetItem(*pSet,XATTR_LINESTARTWIDTH,pItem)) { - INT32 nWdt=((const XLineStartWidthItem*)pItem)->GetValue(); - if (nWdt==0) return TRUE; + sal_Int32 nWdt=((const XLineStartWidthItem*)pItem)->GetValue(); + if (nWdt==0) return sal_True; } } if (nWhich==XATTR_LINEEND || nWhich==XATTR_LINEENDCENTER) { rIndent=2; if (ImpGetItem(*pSet,XATTR_LINEENDWIDTH,pItem)) { - INT32 nWdt=((const XLineEndWidthItem*)pItem)->GetValue(); - if (nWdt==0) return TRUE; + sal_Int32 nWdt=((const XLineEndWidthItem*)pItem)->GetValue(); + if (nWdt==0) return sal_True; } } } break; @@ -658,31 +658,31 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent) rIndent=1; if (ImpGetItem(*pSet,XATTR_FILLSTYLE,pItem)) { XFillStyle eFillStyle=((const XFillStyleItem*)pItem)->GetValue(); - if (eFillStyle==XFILL_NONE) return TRUE; + if (eFillStyle==XFILL_NONE) return sal_True; // Transparenz z.Zt. nur fuer SolidFill - if (eFillStyle!=XFILL_SOLID && (nWhich==XATTR_FILLCOLOR || nWhich==XATTR_FILLTRANSPARENCE)) return TRUE; - if (eFillStyle!=XFILL_GRADIENT && (nWhich==XATTR_FILLGRADIENT || nWhich==XATTR_GRADIENTSTEPCOUNT)) return TRUE; - if (eFillStyle!=XFILL_HATCH && (nWhich==XATTR_FILLHATCH || nWhich==XATTR_FILLBACKGROUND)) return TRUE; + if (eFillStyle!=XFILL_SOLID && (nWhich==XATTR_FILLCOLOR || nWhich==XATTR_FILLTRANSPARENCE)) return sal_True; + if (eFillStyle!=XFILL_GRADIENT && (nWhich==XATTR_FILLGRADIENT || nWhich==XATTR_GRADIENTSTEPCOUNT)) return sal_True; + if (eFillStyle!=XFILL_HATCH && (nWhich==XATTR_FILLHATCH || nWhich==XATTR_FILLBACKGROUND)) return sal_True; } } break; case XATTR_FILLBITMAP : case XATTR_FILLBMP_TILE : - case XATTR_FILLBMP_POS : /* z.Zt. nur wenn TILE=TRUE */ + case XATTR_FILLBMP_POS : /* z.Zt. nur wenn TILE=sal_True */ case XATTR_FILLBMP_SIZEX : /* nur wenn nicht Stretch */ case XATTR_FILLBMP_SIZEY : /* nur wenn nicht Stretch */ - case XATTR_FILLBMP_SIZELOG : /* nur wenn SIZELOG=FALSE zum ruecksetzen auf TRUE (alt) -> doch noch in Gebrauch */ - case XATTR_FILLBMP_TILEOFFSETX : /* nur wenn TILE=TRUE */ - case XATTR_FILLBMP_TILEOFFSETY : /* nur wenn TILE=TRUE */ - case XATTR_FILLBMP_STRETCH : /* nur wenn TILE=FALSE */ - case XATTR_FILLBMP_POSOFFSETX : /* nur wenn TILE=TRUE*/ - case XATTR_FILLBMP_POSOFFSETY : { /* nur wenn TILE=TRUE*/ + case XATTR_FILLBMP_SIZELOG : /* nur wenn SIZELOG=sal_False zum ruecksetzen auf sal_True (alt) -> doch noch in Gebrauch */ + case XATTR_FILLBMP_TILEOFFSETX : /* nur wenn TILE=sal_True */ + case XATTR_FILLBMP_TILEOFFSETY : /* nur wenn TILE=sal_True */ + case XATTR_FILLBMP_STRETCH : /* nur wenn TILE=sal_False */ + case XATTR_FILLBMP_POSOFFSETX : /* nur wenn TILE=sal_True*/ + case XATTR_FILLBMP_POSOFFSETY : { /* nur wenn TILE=sal_True*/ rIndent=1; if (ImpGetItem(*pSet,XATTR_FILLSTYLE,pItem)) { XFillStyle eFillStyle=((const XFillStyleItem*)pItem)->GetValue(); - if (eFillStyle!=XFILL_BITMAP) return TRUE; + if (eFillStyle!=XFILL_BITMAP) return sal_True; } if (nWhich==XATTR_FILLBITMAP || nWhich==XATTR_FILLBMP_TILE) { - return FALSE; // immer anwaehlbar + return sal_False; // immer anwaehlbar } bool bTileTRUE = false; bool bTileFALSE = false; @@ -710,8 +710,8 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent) } // Noch 2 Items speziell fuer Tile die sich jedoch gegenseitig ausschliessen if (nWhich==XATTR_FILLBMP_TILEOFFSETX || nWhich==XATTR_FILLBMP_TILEOFFSETY) { - if (bTileFALSE) return TRUE; - USHORT nX=0,nY=0; + if (bTileFALSE) return sal_True; + sal_uInt16 nX=0,nY=0; bool bX = false,bY = false; if (ImpGetItem(*pSet,XATTR_FILLBMP_TILEOFFSETX,pItem)) { nX=((const XFillBmpTileOffsetXItem*)pItem)->GetValue(); @@ -722,19 +722,19 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent) bY = true; } if (nWhich==XATTR_FILLBMP_TILEOFFSETX) { - if (nX!=0 || !bX) return FALSE; - if (nY!=0) return TRUE; + if (nX!=0 || !bX) return sal_False; + if (nY!=0) return sal_True; } else { - if (nY!=0 || !bY) return FALSE; - if (nX!=0) return TRUE; + if (nY!=0 || !bY) return sal_False; + if (nX!=0) return sal_True; } } // SizeLog nicht anwaehlbar bei Stretch=TRUE - // und sonst auch nur wenn es auf SizeLog=FALSE gesetzt ist. + // und sonst auch nur wenn es auf SizeLog=sal_False gesetzt ist. // -> wohl doch noch in Gebrauch - // (TRUE ist der statische PoolDefault) + // (sal_True ist der statische PoolDefault) if (nWhich==XATTR_FILLBMP_SIZELOG) { - if (bTileFALSE && bStretchTRUE) return TRUE; + if (bTileFALSE && bStretchTRUE) return sal_True; } } break; @@ -753,13 +753,13 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent) rIndent=1; if (ImpGetItem(*pSet,XATTR_FORMTXTSTYLE,pItem)) { XFormTextStyle eStyle=((const XFormTextStyleItem*)pItem)->GetValue(); - if (eStyle==XFT_NONE) return TRUE; + if (eStyle==XFT_NONE) return sal_True; } if ((nWhich>=XATTR_FORMTXTSHDWCOLOR && nWhich<=XATTR_FORMTXTSHDWYVAL) || nWhich>=XATTR_FORMTXTSHDWTRANSP) { rIndent=2; if (ImpGetItem(*pSet,XATTR_FORMTXTSHADOW,pItem)) { XFormTextShadow eShadow=((const XFormTextShadowItem*)pItem)->GetValue(); - if (eShadow==XFTSHADOW_NONE) return TRUE; + if (eShadow==XFTSHADOW_NONE) return sal_True; } } } break; @@ -773,7 +773,7 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent) rIndent=1; if (ImpGetItem(*pSet,SDRATTR_SHADOW,pItem)) { bool bShadow=((const SdrShadowItem*)pItem)->GetValue(); - if (!bShadow) return TRUE; + if (!bShadow) return sal_True; } } break; @@ -781,7 +781,7 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent) rIndent=1; if (ImpGetItem(*pSet,SDRATTR_CAPTIONFIXEDANGLE,pItem)) { bool bFixed=((const SdrCaptionFixedAngleItem*)pItem)->GetValue(); - if (!bFixed) return TRUE; + if (!bFixed) return sal_True; } } break; case SDRATTR_CAPTIONESCREL: @@ -789,15 +789,15 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent) rIndent=1; if (ImpGetItem(*pSet,SDRATTR_CAPTIONESCISREL,pItem)) { bool bRel=((const SdrCaptionEscIsRelItem*)pItem)->GetValue(); - if (bRel && nWhich==SDRATTR_CAPTIONESCABS) return TRUE; - if (!bRel && nWhich==SDRATTR_CAPTIONESCREL) return TRUE; + if (bRel && nWhich==SDRATTR_CAPTIONESCABS) return sal_True; + if (!bRel && nWhich==SDRATTR_CAPTIONESCREL) return sal_True; } } break; case SDRATTR_CAPTIONLINELEN: { rIndent=1; if (ImpGetItem(*pSet,SDRATTR_CAPTIONFITLINELEN,pItem)) { bool bFit=((const SdrCaptionFitLineLenItem*)pItem)->GetValue(); - if (bFit) return TRUE; + if (bFit) return sal_True; } } break; @@ -806,7 +806,7 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent) rIndent=1; if (ImpGetItem(*pSet,SDRATTR_TEXT_AUTOGROWHEIGHT,pItem)) { bool bAutoGrow=((const SdrTextAutoGrowHeightItem*)pItem)->GetValue(); - if (!bAutoGrow) return TRUE; + if (!bAutoGrow) return sal_True; } } break; case SDRATTR_TEXT_MINFRAMEWIDTH: @@ -814,14 +814,14 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent) rIndent=1; if (ImpGetItem(*pSet,SDRATTR_TEXT_AUTOGROWWIDTH,pItem)) { bool bAutoGrow=((const SdrTextAutoGrowWidthItem*)pItem)->GetValue(); - if (!bAutoGrow) return TRUE; + if (!bAutoGrow) return sal_True; } } break; case SDRATTR_TEXT_VERTADJUST: case SDRATTR_TEXT_HORZADJUST: { if (ImpGetItem(*pSet,SDRATTR_TEXT_FITTOSIZE,pItem)) { SdrFitToSizeType eFit=((const SdrTextFitToSizeTypeItem*)pItem)->GetValue(); - if (eFit!=SDRTEXTFIT_NONE) return TRUE; + if (eFit!=SDRTEXTFIT_NONE) return sal_True; } } break; @@ -834,30 +834,30 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent) rIndent=1; if (ImpGetItem(*pSet,SDRATTR_TEXT_ANIKIND,pItem)) { SdrTextAniKind eAniKind=((const SdrTextAniKindItem*)pItem)->GetValue(); - if (eAniKind==SDRTEXTANI_NONE) return TRUE; - if (eAniKind==SDRTEXTANI_BLINK && (nWhich==SDRATTR_TEXT_ANIDIRECTION || nWhich==SDRATTR_TEXT_ANIAMOUNT)) return TRUE; - if (eAniKind==SDRTEXTANI_SLIDE && (nWhich==SDRATTR_TEXT_ANISTARTINSIDE || nWhich==SDRATTR_TEXT_ANISTOPINSIDE)) return TRUE; + if (eAniKind==SDRTEXTANI_NONE) return sal_True; + if (eAniKind==SDRTEXTANI_BLINK && (nWhich==SDRATTR_TEXT_ANIDIRECTION || nWhich==SDRATTR_TEXT_ANIAMOUNT)) return sal_True; + if (eAniKind==SDRTEXTANI_SLIDE && (nWhich==SDRATTR_TEXT_ANISTARTINSIDE || nWhich==SDRATTR_TEXT_ANISTOPINSIDE)) return sal_True; } } break; - case SDRATTR_EDGELINEDELTAANZ: return TRUE; + case SDRATTR_EDGELINEDELTAANZ: return sal_True; case SDRATTR_EDGELINE1DELTA: case SDRATTR_EDGELINE2DELTA: case SDRATTR_EDGELINE3DELTA: { if (ImpGetItem(*pSet,SDRATTR_EDGEKIND,pItem)) { SdrEdgeKind eKind=((const SdrEdgeKindItem*)pItem)->GetValue(); if (eKind==SDREDGE_THREELINES) { - if (nWhich>SDRATTR_EDGELINE2DELTA) return TRUE; - else return FALSE; + if (nWhich>SDRATTR_EDGELINE2DELTA) return sal_True; + else return sal_False; } - if (eKind!=SDREDGE_ORTHOLINES && eKind!=SDREDGE_BEZIER) return TRUE; + if (eKind!=SDREDGE_ORTHOLINES && eKind!=SDREDGE_BEZIER) return sal_True; } if (ImpGetItem(*pSet,SDRATTR_EDGELINEDELTAANZ,pItem)) { - UINT16 nAnz=((const SdrEdgeLineDeltaAnzItem*)pItem)->GetValue(); - if (nAnz==0) return TRUE; - if (nAnz==1 && nWhich>SDRATTR_EDGELINE1DELTA) return TRUE; - if (nAnz==2 && nWhich>SDRATTR_EDGELINE2DELTA) return TRUE; - if (nAnz==3 && nWhich>SDRATTR_EDGELINE3DELTA) return TRUE; + sal_uInt16 nAnz=((const SdrEdgeLineDeltaAnzItem*)pItem)->GetValue(); + if (nAnz==0) return sal_True; + if (nAnz==1 && nWhich>SDRATTR_EDGELINE1DELTA) return sal_True; + if (nAnz==2 && nWhich>SDRATTR_EDGELINE2DELTA) return sal_True; + if (nAnz==3 && nWhich>SDRATTR_EDGELINE3DELTA) return sal_True; } } break; @@ -866,14 +866,14 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent) rIndent=1; if (ImpGetItem(*pSet,SDRATTR_CIRCKIND,pItem)) { SdrCircKind eKind=((const SdrCircKindItem*)pItem)->GetValue(); - if (eKind==SDRCIRC_FULL) return TRUE; + if (eKind==SDRCIRC_FULL) return sal_True; } } break; } // switch return bRet; } -USHORT ImpSortWhich(USHORT nWhich) +sal_uInt16 ImpSortWhich(sal_uInt16 nWhich) { switch (nWhich) { // Line @@ -928,11 +928,11 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem SetMode(MYBROWSEMODE & ~BROWSER_KEEPHIGHLIGHT); if (pSet!=NULL) { rtl_TextEncoding aTextEncoding = gsl_getSystemTextEncoding(); - USHORT nEntryNum=0; + sal_uInt16 nEntryNum=0; SfxWhichIter aIter(*pSet); const SfxItemPool* pPool=pSet->GetPool(); - USHORT nWhich0=0; - USHORT nWhich=aIter.FirstWhich(); + sal_uInt16 nWhich0=0; + sal_uInt16 nWhich=aIter.FirstWhich(); while (nWhich!=0) { // Nun erstmal etwas umsortieren // Geht nur, solange keine InvalidItems, d.h. keine Luecken @@ -946,12 +946,12 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem } if (eState!=SFX_ITEM_DISABLED) { const SfxPoolItem& rItem=pSet->Get(nWhich); - USHORT nIndent=0; + sal_uInt16 nIndent=0; if (!HAS_BASE(SfxVoidItem,&rItem) && !HAS_BASE(SfxSetItem,&rItem) && (!IsItemIneffective(nWhich,pSet,nIndent) || bDontHideIneffectiveItems)) { XubString aCommentStr; INSERTCOMMENT(XATTR_LINE_FIRST,XATTR_LINE_LAST,String("L I N I E", aTextEncoding)); - INSERTCOMMENT(XATTR_FILL_FIRST,XATTR_FILL_LAST,String("F L Ä C H E", aTextEncoding)); + INSERTCOMMENT(XATTR_FILL_FIRST,XATTR_FILL_LAST,String("F L � C H E", aTextEncoding)); INSERTCOMMENT(XATTR_TEXT_FIRST,XATTR_TEXT_LAST,String("F O N T W O R K", aTextEncoding)); INSERTCOMMENT(SDRATTR_SHADOW_FIRST,SDRATTR_SHADOW_LAST,String("S C H A T T E N", aTextEncoding)); INSERTCOMMENT(SDRATTR_CAPTION_FIRST,SDRATTR_CAPTION_LAST,String("L E G E N D E", aTextEncoding)); @@ -1039,7 +1039,7 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem if (aEntry.eItemType==ITEM_BOOL) aEntry.aValue.AppendAscii(aEntry.nVal!=0 ? "True" : "False"); else if (aEntry.bCanNum) aEntry.aValue = UniString::CreateFromInt32(aEntry.nVal); else if (aEntry.eItemType==ITEM_STRING) aEntry.aValue=((SfxStringItem&)rItem).GetValue(); - else if (aEntry.eItemType==ITEM_ENUM && nWhich!=EE_CHAR_WEIGHT) aEntry.aValue=((SfxEnumItemInterface&)rItem).GetValueTextByPos((BOOL)aEntry.nVal); + else if (aEntry.eItemType==ITEM_ENUM && nWhich!=EE_CHAR_WEIGHT) aEntry.aValue=((SfxEnumItemInterface&)rItem).GetValueTextByPos((sal_Bool)aEntry.nVal); else aEntry.aValue = String("GPF", aTextEncoding); } } else { @@ -1053,8 +1053,8 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem } // while if (aList.Count()>nEntryNum) { // evtl. noch zuviele Eintraege - ULONG nTooMuch=aList.Count()-nEntryNum; - for (ULONG nNum=0; nNum<nTooMuch; nNum++) { + sal_uIntPtr nTooMuch=aList.Count()-nEntryNum; + for (sal_uIntPtr nNum=0; nNum<nTooMuch; nNum++) { delete ImpGetEntry(nEntryNum); aList.Remove(nEntryNum); } @@ -1097,7 +1097,7 @@ void _SdrItemBrowserWindow::GetFocus() SdrItemBrowser::SdrItemBrowser(SdrView& rView): _SdrItemBrowserWindow(ImpGetViewWin(rView)), pView(&rView), - bDirty(FALSE) + bDirty(sal_False) { aIdleTimer.SetTimeoutHdl(LINK(this,SdrItemBrowser,IdleHdl)); GetBrowserControl().SetEntryChangedHdl(LINK(this,SdrItemBrowser,ChangedHdl)); @@ -1140,7 +1140,7 @@ void SdrItemBrowser::SetDirty() void SdrItemBrowser::Undirty() { aIdleTimer.Stop(); - bDirty = FALSE; + bDirty = sal_False; // SfxItemSet aSet(pView->GetAttributes()); SfxItemSet aSet(pView->GetModel()->GetItemPool()); @@ -1148,9 +1148,9 @@ void SdrItemBrowser::Undirty() if(pView->AreObjectsMarked()) { - // SfxItemSet a2ndSet(pView->GetAttributes(TRUE)); + // SfxItemSet a2ndSet(pView->GetAttributes(sal_True)); SfxItemSet a2ndSet(pView->GetModel()->GetItemPool()); - pView->GetAttributes(a2ndSet, TRUE); + pView->GetAttributes(a2ndSet, sal_True); SetAttributes(&aSet,&a2ndSet); } @@ -1177,7 +1177,7 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse) SfxItemSet aNewSet(*aSet.GetPool(),pEntry->nWhichId,pEntry->nWhichId); XubString aNewText(pBrowse->GetNewEntryValue()); - BOOL bDel( aNewText.EqualsAscii("del") + sal_Bool bDel( aNewText.EqualsAscii("del") || aNewText.EqualsAscii("Del") || aNewText.EqualsAscii("DEL") || aNewText.EqualsAscii("default") @@ -1194,7 +1194,7 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse) } bool bPairX = true; bool bPairY = false; - USHORT nSepLen=1; + sal_uInt16 nSepLen=1; long nLongX = aNewText.ToInt32(); long nLongY=0; xub_StrLen nPos = aNewText.Search(sal_Unicode('/')); @@ -1205,13 +1205,13 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse) bPairX=nPos>0; XubString s(aNewText); s.Erase(0,nPos+nSepLen); - bPairY = (BOOL)aNewText.Len(); + bPairY = (sal_Bool)aNewText.Len(); nLongY = s.ToInt32(); } switch (pEntry->eItemType) { - case ITEM_BYTE : ((SfxByteItem *)pNewItem)->SetValue((BYTE )nLongVal); break; - case ITEM_INT16 : ((SfxInt16Item *)pNewItem)->SetValue((INT16 )nLongVal); break; - case ITEM_UINT16: ((SfxUInt16Item*)pNewItem)->SetValue((UINT16)nLongVal); break; + case ITEM_BYTE : ((SfxByteItem *)pNewItem)->SetValue((sal_uInt8 )nLongVal); break; + case ITEM_INT16 : ((SfxInt16Item *)pNewItem)->SetValue((sal_Int16 )nLongVal); break; + case ITEM_UINT16: ((SfxUInt16Item*)pNewItem)->SetValue((sal_uInt16)nLongVal); break; case ITEM_INT32: { if(HAS_BASE(SdrAngleItem, pNewItem)) { @@ -1219,10 +1219,10 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse) double nVal = aNewText.ToFloat(); nLongVal = (long)(nVal * 100 + 0.5); } - ((SfxInt32Item *)pNewItem)->SetValue((INT32)nLongVal); + ((SfxInt32Item *)pNewItem)->SetValue((sal_Int32)nLongVal); } break; case ITEM_UINT32: ((SfxUInt32Item*)pNewItem)->SetValue(aNewText.ToInt32()); break; - case ITEM_ENUM : ((SfxEnumItemInterface*)pNewItem)->SetEnumValue((USHORT)nLongVal); break; + case ITEM_ENUM : ((SfxEnumItemInterface*)pNewItem)->SetEnumValue((sal_uInt16)nLongVal); break; case ITEM_BOOL: { aNewText.ToUpperAscii(); if (aNewText.EqualsAscii("TRUE")) nLongVal=1; @@ -1231,15 +1231,15 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse) if (aNewText.EqualsAscii("EIN")) nLongVal=1; if (aNewText.EqualsAscii("ON")) nLongVal=1; if (aNewText.EqualsAscii("YES")) nLongVal=1; - ((SfxBoolItem*)pNewItem)->SetValue((BOOL)nLongVal); + ((SfxBoolItem*)pNewItem)->SetValue((sal_Bool)nLongVal); } break; - case ITEM_FLAG : ((SfxFlagItem *)pNewItem)->SetValue((USHORT)nLongVal); break; + case ITEM_FLAG : ((SfxFlagItem *)pNewItem)->SetValue((sal_uInt16)nLongVal); break; case ITEM_STRING: ((SfxStringItem*)pNewItem)->SetValue(aNewText); break; case ITEM_POINT : ((SfxPointItem*)pNewItem)->SetValue(Point(nLongX,nLongY)); break; case ITEM_RECT : break; case ITEM_RANGE : { - ((SfxRangeItem*)pNewItem)->From()=(USHORT)nLongX; - ((SfxRangeItem*)pNewItem)->From()=(USHORT)nLongY; + ((SfxRangeItem*)pNewItem)->From()=(sal_uInt16)nLongX; + ((SfxRangeItem*)pNewItem)->From()=(sal_uInt16)nLongY; } break; case ITEM_LRANGE : { } break; @@ -1256,19 +1256,19 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse) ((SvxFontItem*)pNewItem)->GetStyleName().Erase(); } break; case ITEM_FONTHEIGHT: { - ULONG nHgt=0; - USHORT nProp=100; + sal_uIntPtr nHgt=0; + sal_uInt16 nProp=100; if (aNewText.Search(sal_Unicode('%'))!=STRING_NOTFOUND) { - nProp=(USHORT)nLongVal; + nProp=(sal_uInt16)nLongVal; } else { nHgt=nLongVal; } ((SvxFontHeightItem*)pNewItem)->SetHeight(nHgt,nProp); } break; case ITEM_FONTWIDTH: { - USHORT nProp=100; + sal_uInt16 nProp=100; if (aNewText.Search(sal_Unicode('%'))!=STRING_NOTFOUND) { - nProp=(USHORT)nLongVal; + nProp=(sal_uInt16)nLongVal; } ((SvxCharScaleWidthItem*)pNewItem)->SetValue(nProp); } break; diff --git a/svx/source/svdraw/svditer.cxx b/svx/source/svdraw/svditer.cxx index 2957bb2d079f..14a7e11adee0 100644..100755 --- a/svx/source/svdraw/svditer.cxx +++ b/svx/source/svdraw/svditer.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdpage.hxx> #include <svx/svdogrp.hxx> #include <svx/svdobj.hxx> @@ -37,16 +37,16 @@ // #99190# #include <svx/scene3d.hxx> -SdrObjListIter::SdrObjListIter(const SdrObjList& rObjList, SdrIterMode eMode, BOOL bReverse) +SdrObjListIter::SdrObjListIter(const SdrObjList& rObjList, SdrIterMode eMode, sal_Bool bReverse) : maObjList(1024, 64, 64), mnIndex(0L), mbReverse(bReverse) { - ImpProcessObjectList(rObjList, eMode, TRUE); + ImpProcessObjectList(rObjList, eMode, sal_True); Reset(); } -SdrObjListIter::SdrObjListIter(const SdrObjList& rObjList, BOOL bUseZOrder, SdrIterMode eMode, BOOL bReverse) +SdrObjListIter::SdrObjListIter(const SdrObjList& rObjList, sal_Bool bUseZOrder, SdrIterMode eMode, sal_Bool bReverse) : maObjList(1024, 64, 64), mnIndex(0L), mbReverse(bReverse) @@ -55,19 +55,19 @@ SdrObjListIter::SdrObjListIter(const SdrObjList& rObjList, BOOL bUseZOrder, SdrI Reset(); } -SdrObjListIter::SdrObjListIter( const SdrObject& rObj, SdrIterMode eMode, BOOL bReverse ) +SdrObjListIter::SdrObjListIter( const SdrObject& rObj, SdrIterMode eMode, sal_Bool bReverse ) : maObjList(1024, 64, 64), mnIndex(0L), mbReverse(bReverse) { if ( rObj.ISA( SdrObjGroup ) ) - ImpProcessObjectList(*rObj.GetSubList(), eMode, TRUE); + ImpProcessObjectList(*rObj.GetSubList(), eMode, sal_True); else maObjList.Insert( (void*)&rObj, LIST_APPEND ); Reset(); } -SdrObjListIter::SdrObjListIter( const SdrMarkList& rMarkList, SdrIterMode eMode, BOOL bReverse ) +SdrObjListIter::SdrObjListIter( const SdrMarkList& rMarkList, SdrIterMode eMode, sal_Bool bReverse ) : maObjList(1024, 64, 64), mnIndex(0L), mbReverse(bReverse) @@ -76,9 +76,9 @@ SdrObjListIter::SdrObjListIter( const SdrMarkList& rMarkList, SdrIterMode eMode, Reset(); } -void SdrObjListIter::ImpProcessObjectList(const SdrObjList& rObjList, SdrIterMode eMode, BOOL bUseZOrder) +void SdrObjListIter::ImpProcessObjectList(const SdrObjList& rObjList, SdrIterMode eMode, sal_Bool bUseZOrder) { - for( ULONG nIdx = 0, nCount = rObjList.GetObjCount(); nIdx < nCount; ++nIdx ) + for( sal_uIntPtr nIdx = 0, nCount = rObjList.GetObjCount(); nIdx < nCount; ++nIdx ) { SdrObject* pObj = bUseZOrder ? rObjList.GetObj( nIdx ) : rObjList.GetObjectForNavigationPosition( nIdx ); @@ -90,12 +90,12 @@ void SdrObjListIter::ImpProcessObjectList(const SdrObjList& rObjList, SdrIterMod void SdrObjListIter::ImpProcessMarkList( const SdrMarkList& rMarkList, SdrIterMode eMode ) { - for( ULONG nIdx = 0, nCount = rMarkList.GetMarkCount(); nIdx < nCount; ++nIdx ) + for( sal_uIntPtr nIdx = 0, nCount = rMarkList.GetMarkCount(); nIdx < nCount; ++nIdx ) if( SdrObject* pObj = rMarkList.GetMark( nIdx )->GetMarkedSdrObj() ) - ImpProcessObj( pObj, eMode, FALSE ); + ImpProcessObj( pObj, eMode, sal_False ); } -void SdrObjListIter::ImpProcessObj(SdrObject* pObj, SdrIterMode eMode, BOOL bUseZOrder) +void SdrObjListIter::ImpProcessObj(SdrObject* pObj, SdrIterMode eMode, sal_Bool bUseZOrder) { bool bIsGroup = pObj->IsGroupObject(); // #99190# 3D objects are no group objects, IsGroupObject() diff --git a/svx/source/svdraw/svditext.hxx b/svx/source/svdraw/svditext.hxx deleted file mode 100644 index 98c9d4dd6600..000000000000 --- a/svx/source/svdraw/svditext.hxx +++ /dev/null @@ -1,39 +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 _SVDITEXT_HXX -#define _SVDITEXT_HXX - -// SvxItem-Mapping. Wird benoetigt um die SvxItem-Header erfolgreich zu includen - -#include <editeng/editdata.hxx> - - -#endif // _SVDITEXT_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx index 28db8a8a4e2e..232c63ab450b 100644..100755 --- a/svx/source/svdraw/svdlayer.cxx +++ b/svx/source/svdraw/svdlayer.cxx @@ -32,8 +32,8 @@ #include <svx/svdlayer.hxx> #include <svx/svdmodel.hxx> // fuer Broadcasting -#include "svdglob.hxx" // StringCache -#include "svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource //////////////////////////////////////////////////////////////////////////////////////////////////// // SetOfByte @@ -158,7 +158,7 @@ void SetOfByte::PutValue( const com::sun::star::uno::Any & rAny ) sal_Int16 nIndex; for( nIndex = 0; nIndex < nCount; nIndex++ ) { - aData[nIndex] = static_cast<BYTE>(aSeq[nIndex]); + aData[nIndex] = static_cast<sal_uInt8>(aSeq[nIndex]); } for( ; nIndex < 32; nIndex++ ) @@ -199,7 +199,7 @@ void SetOfByte::QueryValue( com::sun::star::uno::Any & rAny ) const void SdrLayer::SetStandardLayer(bool bStd) { - nType=(UINT16)bStd; + nType=(sal_uInt16)bStd; if (bStd) { aName=ImpGetResStr(STR_StandardLayerName); } @@ -277,8 +277,8 @@ const SdrLayerAdmin& SdrLayerAdmin::operator=(const SdrLayerAdmin& rSrcLayerAdmi { ClearLayer(); pParent=rSrcLayerAdmin.pParent; - USHORT i; - USHORT nAnz=rSrcLayerAdmin.GetLayerCount(); + sal_uInt16 i; + sal_uInt16 nAnz=rSrcLayerAdmin.GetLayerCount(); for (i=0; i<nAnz; i++) { aLayer.Insert(new SdrLayer(*rSrcLayerAdmin.GetLayer(i)),CONTAINER_APPEND); } @@ -289,10 +289,10 @@ bool SdrLayerAdmin::operator==(const SdrLayerAdmin& rCmpLayerAdmin) const { if (pParent!=rCmpLayerAdmin.pParent || aLayer.Count()!=rCmpLayerAdmin.aLayer.Count() || - aLSets.Count()!=rCmpLayerAdmin.aLSets.Count()) return FALSE; + aLSets.Count()!=rCmpLayerAdmin.aLSets.Count()) return sal_False; bool bOk = true; - USHORT nAnz=GetLayerCount(); - USHORT i=0; + sal_uInt16 nAnz=GetLayerCount(); + sal_uInt16 i=0; while (bOk && i<nAnz) { bOk=*GetLayer(i)==*rCmpLayerAdmin.GetLayer(i); i++; @@ -304,8 +304,8 @@ void SdrLayerAdmin::SetModel(SdrModel* pNewModel) { if (pNewModel!=pModel) { pModel=pNewModel; - USHORT nAnz=GetLayerCount(); - USHORT i; + sal_uInt16 nAnz=GetLayerCount(); + sal_uInt16 i; for (i=0; i<nAnz; i++) { GetLayer(i)->SetModel(pNewModel); } @@ -321,14 +321,14 @@ void SdrLayerAdmin::Broadcast() const } } -SdrLayer* SdrLayerAdmin::RemoveLayer(USHORT nPos) +SdrLayer* SdrLayerAdmin::RemoveLayer(sal_uInt16 nPos) { SdrLayer* pRetLayer=(SdrLayer*)(aLayer.Remove(nPos)); Broadcast(); return pRetLayer; } -SdrLayer* SdrLayerAdmin::NewLayer(const XubString& rName, USHORT nPos) +SdrLayer* SdrLayerAdmin::NewLayer(const XubString& rName, sal_uInt16 nPos) { SdrLayerID nID=GetUniqueLayerID(); SdrLayer* pLay=new SdrLayer(nID,rName); @@ -338,7 +338,7 @@ SdrLayer* SdrLayerAdmin::NewLayer(const XubString& rName, USHORT nPos) return pLay; } -SdrLayer* SdrLayerAdmin::NewStandardLayer(USHORT nPos) +SdrLayer* SdrLayerAdmin::NewStandardLayer(sal_uInt16 nPos) { SdrLayerID nID=GetUniqueLayerID(); SdrLayer* pLay=new SdrLayer(nID,String()); @@ -349,7 +349,7 @@ SdrLayer* SdrLayerAdmin::NewStandardLayer(USHORT nPos) return pLay; } -SdrLayer* SdrLayerAdmin::MoveLayer(USHORT nPos, USHORT nNewPos) +SdrLayer* SdrLayerAdmin::MoveLayer(sal_uInt16 nPos, sal_uInt16 nNewPos) { SdrLayer* pLayer=(SdrLayer*)(aLayer.Remove(nPos)); if (pLayer!=NULL) { @@ -360,9 +360,9 @@ SdrLayer* SdrLayerAdmin::MoveLayer(USHORT nPos, USHORT nNewPos) return pLayer; } -void SdrLayerAdmin::MoveLayer(SdrLayer* pLayer, USHORT nNewPos) +void SdrLayerAdmin::MoveLayer(SdrLayer* pLayer, sal_uInt16 nNewPos) { - ULONG nPos=aLayer.GetPos(pLayer); + sal_uIntPtr nPos=aLayer.GetPos(pLayer); if (nPos!=CONTAINER_ENTRY_NOTFOUND) { aLayer.Remove(nPos); aLayer.Insert(pLayer,nNewPos); @@ -370,21 +370,21 @@ void SdrLayerAdmin::MoveLayer(SdrLayer* pLayer, USHORT nNewPos) } } -USHORT SdrLayerAdmin::GetLayerPos(SdrLayer* pLayer) const +sal_uInt16 SdrLayerAdmin::GetLayerPos(SdrLayer* pLayer) const { - ULONG nRet=SDRLAYER_NOTFOUND; + sal_uIntPtr nRet=SDRLAYER_NOTFOUND; if (pLayer!=NULL) { nRet=aLayer.GetPos(pLayer); if (nRet==CONTAINER_ENTRY_NOTFOUND) { nRet=SDRLAYER_NOTFOUND; } } - return USHORT(nRet); + return sal_uInt16(nRet); } const SdrLayer* SdrLayerAdmin::GetLayer(const XubString& rName, bool /*bInherited*/) const { - UINT16 i(0); + sal_uInt16 i(0); const SdrLayer* pLay = NULL; while(i < GetLayerCount() && !pLay) @@ -397,7 +397,7 @@ const SdrLayer* SdrLayerAdmin::GetLayer(const XubString& rName, bool /*bInherite if(!pLay && pParent) { - pLay = pParent->GetLayer(rName, TRUE); + pLay = pParent->GetLayer(rName, sal_True); } return pLay; @@ -411,9 +411,9 @@ SdrLayerID SdrLayerAdmin::GetLayerID(const XubString& rName, bool bInherited) co return nRet; } -const SdrLayer* SdrLayerAdmin::GetLayerPerID(USHORT nID) const +const SdrLayer* SdrLayerAdmin::GetLayerPerID(sal_uInt16 nID) const { - USHORT i=0; + sal_uInt16 i=0; const SdrLayer* pLay=NULL; while (i<GetLayerCount() && pLay==NULL) { if (nID==GetLayer(i)->GetID()) pLay=GetLayer(i); @@ -430,7 +430,7 @@ SdrLayerID SdrLayerAdmin::GetUniqueLayerID() const { SetOfByte aSet; sal_Bool bDown = (pParent == NULL); - USHORT j; + sal_uInt16 j; for (j=0; j<GetLayerCount(); j++) { aSet.Set(GetLayer((sal_uInt16)j)->GetID()); @@ -439,7 +439,7 @@ SdrLayerID SdrLayerAdmin::GetUniqueLayerID() const if (!bDown) { i=254; - while (i && aSet.IsSet(BYTE(i))) + while (i && aSet.IsSet(sal_uInt8(i))) --i; if (i == 0) i=254; @@ -447,7 +447,7 @@ SdrLayerID SdrLayerAdmin::GetUniqueLayerID() const else { i=0; - while (i<=254 && aSet.IsSet(BYTE(i))) + while (i<=254 && aSet.IsSet(sal_uInt8(i))) i++; if (i>254) i=0; diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx index bd41b2ccbcf6..1aa2a742b0ca 100644..100755 --- a/svx/source/svdraw/svdmark.cxx +++ b/svx/source/svdraw/svdmark.cxx @@ -35,13 +35,13 @@ #include <svx/svdetc.hxx> #include <svx/svdobj.hxx> #include <svx/svdpage.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdpagv.hxx> #include <svx/svdopath.hxx> // zur Abschaltung #include <svx/svdogrp.hxx> // des Cache bei #include <svx/svdorect.hxx> // GetMarkDescription -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache //////////////////////////////////////////////////////////////////////////////////////////////////// #include <svx/obj3d.hxx> @@ -75,7 +75,7 @@ void SdrUShortCont::Sort() const aSort.DoSort(); ((SdrUShortCont*)this)->mbSorted = sal_True; - ULONG nNum(GetCount()); + sal_uLong nNum(GetCount()); if(nNum > 1) { @@ -97,9 +97,9 @@ void SdrUShortCont::Sort() const } } -void SdrUShortCont::CheckSort(ULONG nPos) +void SdrUShortCont::CheckSort(sal_uLong nPos) { - ULONG nAnz(maArray.Count()); + sal_uLong nAnz(maArray.Count()); if(nPos > nAnz) nPos = nAnz; @@ -344,7 +344,7 @@ int ImpSdrMarkListSorter::Compare(const void* pElem1, const void* pElem2) const if (pOL1 == pOL2) { - // AF: Note that I reverted a change from sal_uInt32 to ULONG (made + // AF: Note that I reverted a change from sal_uInt32 to sal_uLong (made // for 64bit compliance, #i78198#) because internally in SdrObject // both nOrdNum and mnNavigationPosition are stored as sal_uInt32. sal_uInt32 nObjOrd1((pObj1) ? pObj1->GetNavigationPosition() : 0); @@ -373,7 +373,7 @@ void SdrMarkList::ImpForceSort() if(!mbSorted) { mbSorted = sal_True; - ULONG nAnz = maList.Count(); + sal_uLong nAnz = maList.Count(); // remove invalid if(nAnz > 0 ) @@ -432,7 +432,7 @@ void SdrMarkList::ImpForceSort() void SdrMarkList::Clear() { - for(ULONG i(0L); i < GetMarkCount(); i++) + for(sal_uLong i(0L); i < GetMarkCount(); i++) { SdrMark* pMark = GetMark(i); delete pMark; @@ -446,7 +446,7 @@ void SdrMarkList::operator=(const SdrMarkList& rLst) { Clear(); - for(ULONG i(0L); i < rLst.GetMarkCount(); i++) + for(sal_uLong i(0L); i < rLst.GetMarkCount(); i++) { SdrMark* pMark = rLst.GetMark(i); SdrMark* pNeuMark = new SdrMark(*pMark); @@ -462,7 +462,7 @@ void SdrMarkList::operator=(const SdrMarkList& rLst) mbSorted = rLst.mbSorted; } -ULONG SdrMarkList::FindObject(const SdrObject* pObj) const +sal_uLong SdrMarkList::FindObject(const SdrObject* pObj) const { // #109658# // @@ -477,7 +477,7 @@ ULONG SdrMarkList::FindObject(const SdrObject* pObj) const // less dangerous to change this method then changing SdrObject::GetOrdNum(). if(pObj && maList.Count()) { - for(ULONG a(0L); a < maList.Count(); a++) + for(sal_uLong a(0L); a < maList.Count(); a++) { if(((SdrMark*)(maList.GetObject(a)))->GetMarkedSdrObj() == pObj) { @@ -492,7 +492,7 @@ ULONG SdrMarkList::FindObject(const SdrObject* pObj) const void SdrMarkList::InsertEntry(const SdrMark& rMark, sal_Bool bChkSort) { SetNameDirty(); - ULONG nAnz(maList.Count()); + sal_uLong nAnz(maList.Count()); if(!bChkSort || !mbSorted || nAnz == 0) { @@ -503,7 +503,7 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark, sal_Bool bChkSort) } else { - SdrMark* pLast = GetMark(ULONG(nAnz - 1)); + SdrMark* pLast = GetMark(sal_uLong(nAnz - 1)); const SdrObject* pLastObj = pLast->GetMarkedSdrObj(); const SdrObject* pNeuObj = rMark.GetMarkedSdrObj(); @@ -528,8 +528,8 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark, sal_Bool bChkSort) if(pLastOL == pNeuOL) { - const ULONG nLastNum(pLastObj!=0L ? pLastObj->GetOrdNum() : 0); - const ULONG nNeuNum(pNeuObj !=0L ? pNeuObj ->GetOrdNum() : 0); + const sal_uLong nLastNum(pLastObj!=0L ? pLastObj->GetOrdNum() : 0); + const sal_uLong nNeuNum(pNeuObj !=0L ? pNeuObj ->GetOrdNum() : 0); if(nNeuNum < nLastNum) { @@ -548,7 +548,7 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark, sal_Bool bChkSort) return; } -void SdrMarkList::DeleteMark(ULONG nNum) +void SdrMarkList::DeleteMark(sal_uLong nNum) { SdrMark* pMark = GetMark(nNum); DBG_ASSERT(pMark!=0L,"DeleteMark: MarkEntry nicht gefunden"); @@ -561,7 +561,7 @@ void SdrMarkList::DeleteMark(ULONG nNum) } } -void SdrMarkList::ReplaceMark(const SdrMark& rNewMark, ULONG nNum) +void SdrMarkList::ReplaceMark(const SdrMark& rNewMark, sal_uLong nNum) { SdrMark* pMark = GetMark(nNum); DBG_ASSERT(pMark!=0L,"ReplaceMark: MarkEntry nicht gefunden"); @@ -578,7 +578,7 @@ void SdrMarkList::ReplaceMark(const SdrMark& rNewMark, ULONG nNum) void SdrMarkList::Merge(const SdrMarkList& rSrcList, sal_Bool bReverse) { - ULONG nAnz(rSrcList.maList.Count()); + sal_uLong nAnz(rSrcList.maList.Count()); if(rSrcList.mbSorted) { @@ -588,7 +588,7 @@ void SdrMarkList::Merge(const SdrMarkList& rSrcList, sal_Bool bReverse) if(!bReverse) { - for(ULONG i(0L); i < nAnz; i++) + for(sal_uLong i(0L); i < nAnz; i++) { SdrMark* pM = (SdrMark*)(rSrcList.maList.GetObject(i)); InsertEntry(*pM); @@ -596,7 +596,7 @@ void SdrMarkList::Merge(const SdrMarkList& rSrcList, sal_Bool bReverse) } else { - for(ULONG i(nAnz); i > 0;) + for(sal_uLong i(nAnz); i > 0;) { i--; SdrMark* pM = (SdrMark*)(rSrcList.maList.GetObject(i)); @@ -609,7 +609,7 @@ sal_Bool SdrMarkList::DeletePageView(const SdrPageView& rPV) { sal_Bool bChgd(sal_False); - for(ULONG i(GetMarkCount()); i > 0; ) + for(sal_uLong i(GetMarkCount()); i > 0; ) { i--; SdrMark* pMark = GetMark(i); @@ -632,9 +632,9 @@ sal_Bool SdrMarkList::InsertPageView(const SdrPageView& rPV) DeletePageView(rPV); // erstmal alle raus, dann die ganze Seite hinten dran SdrObject* pObj; const SdrObjList* pOL = rPV.GetObjList(); - ULONG nObjAnz(pOL->GetObjCount()); + sal_uLong nObjAnz(pOL->GetObjCount()); - for(ULONG nO(0L); nO < nObjAnz; nO++) + for(sal_uLong nO(0L); nO < nObjAnz; nO++) { pObj = pOL->GetObj(nO); sal_Bool bDoIt(rPV.IsObjMarkable(pObj)); @@ -653,7 +653,7 @@ sal_Bool SdrMarkList::InsertPageView(const SdrPageView& rPV) const XubString& SdrMarkList::GetMarkDescription() const { - ULONG nAnz(GetMarkCount()); + sal_uLong nAnz(GetMarkCount()); if(mbNameOk && 1L == nAnz) { @@ -691,7 +691,7 @@ const XubString& SdrMarkList::GetMarkDescription() const XubString aStr1; sal_Bool bEq(sal_True); - for(ULONG i = 1; i < GetMarkCount() && bEq; i++) + for(sal_uLong i = 1; i < GetMarkCount() && bEq; i++) { SdrMark* pMark2 = GetMark(i); pMark2->GetMarkedSdrObj()->TakeObjNamePlural(aStr1); @@ -719,16 +719,16 @@ const XubString& SdrMarkList::GetPointMarkDescription(sal_Bool bGlue) const { sal_Bool& rNameOk = (sal_Bool&)(bGlue ? mbGluePointNameOk : mbPointNameOk); XubString& rName = (XubString&)(bGlue ? maGluePointName : maPointName); - ULONG nMarkAnz(GetMarkCount()); - ULONG nMarkPtAnz(0L); - ULONG nMarkPtObjAnz(0L); - ULONG n1stMarkNum(ULONG_MAX); + sal_uLong nMarkAnz(GetMarkCount()); + sal_uLong nMarkPtAnz(0L); + sal_uLong nMarkPtObjAnz(0L); + sal_uLong n1stMarkNum(ULONG_MAX); - for(ULONG nMarkNum(0L); nMarkNum < nMarkAnz; nMarkNum++) + for(sal_uLong nMarkNum(0L); nMarkNum < nMarkAnz; nMarkNum++) { const SdrMark* pMark = GetMark(nMarkNum); const SdrUShortCont* pPts = bGlue ? pMark->GetMarkedGluePoints() : pMark->GetMarkedPoints(); - ULONG nAnz(pPts ? pPts->GetCount() : 0); + sal_uLong nAnz(pPts ? pPts->GetCount() : 0); if(nAnz) { @@ -787,7 +787,7 @@ const XubString& SdrMarkList::GetPointMarkDescription(sal_Bool bGlue) const XubString aStr1; sal_Bool bEq(sal_True); - for(ULONG i(n1stMarkNum + 1L); i < GetMarkCount() && bEq; i++) + for(sal_uLong i(n1stMarkNum + 1L); i < GetMarkCount() && bEq; i++) { const SdrMark* pMark2 = GetMark(i); const SdrUShortCont* pPts = bGlue ? pMark2->GetMarkedGluePoints() : pMark2->GetMarkedPoints(); @@ -833,7 +833,7 @@ sal_Bool SdrMarkList::TakeBoundRect(SdrPageView* pPV, Rectangle& rRect) const sal_Bool bFnd(sal_False); Rectangle aR; - for(ULONG i(0L); i < GetMarkCount(); i++) + for(sal_uLong i(0L); i < GetMarkCount(); i++) { SdrMark* pMark = GetMark(i); @@ -863,7 +863,7 @@ sal_Bool SdrMarkList::TakeSnapRect(SdrPageView* pPV, Rectangle& rRect) const { sal_Bool bFnd(sal_False); - for(ULONG i(0L); i < GetMarkCount(); i++) + for(sal_uLong i(0L); i < GetMarkCount(); i++) { SdrMark* pMark = GetMark(i); @@ -952,7 +952,7 @@ namespace sdr { SdrObjList* pList = pObj->GetSubList(); - for(ULONG a(0L); a < pList->GetObjCount(); a++) + for(sal_uLong a(0L); a < pList->GetObjCount(); a++) { SdrObject* pObj2 = pList->GetObj(a); ImplCollectCompleteSelection(pObj2); @@ -974,9 +974,9 @@ namespace sdr maAllMarkedObjects.clear(); // #126320# GetMarkCount after ForceSort - const ULONG nMarkAnz(maMarkedObjectList.GetMarkCount()); + const sal_uLong nMarkAnz(maMarkedObjectList.GetMarkCount()); - for(ULONG a(0L); a < nMarkAnz; a++) + for(sal_uLong a(0L); a < nMarkAnz; a++) { SdrObject* pCandidate = maMarkedObjectList.GetMark(a)->GetMarkedSdrObj(); diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 0440a9fe0bb7..6d93c2e771b3 100644..100755 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -50,12 +50,12 @@ #include <svx/xflhtit.hxx> #include <svx/xlnstit.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <editeng/editeng.hxx> // Fuer EditEngine::CreatePool() #include <svx/xtable.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdtrans.hxx> #include <svx/svdpage.hxx> #include <svx/svdlayer.hxx> @@ -66,8 +66,8 @@ #include <svx/svdetc.hxx> #include <svx/svdoutl.hxx> #include <svx/svdoole2.hxx> -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" // Objektname #include "svdoutlinercache.hxx" @@ -124,10 +124,10 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe eUIUnit=FUNIT_MM; aUIScale=Fraction(1,1); nUIUnitKomma=0; - bUIOnlyKomma=FALSE; + bUIOnlyKomma=sal_False; pLayerAdmin=NULL; pItemPool=pPool; - bMyPool=FALSE; + bMyPool=sal_False; m_pEmbeddedHelper=_pEmbeddedHelper; pDrawOutliner=NULL; pHitTestOutliner=NULL; @@ -145,21 +145,21 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe mbUndoEnabled=true; nProgressPercent=0; nLoadVersion=0; - bExtColorTable=FALSE; + bExtColorTable=sal_False; mbChanged = sal_False; - bInfoChanged=FALSE; - bPagNumsDirty=FALSE; - bMPgNumsDirty=FALSE; - bPageNotValid=FALSE; - bSavePortable=FALSE; - bSaveCompressed=FALSE; - bSaveNative=FALSE; - bSwapGraphics=FALSE; + bInfoChanged=sal_False; + bPagNumsDirty=sal_False; + bMPgNumsDirty=sal_False; + bPageNotValid=sal_False; + bSavePortable=sal_False; + bSaveCompressed=sal_False; + bSaveNative=sal_False; + bSwapGraphics=sal_False; nSwapGraphicsMode=SDR_SWAPGRAPHICSMODE_DEFAULT; - bSaveOLEPreview=FALSE; - bPasteResize=FALSE; - bNoBitmapCaching=FALSE; - bReadOnly=FALSE; + bSaveOLEPreview=sal_False; + bPasteResize=sal_False; + bNoBitmapCaching=sal_False; + bReadOnly=sal_False; nStreamCompressMode=COMPRESSMODE_NONE; nStreamNumberFormat=NUMBERFORMAT_INT_BIGENDIAN; nDefaultTabulator=0; @@ -170,8 +170,8 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe pGradientList=NULL; pBitmapList=NULL; mpNumberFormatter = NULL; - bTransparentTextFrames=FALSE; - bStarDrawPreviewMode = FALSE; + bTransparentTextFrames=sal_False; + bStarDrawPreviewMode = sal_False; nStarDrawPreviewMasterPageNum = SDRPAGE_NOTFOUND; pModelStorage = NULL; mpForbiddenCharactersTable = NULL; @@ -197,7 +197,7 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe // OutlinerPool als SecondaryPool des SdrPool pItemPool->SetSecondaryPool(pOutlPool); // Merken, dass ich mir die beiden Pools selbst gemacht habe - bMyPool=TRUE; + bMyPool=sal_True; } pItemPool->SetDefaultMetric((SfxMapUnit)eObjUnit); @@ -208,6 +208,8 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe else nDefTextHgt = SdrEngineDefaults::GetFontHeight(); + pItemPool->SetPoolDefaultItem( SdrTextWordWrapItem( sal_False ) ); + SetTextDefaults(); pLayerAdmin=new SdrLayerAdmin; pLayerAdmin->SetModel(this); @@ -216,10 +218,10 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe // den DrawOutliner OnDemand erzeugen geht noch nicht, weil ich den Pool // sonst nicht kriege (erst ab 302!) pDrawOutliner = SdrMakeOutliner( OUTLINERMODE_TEXTOBJECT, this ); - ImpSetOutlinerDefaults(pDrawOutliner, TRUE); + ImpSetOutlinerDefaults(pDrawOutliner, sal_True); pHitTestOutliner = SdrMakeOutliner( OUTLINERMODE_TEXTOBJECT, this ); - ImpSetOutlinerDefaults(pHitTestOutliner, TRUE); + ImpSetOutlinerDefaults(pHitTestOutliner, sal_True); ImpCreateTables(); } @@ -233,7 +235,7 @@ SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, sal #endif DBG_CTOR(SdrModel,NULL); - ImpCtor(pPool,pPers,FALSE, (bool)bLoadRefCounts); + ImpCtor(pPool, pPers, false, (bool)bLoadRefCounts); } SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, sal_Bool bLoadRefCounts): @@ -246,7 +248,7 @@ SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbed #endif DBG_CTOR(SdrModel,NULL); - ImpCtor(pPool,pPers,FALSE, (bool)bLoadRefCounts); + ImpCtor(pPool, pPers, false, (bool)bLoadRefCounts); } SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, sal_Bool bLoadRefCounts): @@ -400,7 +402,7 @@ void SdrModel::operator=(const SdrModel& /*rSrcModel*/) bool SdrModel::operator==(const SdrModel& /*rCmpModel*/) const { OSL_FAIL("SdrModel::operator==() ist noch nicht implementiert"); - return FALSE; + return sal_False; } void SdrModel::SetSwapGraphics( bool bSwap ) @@ -420,7 +422,7 @@ void SdrModel::SetReadOnly(bool bYes) //////////////////////////////////////////////////////////////////////////////////////////////////// -void SdrModel::SetMaxUndoActionCount(ULONG nAnz) +void SdrModel::SetMaxUndoActionCount(sal_uIntPtr nAnz) { if (nAnz<1) nAnz=1; nMaxUndoCount=nAnz; @@ -466,7 +468,7 @@ bool SdrModel::Undo() pDo->Undo(); if(pRedoStack==NULL) pRedoStack=new Container(1024,16,16); - pRedoStack->Insert(pUndoStack->Remove((ULONG)0),(ULONG)0); + pRedoStack->Insert(pUndoStack->Remove((sal_uIntPtr)0),(sal_uIntPtr)0); mbUndoEnabled = bWasUndoEnabled; } } @@ -490,7 +492,7 @@ bool SdrModel::Redo() pDo->Redo(); if(pUndoStack==NULL) pUndoStack=new Container(1024,16,16); - pUndoStack->Insert(pRedoStack->Remove((ULONG)0),(ULONG)0); + pUndoStack->Insert(pRedoStack->Remove((sal_uIntPtr)0),(sal_uIntPtr)0); mbUndoEnabled = bWasUndoEnabled; } } @@ -532,7 +534,7 @@ void SdrModel::ImpPostUndoAction(SdrUndoAction* pUndo) { if (pUndoStack==NULL) pUndoStack=new Container(1024,16,16); - pUndoStack->Insert(pUndo,(ULONG)0); + pUndoStack->Insert(pUndo,(sal_uIntPtr)0); while (pUndoStack->Count()>nMaxUndoCount) { delete (SfxUndoAction*)pUndoStack->Remove(pUndoStack->Count()-1); @@ -781,7 +783,7 @@ void SdrModel::ClearModel(sal_Bool bCalledFromDestructor) sal_Int32 nAnz=GetPageCount(); for (i=nAnz-1; i>=0; i--) { - DeletePage( (USHORT)i ); + DeletePage( (sal_uInt16)i ); } maPages.Clear(); // #109538# @@ -791,7 +793,7 @@ void SdrModel::ClearModel(sal_Bool bCalledFromDestructor) nAnz=GetMasterPageCount(); for(i=nAnz-1; i>=0; i--) { - DeleteMasterPage( (USHORT)i ); + DeleteMasterPage( (sal_uInt16)i ); } maMaPag.Clear(); // #109538# @@ -819,9 +821,9 @@ void SdrModel::SetTextDefaults() const void ImpGetDefaultFontsLanguage( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFontItem& rComplex) { - const USHORT nItemCnt = 3; + const sal_uInt16 nItemCnt = 3; static struct { - USHORT nFntType, nLanguage; + sal_uInt16 nFntType, nLanguage; } aOutTypeArr[ nItemCnt ] = { { DEFAULTFONT_LATIN_TEXT, LANGUAGE_ENGLISH_US }, { DEFAULTFONT_CJK_TEXT, LANGUAGE_ENGLISH_US }, @@ -829,7 +831,7 @@ void ImpGetDefaultFontsLanguage( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFo }; SvxFontItem* aItemArr[ nItemCnt ] = { &rLatin, &rAsian, &rComplex }; - for( USHORT n = 0; n < nItemCnt; ++n ) + for( sal_uInt16 n = 0; n < nItemCnt; ++n ) { Font aFnt( OutputDevice::GetDefaultFont( aOutTypeArr[ n ].nFntType, aOutTypeArr[ n ].nLanguage, @@ -843,7 +845,7 @@ void ImpGetDefaultFontsLanguage( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFo } } -void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, ULONG nDefTextHgt ) +void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt ) { // #95114# set application-language specific dynamic pool language defaults SvxFontItem aSvxFontItem( EE_CHAR_FONTINFO) ; @@ -896,7 +898,7 @@ SdrOutliner& SdrModel::GetDrawOutliner(const SdrTextObj* pObj) const boost::shared_ptr< SdrOutliner > SdrModel::CreateDrawOutliner(const SdrTextObj* pObj) { boost::shared_ptr< SdrOutliner > xDrawOutliner( SdrMakeOutliner( OUTLINERMODE_TEXTOBJECT, this ) ); - ImpSetOutlinerDefaults(xDrawOutliner.get(), TRUE); + ImpSetOutlinerDefaults(xDrawOutliner.get(), sal_True); xDrawOutliner->SetTextObj(pObj); return xDrawOutliner; } @@ -909,7 +911,7 @@ const SdrTextObj* SdrModel::GetFormattingTextObj() const return NULL; } -void SdrModel::ImpSetOutlinerDefaults( SdrOutliner* pOutliner, BOOL bInit ) +void SdrModel::ImpSetOutlinerDefaults( SdrOutliner* pOutliner, sal_Bool bInit ) { /************************************************************************** * Initialisierung der Outliner fuer Textausgabe und HitTest @@ -917,7 +919,7 @@ void SdrModel::ImpSetOutlinerDefaults( SdrOutliner* pOutliner, BOOL bInit ) if( bInit ) { pOutliner->EraseVirtualDevice(); - pOutliner->SetUpdateMode(FALSE); + pOutliner->SetUpdateMode(sal_False); pOutliner->SetEditTextObjectPool(pItemPool); pOutliner->SetDefTab(nDefaultTabulator); } @@ -948,8 +950,8 @@ void SdrModel::ImpReformatAllTextObjects() if( isLocked() ) return; - USHORT nAnz=GetMasterPageCount(); - USHORT nNum; + sal_uInt16 nAnz=GetMasterPageCount(); + sal_uInt16 nNum; for (nNum=0; nNum<nAnz; nNum++) { GetMasterPage(nNum)->ReformatAllTextObjects(); } @@ -990,8 +992,8 @@ SvStream* SdrModel::GetDocumentStream(SdrDocumentStreamInfo& /*rStreamInfo*/) co // Die Vorlagenattribute der Zeichenobjekte in harte Attribute verwandeln. void SdrModel::BurnInStyleSheetAttributes() { - USHORT nAnz=GetMasterPageCount(); - USHORT nNum; + sal_uInt16 nAnz=GetMasterPageCount(); + sal_uInt16 nNum; for (nNum=0; nNum<nAnz; nNum++) { GetMasterPage(nNum)->BurnInStyleSheetAttributes(); } @@ -1007,7 +1009,7 @@ void SdrModel::RefDeviceChanged() ImpReformatAllTextObjects(); } -void SdrModel::SetDefaultFontHeight(ULONG nVal) +void SdrModel::SetDefaultFontHeight(sal_uIntPtr nVal) { if (nVal!=nDefTextHgt) { nDefTextHgt=nVal; @@ -1016,7 +1018,7 @@ void SdrModel::SetDefaultFontHeight(ULONG nVal) } } -void SdrModel::SetDefaultTabulator(USHORT nVal) +void SdrModel::SetDefaultTabulator(sal_uInt16 nVal) { if (nDefaultTabulator!=nVal) { nDefaultTabulator=nVal; @@ -1403,7 +1405,7 @@ void SdrModel::TakeMetricStr(long nVal, XubString& rStr, bool bNoUnitChars, sal_ void SdrModel::TakeWinkStr(long nWink, XubString& rStr, bool bNoDegChar) const { - BOOL bNeg(nWink < 0); + sal_Bool bNeg(nWink < 0); if(bNeg) nWink = -nWink; @@ -1431,9 +1433,9 @@ void SdrModel::TakeWinkStr(long nWink, XubString& rStr, bool bNoDegChar) const void SdrModel::TakePercentStr(const Fraction& rVal, XubString& rStr, bool bNoPercentChar) const { - INT32 nMul(rVal.GetNumerator()); - INT32 nDiv(rVal.GetDenominator()); - BOOL bNeg(nMul < 0); + sal_Int32 nMul(rVal.GetNumerator()); + sal_Int32 nDiv(rVal.GetDenominator()); + sal_Bool bNeg(nMul < 0); if(nDiv < 0) bNeg = !bNeg; @@ -1465,48 +1467,48 @@ void SdrModel::SetChanged(sal_Bool bFlg) void SdrModel::RecalcPageNums(bool bMaster) { Container& rPL=*(bMaster ? &maMaPag : &maPages); - USHORT nAnz=USHORT(rPL.Count()); - USHORT i; + sal_uInt16 nAnz=sal_uInt16(rPL.Count()); + sal_uInt16 i; for (i=0; i<nAnz; i++) { SdrPage* pPg=(SdrPage*)(rPL.GetObject(i)); pPg->SetPageNum(i); } - if (bMaster) bMPgNumsDirty=FALSE; - else bPagNumsDirty=FALSE; + if (bMaster) bMPgNumsDirty=sal_False; + else bPagNumsDirty=sal_False; } -void SdrModel::InsertPage(SdrPage* pPage, USHORT nPos) +void SdrModel::InsertPage(SdrPage* pPage, sal_uInt16 nPos) { - USHORT nAnz=GetPageCount(); + sal_uInt16 nAnz=GetPageCount(); if (nPos>nAnz) nPos=nAnz; maPages.Insert(pPage,nPos); // #109538# PageListChanged(); - pPage->SetInserted(TRUE); + pPage->SetInserted(sal_True); pPage->SetPageNum(nPos); pPage->SetModel(this); - if (nPos<nAnz) bPagNumsDirty=TRUE; + if (nPos<nAnz) bPagNumsDirty=sal_True; SetChanged(); SdrHint aHint(HINT_PAGEORDERCHG); aHint.SetPage(pPage); Broadcast(aHint); } -void SdrModel::DeletePage(USHORT nPgNum) +void SdrModel::DeletePage(sal_uInt16 nPgNum) { SdrPage* pPg=RemovePage(nPgNum); delete pPg; } -SdrPage* SdrModel::RemovePage(USHORT nPgNum) +SdrPage* SdrModel::RemovePage(sal_uInt16 nPgNum) { SdrPage* pPg=(SdrPage*)maPages.Remove(nPgNum); // #109538# PageListChanged(); if (pPg!=NULL) { - pPg->SetInserted(FALSE); + pPg->SetInserted(sal_False); } - bPagNumsDirty=TRUE; + bPagNumsDirty=sal_True; SetChanged(); SdrHint aHint(HINT_PAGEORDERCHG); aHint.SetPage(pPg); @@ -1514,29 +1516,29 @@ SdrPage* SdrModel::RemovePage(USHORT nPgNum) return pPg; } -void SdrModel::MovePage(USHORT nPgNum, USHORT nNewPos) +void SdrModel::MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos) { SdrPage* pPg=(SdrPage*)maPages.Remove(nPgNum); // #109538# PageListChanged(); if (pPg!=NULL) { - pPg->SetInserted(FALSE); + pPg->SetInserted(sal_False); InsertPage(pPg,nNewPos); } } -void SdrModel::InsertMasterPage(SdrPage* pPage, USHORT nPos) +void SdrModel::InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos) { - USHORT nAnz=GetMasterPageCount(); + sal_uInt16 nAnz=GetMasterPageCount(); if (nPos>nAnz) nPos=nAnz; maMaPag.Insert(pPage,nPos); // #109538# MasterPageListChanged(); - pPage->SetInserted(TRUE); + pPage->SetInserted(sal_True); pPage->SetPageNum(nPos); pPage->SetModel(this); if (nPos<nAnz) { - bMPgNumsDirty=TRUE; + bMPgNumsDirty=sal_True; } SetChanged(); SdrHint aHint(HINT_PAGEORDERCHG); @@ -1544,13 +1546,13 @@ void SdrModel::InsertMasterPage(SdrPage* pPage, USHORT nPos) Broadcast(aHint); } -void SdrModel::DeleteMasterPage(USHORT nPgNum) +void SdrModel::DeleteMasterPage(sal_uInt16 nPgNum) { SdrPage* pPg=RemoveMasterPage(nPgNum); if (pPg!=NULL) delete pPg; } -SdrPage* SdrModel::RemoveMasterPage(USHORT nPgNum) +SdrPage* SdrModel::RemoveMasterPage(sal_uInt16 nPgNum) { SdrPage* pRetPg=(SdrPage*)maMaPag.Remove(nPgNum); // #109538# @@ -1566,10 +1568,10 @@ SdrPage* SdrModel::RemoveMasterPage(USHORT nPgNum) GetPage(np)->TRG_ImpMasterPageRemoved(*pRetPg); } - pRetPg->SetInserted(FALSE); + pRetPg->SetInserted(sal_False); } - bMPgNumsDirty=TRUE; + bMPgNumsDirty=sal_True; SetChanged(); SdrHint aHint(HINT_PAGEORDERCHG); aHint.SetPage(pRetPg); @@ -1577,18 +1579,18 @@ SdrPage* SdrModel::RemoveMasterPage(USHORT nPgNum) return pRetPg; } -void SdrModel::MoveMasterPage(USHORT nPgNum, USHORT nNewPos) +void SdrModel::MoveMasterPage(sal_uInt16 nPgNum, sal_uInt16 nNewPos) { SdrPage* pPg=(SdrPage*)maMaPag.Remove(nPgNum); // #109538# MasterPageListChanged(); if (pPg!=NULL) { - pPg->SetInserted(FALSE); + pPg->SetInserted(sal_False); maMaPag.Insert(pPg,nNewPos); // #109538# MasterPageListChanged(); } - bMPgNumsDirty=TRUE; + bMPgNumsDirty=sal_True; SetChanged(); SdrHint aHint(HINT_PAGEORDERCHG); aHint.SetPage(pPg); @@ -1609,8 +1611,8 @@ bool SdrModel::CheckConsistence() const //////////////////////////////////////////////////////////////////////////////////////////////////// // #48289# -void SdrModel::CopyPages(USHORT nFirstPageNum, USHORT nLastPageNum, - USHORT nDestPos, +void SdrModel::CopyPages(sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum, + sal_uInt16 nDestPos, bool bUndo, bool bMoveNoCopy) { if( bUndo && !IsUndoEnabled() ) @@ -1619,8 +1621,8 @@ void SdrModel::CopyPages(USHORT nFirstPageNum, USHORT nLastPageNum, if( bUndo ) BegUndo(ImpGetResStr(STR_UndoMergeModel)); - USHORT nPageAnz=GetPageCount(); - USHORT nMaxPage=nPageAnz; + sal_uInt16 nPageAnz=GetPageCount(); + sal_uInt16 nMaxPage=nPageAnz; if (nMaxPage!=0) nMaxPage--; @@ -1633,10 +1635,10 @@ void SdrModel::CopyPages(USHORT nFirstPageNum, USHORT nLastPageNum, nDestPos=nPageAnz; // Zunaechst die Zeiger der betroffenen Seiten in einem Array sichern - USHORT nPageNum=nFirstPageNum; - USHORT nCopyAnz=((!bReverse)?(nLastPageNum-nFirstPageNum):(nFirstPageNum-nLastPageNum))+1; + sal_uInt16 nPageNum=nFirstPageNum; + sal_uInt16 nCopyAnz=((!bReverse)?(nLastPageNum-nFirstPageNum):(nFirstPageNum-nLastPageNum))+1; SdrPage** pPagePtrs=new SdrPage*[nCopyAnz]; - USHORT nCopyNum; + sal_uInt16 nCopyNum; for(nCopyNum=0; nCopyNum<nCopyAnz; nCopyNum++) { pPagePtrs[nCopyNum]=GetPage(nPageNum); @@ -1647,11 +1649,11 @@ void SdrModel::CopyPages(USHORT nFirstPageNum, USHORT nLastPageNum, } // Jetzt die Seiten kopieren - USHORT nDestNum=nDestPos; + sal_uInt16 nDestNum=nDestPos; for (nCopyNum=0; nCopyNum<nCopyAnz; nCopyNum++) { SdrPage* pPg=pPagePtrs[nCopyNum]; - USHORT nPageNum2=pPg->GetPageNum(); + sal_uInt16 nPageNum2=pPg->GetPageNum(); if (!bMoveNoCopy) { const SdrPage* pPg1=GetPage(nPageNum2); @@ -1687,8 +1689,8 @@ void SdrModel::CopyPages(USHORT nFirstPageNum, USHORT nLastPageNum, } void SdrModel::Merge(SdrModel& rSourceModel, - USHORT nFirstPageNum, USHORT nLastPageNum, - USHORT nDestPos, + sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum, + sal_uInt16 nDestPos, bool bMergeMasterPages, bool bAllMasterPages, bool bUndo, bool bTreadSourceAsConst) { @@ -1704,30 +1706,30 @@ void SdrModel::Merge(SdrModel& rSourceModel, if (bUndo) BegUndo(ImpGetResStr(STR_UndoMergeModel)); - USHORT nSrcPageAnz=rSourceModel.GetPageCount(); - USHORT nSrcMasterPageAnz=rSourceModel.GetMasterPageCount(); - USHORT nDstMasterPageAnz=GetMasterPageCount(); + sal_uInt16 nSrcPageAnz=rSourceModel.GetPageCount(); + sal_uInt16 nSrcMasterPageAnz=rSourceModel.GetMasterPageCount(); + sal_uInt16 nDstMasterPageAnz=GetMasterPageCount(); bool bInsPages=(nFirstPageNum<nSrcPageAnz || nLastPageNum<nSrcPageAnz); - USHORT nMaxSrcPage=nSrcPageAnz; if (nMaxSrcPage!=0) nMaxSrcPage--; + sal_uInt16 nMaxSrcPage=nSrcPageAnz; if (nMaxSrcPage!=0) nMaxSrcPage--; if (nFirstPageNum>nMaxSrcPage) nFirstPageNum=nMaxSrcPage; if (nLastPageNum>nMaxSrcPage) nLastPageNum =nMaxSrcPage; bool bReverse=nLastPageNum<nFirstPageNum; - USHORT* pMasterMap=NULL; + sal_uInt16* pMasterMap=NULL; bool* pMasterNeed=NULL; - USHORT nMasterNeed=0; + sal_uInt16 nMasterNeed=0; if (bMergeMasterPages && nSrcMasterPageAnz!=0) { // Feststellen, welche MasterPages aus rSrcModel benoetigt werden - pMasterMap=new USHORT[nSrcMasterPageAnz]; + pMasterMap=new sal_uInt16[nSrcMasterPageAnz]; pMasterNeed=new bool[nSrcMasterPageAnz]; - memset(pMasterMap,0xFF,nSrcMasterPageAnz*sizeof(USHORT)); + memset(pMasterMap,0xFF,nSrcMasterPageAnz*sizeof(sal_uInt16)); if (bAllMasterPages) { memset(pMasterNeed, true, nSrcMasterPageAnz * sizeof(bool)); } else { memset(pMasterNeed, false, nSrcMasterPageAnz * sizeof(bool)); - USHORT nAnf= bReverse ? nLastPageNum : nFirstPageNum; - USHORT nEnd= bReverse ? nFirstPageNum : nLastPageNum; - for (USHORT i=nAnf; i<=nEnd; i++) { + sal_uInt16 nAnf= bReverse ? nLastPageNum : nFirstPageNum; + sal_uInt16 nEnd= bReverse ? nFirstPageNum : nLastPageNum; + for (sal_uInt16 i=nAnf; i<=nEnd; i++) { const SdrPage* pPg=rSourceModel.GetPage(i); if(pPg->TRG_HasMasterPage()) { @@ -1742,8 +1744,8 @@ void SdrModel::Merge(SdrModel& rSourceModel, } } // Nun das Mapping der MasterPages bestimmen - USHORT nAktMaPagNum=nDstMasterPageAnz; - for (USHORT i=0; i<nSrcMasterPageAnz; i++) { + sal_uInt16 nAktMaPagNum=nDstMasterPageAnz; + for (sal_uInt16 i=0; i<nSrcMasterPageAnz; i++) { if (pMasterNeed[i]) { pMasterMap[i]=nAktMaPagNum; nAktMaPagNum++; @@ -1754,7 +1756,7 @@ void SdrModel::Merge(SdrModel& rSourceModel, // rueberholen der Masterpages if (pMasterMap!=NULL && pMasterNeed!=NULL && nMasterNeed!=0) { - for (USHORT i=nSrcMasterPageAnz; i>0;) { + for (sal_uInt16 i=nSrcMasterPageAnz; i>0;) { i--; if (pMasterNeed[i]) { SdrPage* pPg=NULL; @@ -1771,9 +1773,9 @@ void SdrModel::Merge(SdrModel& rSourceModel, maMaPag.Insert(pPg,nDstMasterPageAnz); // #109538# MasterPageListChanged(); - pPg->SetInserted(TRUE); + pPg->SetInserted(sal_True); pPg->SetModel(this); - bMPgNumsDirty=TRUE; + bMPgNumsDirty=sal_True; if (bUndo) AddUndo(GetSdrUndoFactory().CreateUndoNewPage(*pPg)); } else { OSL_FAIL("SdrModel::Merge(): MasterPage im SourceModel nicht gefunden"); @@ -1784,8 +1786,8 @@ void SdrModel::Merge(SdrModel& rSourceModel, // rueberholen der Zeichenseiten if (bInsPages) { - USHORT nSourcePos=nFirstPageNum; - USHORT nMergeCount=USHORT(Abs((long)((long)nFirstPageNum-nLastPageNum))+1); + sal_uInt16 nSourcePos=nFirstPageNum; + sal_uInt16 nMergeCount=sal_uInt16(Abs((long)((long)nFirstPageNum-nLastPageNum))+1); if (nDestPos>GetPageCount()) nDestPos=GetPageCount(); while (nMergeCount>0) { SdrPage* pPg=NULL; @@ -1845,8 +1847,8 @@ void SdrModel::Merge(SdrModel& rSourceModel, delete [] pMasterMap; delete [] pMasterNeed; - bMPgNumsDirty=TRUE; - bPagNumsDirty=TRUE; + bMPgNumsDirty=sal_True; + bPagNumsDirty=sal_True; SetChanged(); // Fehlt: Mergen und Mapping der Layer @@ -1854,12 +1856,12 @@ void SdrModel::Merge(SdrModel& rSourceModel, if (bUndo) EndUndo(); } -void SdrModel::SetStarDrawPreviewMode(BOOL bPreview) +void SdrModel::SetStarDrawPreviewMode(sal_Bool bPreview) { if (!bPreview && bStarDrawPreviewMode && GetPageCount()) { // Das Zuruecksetzen ist nicht erlaubt, da das Model ev. nicht vollstaendig geladen wurde - DBG_ASSERT(FALSE,"SdrModel::SetStarDrawPreviewMode(): Zuruecksetzen nicht erlaubt, da Model ev. nicht vollstaendig"); + DBG_ASSERT(sal_False,"SdrModel::SetStarDrawPreviewMode(): Zuruecksetzen nicht erlaubt, da Model ev. nicht vollstaendig"); } else { @@ -1916,7 +1918,7 @@ void SdrModel::MigrateItemSet( const SfxItemSet* pSourceSet, SfxItemSet* pDestSe while(nWhich) { - if(SFX_ITEM_SET == pSourceSet->GetItemState(nWhich, FALSE, &pPoolItem)) + if(SFX_ITEM_SET == pSourceSet->GetItemState(nWhich, sal_False, &pPoolItem)) { const SfxPoolItem* pItem = pPoolItem; @@ -1982,7 +1984,7 @@ rtl::Reference<SvxForbiddenCharactersTable> SdrModel::GetForbiddenCharsTable() c return mpForbiddenCharactersTable; } -void SdrModel::SetCharCompressType( UINT16 nType ) +void SdrModel::SetCharCompressType( sal_uInt16 nType ) { if( nType != mnCharCompressType ) { @@ -2017,10 +2019,10 @@ void SdrModel::ReformatAllTextObjects() ImpReformatAllTextObjects(); } -bool SdrModel::HasTransparentObjects( BOOL bCheckForAlphaChannel ) const +bool SdrModel::HasTransparentObjects( bool bCheckForAlphaChannel ) const { bool bRet = false; - USHORT n, nCount; + sal_uInt16 n, nCount; for( n = 0, nCount = GetMasterPageCount(); ( n < nCount ) && !bRet; n++ ) if( GetMasterPage( n )->HasTransparentObjects( bCheckForAlphaChannel ) ) @@ -2036,7 +2038,7 @@ bool SdrModel::HasTransparentObjects( BOOL bCheckForAlphaChannel ) const return bRet; } -SdrOutliner* SdrModel::createOutliner( USHORT nOutlinerMode ) +SdrOutliner* SdrModel::createOutliner( sal_uInt16 nOutlinerMode ) { if( NULL == mpOutlinerCache ) mpOutlinerCache = new SdrOutlinerCache(this); @@ -2108,6 +2110,11 @@ void SdrModel::SetSdrUndoManager( SfxUndoManager* pUndoManager ) mpImpl->mpUndoManager = pUndoManager; } +SfxUndoManager* SdrModel::GetSdrUndoManager() const +{ + return mpImpl->mpUndoManager; +} + SdrUndoFactory& SdrModel::GetSdrUndoFactory() const { if( !mpImpl->mpUndoFactory ) diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 7958f24043c3..0469d7015105 100644..100755 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -32,8 +32,8 @@ #include <svx/svdmrkv.hxx> #include <svx/svdetc.hxx> #include <svx/svdoedge.hxx> -#include "svdglob.hxx" -#include "svditext.hxx" +#include "svx/svdglob.hxx" +#include "svx/svditext.hxx" #include <svx/svdview.hxx> #include <svx/svdpagv.hxx> #include <svx/svdpage.hxx> @@ -49,14 +49,14 @@ #include "gradtrns.hxx" #include <svx/xflftrit.hxx> #include <svx/dialmgr.hxx> -#include "svdstr.hrc" +#include "svx/svdstr.hrc" #include <svx/svdundo.hxx> #include <svx/svdopath.hxx> #include <svx/scene3d.hxx> #include <svx/svdovirt.hxx> #include <svx/sdr/overlay/overlayrollingrectangle.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svx/sdrpagewindow.hxx> #include <svx/sdrhittesthelper.hxx> @@ -147,24 +147,24 @@ void ImplMarkingOverlay::SetSecondPosition(const basegfx::B2DPoint& rNewPosition void SdrMarkView::ImpClearVars() { eDragMode=SDRDRAG_MOVE; - //HMHbHdlShown=FALSE; - bRefHdlShownOnly=FALSE; + //HMHbHdlShown=sal_False; + bRefHdlShownOnly=sal_False; eEditMode=SDREDITMODE_EDIT; eEditMode0=SDREDITMODE_EDIT; - bDesignMode=FALSE; + bDesignMode=sal_False; pMarkedObj=NULL; pMarkedPV=NULL; - bForceFrameHandles=FALSE; - bPlusHdlAlways=FALSE; + bForceFrameHandles=sal_False; + bPlusHdlAlways=sal_False; nFrameHandlesLimit=50; - bInsPolyPoint=FALSE; + bInsPolyPoint=sal_False; mnInsPointNum = 0L; - bMarkedObjRectDirty=FALSE; - bMarkedPointsRectsDirty=FALSE; + bMarkedObjRectDirty=sal_False; + bMarkedPointsRectsDirty=sal_False; mbMarkHandlesHidden = false; - bMrkPntDirty=FALSE; - bMarkHdlWhenTextEdit=FALSE; - bMarkableObjCountDirty=FALSE; // noch nicht implementiert + bMrkPntDirty=sal_False; + bMarkHdlWhenTextEdit=sal_False; + bMarkableObjCountDirty=sal_False; // noch nicht implementiert nMarkableObjCount=0; // noch nicht implementiert // #114409#-3 Migrate selections @@ -203,13 +203,13 @@ void SdrMarkView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) if (eKind==HINT_OBJCHG || eKind==HINT_OBJINSERTED || eKind==HINT_OBJREMOVED) { - bMarkedObjRectDirty=TRUE; - bMarkedPointsRectsDirty=TRUE; + bMarkedObjRectDirty=sal_True; + bMarkedPointsRectsDirty=sal_True; } /* removed for now since this breaks existing code who iterates over the mark list and sequentially replaces objects if( eKind==HINT_OBJREMOVED && IsObjMarked( const_cast<SdrObject*>(pSdrHint->GetObject()) ) ) { - MarkObj( const_cast<SdrObject*>(pSdrHint->GetObject()), GetSdrPageView(), TRUE ); + MarkObj( const_cast<SdrObject*>(pSdrHint->GetObject()), GetSdrPageView(), sal_True ); } */ } @@ -220,14 +220,14 @@ void SdrMarkView::ModelHasChanged() { SdrPaintView::ModelHasChanged(); GetMarkedObjectListWriteAccess().SetNameDirty(); - bMarkedObjRectDirty=TRUE; - bMarkedPointsRectsDirty=TRUE; + bMarkedObjRectDirty=sal_True; + bMarkedPointsRectsDirty=sal_True; // Es sind beispielsweise Obj markiert und maMarkedObjectListist Sorted. // In einer anderen View 2 wird die ObjOrder veraendert // (z.B. MovToTop()). Dann ist Neusortieren der MarkList erforderlich. GetMarkedObjectListWriteAccess().SetUnsorted(); SortMarkedObjects(); - bMrkPntDirty=TRUE; + bMrkPntDirty=sal_True; UndirtyMrkPnt(); SdrView* pV=(SdrView*)this; if (pV!=NULL && !pV->IsDragObj() && !pV->IsInsObjPoint()) { // an dieser Stelle habe ich ein ziemliches Problem !!! @@ -237,7 +237,7 @@ void SdrMarkView::ModelHasChanged() //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SdrMarkView::IsAction() const +sal_Bool SdrMarkView::IsAction() const { return SdrSnapView::IsAction() || IsMarkObj() || IsMarkPoints() || IsMarkGluePoints(); } @@ -539,16 +539,16 @@ void SdrMarkView::BrkMarkGluePoints() } } -BOOL SdrMarkView::HasMarkableObj() const +sal_Bool SdrMarkView::HasMarkableObj() const { - ULONG nCount=0; + sal_uIntPtr nCount=0; SdrPageView* pPV = GetSdrPageView(); if(pPV) { SdrObjList* pOL=pPV->GetObjList(); - ULONG nObjAnz=pOL->GetObjCount(); - for (ULONG nObjNum=0; nObjNum<nObjAnz && nCount==0; nObjNum++) { + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + for (sal_uIntPtr nObjNum=0; nObjNum<nObjAnz && nCount==0; nObjNum++) { SdrObject* pObj=pOL->GetObj(nObjNum); if (IsObjMarkable(pObj,pPV)) { nCount++; @@ -558,16 +558,16 @@ BOOL SdrMarkView::HasMarkableObj() const return nCount!=0; } -ULONG SdrMarkView::GetMarkableObjCount() const +sal_uIntPtr SdrMarkView::GetMarkableObjCount() const { - ULONG nCount=0; + sal_uIntPtr nCount=0; SdrPageView* pPV = GetSdrPageView(); if(pPV) { SdrObjList* pOL=pPV->GetObjList(); - ULONG nObjAnz=pOL->GetObjCount(); - for (ULONG nObjNum=0; nObjNum<nObjAnz; nObjNum++) { + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + for (sal_uIntPtr nObjNum=0; nObjNum<nObjAnz; nObjNum++) { SdrObject* pObj=pOL->GetObj(nObjNum); if (IsObjMarkable(pObj,pPV)) { nCount++; @@ -579,26 +579,26 @@ ULONG SdrMarkView::GetMarkableObjCount() const //HMHvoid SdrMarkView::ImpShowMarkHdl(bool /*bNoRefHdl*/) //HMH{ -//HMH bNoRefHdl=FALSE; // geht leider erstmal nicht anders +//HMH bNoRefHdl=sal_False; // geht leider erstmal nicht anders //HMH if (!bHdlShown) { -//HMH bRefHdlShownOnly=FALSE; -//HMH bHdlShown=TRUE; +//HMH bRefHdlShownOnly=sal_False; +//HMH bHdlShown=sal_True; //HMH } //HMH} //HMHvoid SdrMarkView::ShowMarkHdl(bool /*bNoRefHdl*/) //HMH{ -//HMH bNoRefHdl=FALSE; // geht leider erstmal nicht anders +//HMH bNoRefHdl=sal_False; // geht leider erstmal nicht anders //HMH ImpShowMarkHdl(bNoRefHdl); //HMH} //HMHvoid SdrMarkView::HideMarkHdl(bool /*bNoRefHdl*/) //HMH{ -//HMH bNoRefHdl=FALSE; // geht leider erstmal nicht anders +//HMH bNoRefHdl=sal_False; // geht leider erstmal nicht anders //HMH if (bHdlShown) { //HMH bRefHdlShownOnly=bNoRefHdl; -//HMH bHdlShown=FALSE; +//HMH bHdlShown=sal_False; //HMH } //HMH} @@ -620,29 +620,29 @@ void SdrMarkView::showMarkHandles() } } -BOOL SdrMarkView::ImpIsFrameHandles() const +sal_Bool SdrMarkView::ImpIsFrameHandles() const { - ULONG nMarkAnz=GetMarkedObjectCount(); - BOOL bFrmHdl=nMarkAnz>nFrameHandlesLimit || bForceFrameHandles; - BOOL bStdDrag=eDragMode==SDRDRAG_MOVE; + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + sal_Bool bFrmHdl=nMarkAnz>nFrameHandlesLimit || bForceFrameHandles; + sal_Bool bStdDrag=eDragMode==SDRDRAG_MOVE; if (nMarkAnz==1 && bStdDrag && bFrmHdl) { const SdrObject* pObj=GetMarkedObjectByIndex(0); if (pObj->GetObjInventor()==SdrInventor) { - UINT16 nIdent=pObj->GetObjIdentifier(); + sal_uInt16 nIdent=pObj->GetObjIdentifier(); if (nIdent==OBJ_LINE || nIdent==OBJ_EDGE || nIdent==OBJ_CAPTION || nIdent==OBJ_MEASURE || nIdent==OBJ_CUSTOMSHAPE || nIdent==OBJ_TABLE ) { - bFrmHdl=FALSE; + bFrmHdl=sal_False; } } } if (!bStdDrag && !bFrmHdl) { // Grundsaetzlich erstmal alle anderen Dragmodi nur mit FrameHandles - bFrmHdl=TRUE; + bFrmHdl=sal_True; if (eDragMode==SDRDRAG_ROTATE) { // bei Rotate ObjOwn-Drag, wenn mind. 1 PolyObj - for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && bFrmHdl; nMarkNum++) { + for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && bFrmHdl; nMarkNum++) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrObject* pObj=pM->GetMarkedSdrObj(); bFrmHdl=!pObj->IsPolyObj(); @@ -651,7 +651,7 @@ BOOL SdrMarkView::ImpIsFrameHandles() const } if (!bFrmHdl) { // FrameHandles, wenn wenigstens 1 Obj kein SpecialDrag kann - for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && !bFrmHdl; nMarkNum++) { + for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && !bFrmHdl; nMarkNum++) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrObject* pObj=pM->GetMarkedSdrObj(); bFrmHdl=!pObj->hasSpecialDrag(); @@ -691,9 +691,9 @@ void SdrMarkView::SetMarkHandles() // are handles enabled at all? Create only then if(!areMarkHandlesHidden()) { - ULONG nMarkAnz=GetMarkedObjectCount(); - BOOL bStdDrag=eDragMode==SDRDRAG_MOVE; - BOOL bSingleTextObjMark=FALSE; + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + sal_Bool bStdDrag=eDragMode==SDRDRAG_MOVE; + sal_Bool bSingleTextObjMark=sal_False; if (nMarkAnz==1) { @@ -704,13 +704,13 @@ void SdrMarkView::SetMarkHandles() static_cast<SdrTextObj*>(pMarkedObj)->IsTextFrame(); } - BOOL bFrmHdl=ImpIsFrameHandles(); + sal_Bool bFrmHdl=ImpIsFrameHandles(); if (nMarkAnz>0) { pMarkedPV=GetSdrPageViewOfMarkedByIndex(0); - for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && (pMarkedPV!=NULL || !bFrmHdl); nMarkNum++) + for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && (pMarkedPV!=NULL || !bFrmHdl); nMarkNum++) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); @@ -736,15 +736,15 @@ void SdrMarkView::SetMarkHandles() { // sonst nix gefunden if( bSingleTextObjMark ) { - const ULONG nSiz0=aHdl.GetHdlCount(); + const sal_uIntPtr nSiz0=aHdl.GetHdlCount(); pMarkedObj->AddToHdlList(aHdl); - const ULONG nSiz1=aHdl.GetHdlCount(); - for (ULONG i=nSiz0; i<nSiz1; i++) + const sal_uIntPtr nSiz1=aHdl.GetHdlCount(); + for (sal_uIntPtr i=nSiz0; i<nSiz1; i++) { SdrHdl* pHdl=aHdl.GetHdl(i); pHdl->SetObj(pMarkedObj); pHdl->SetPageView(pMarkedPV); - pHdl->SetObjHdlNum(USHORT(i-nSiz0)); + pHdl->SetObjHdlNum(sal_uInt16(i-nSiz0)); } } else if( eDragMode==SDRDRAG_CROP ) @@ -760,8 +760,8 @@ void SdrMarkView::SetMarkHandles() } else { - BOOL bWdt0=aRect.Left()==aRect.Right(); - BOOL bHgt0=aRect.Top()==aRect.Bottom(); + sal_Bool bWdt0=aRect.Left()==aRect.Right(); + sal_Bool bHgt0=aRect.Top()==aRect.Bottom(); if (bWdt0 && bHgt0) { aHdl.AddHdl(new SdrHdl(aRect.TopLeft(),HDL_UPLFT)); @@ -787,27 +787,27 @@ void SdrMarkView::SetMarkHandles() } else { - for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) + for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); SdrObject* pObj=pM->GetMarkedSdrObj(); SdrPageView* pPV=pM->GetPageView(); - const ULONG nSiz0=aHdl.GetHdlCount(); + const sal_uIntPtr nSiz0=aHdl.GetHdlCount(); pObj->AddToHdlList(aHdl); - const ULONG nSiz1=aHdl.GetHdlCount(); + const sal_uIntPtr nSiz1=aHdl.GetHdlCount(); bool bPoly=pObj->IsPolyObj(); const SdrUShortCont* pMrkPnts=pM->GetMarkedPoints(); - for (ULONG i=nSiz0; i<nSiz1; i++) + for (sal_uIntPtr i=nSiz0; i<nSiz1; i++) { SdrHdl* pHdl=aHdl.GetHdl(i); pHdl->SetObj(pObj); pHdl->SetPageView(pPV); - pHdl->SetObjHdlNum(USHORT(i-nSiz0)); + pHdl->SetObjHdlNum(sal_uInt16(i-nSiz0)); if (bPoly) { - BOOL bSelected=pMrkPnts!=NULL && pMrkPnts->Exist(USHORT(i-nSiz0)); + sal_Bool bSelected=pMrkPnts!=NULL && pMrkPnts->Exist(sal_uInt16(i-nSiz0)); pHdl->SetSelected(bSelected); - //BOOL bPlus=bPlusHdlAlways; + //sal_Bool bPlus=bPlusHdlAlways; if (bPlusHdlAlways || bSelected) { sal_uInt32 nPlusAnz=pObj->GetPlusHdlCount(*pHdl); @@ -818,7 +818,7 @@ void SdrMarkView::SetMarkHandles() { pPlusHdl->SetObj(pObj); pPlusHdl->SetPageView(pPV); - pPlusHdl->SetPlusHdl(TRUE); + pPlusHdl->SetPlusHdl(sal_True); aHdl.AddHdl(pPlusHdl); } } @@ -829,7 +829,7 @@ void SdrMarkView::SetMarkHandles() } // if bFrmHdl else // GluePoint-Handles - for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) + for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); SdrObject* pObj=pM->GetMarkedSdrObj(); @@ -840,13 +840,13 @@ void SdrMarkView::SetMarkHandles() const SdrGluePointList* pGPL=pObj->GetGluePointList(); if (pGPL!=NULL) { - //USHORT nGlueAnz=pGPL->GetCount(); - USHORT nAnz=(USHORT)pMrkGlue->GetCount(); - for (USHORT nNum=0; nNum<nAnz; nNum++) + //sal_uInt16 nGlueAnz=pGPL->GetCount(); + sal_uInt16 nAnz=(sal_uInt16)pMrkGlue->GetCount(); + for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) { - USHORT nId=pMrkGlue->GetObject(nNum); + sal_uInt16 nId=pMrkGlue->GetObject(nNum); //nNum changed to nNumGP because already used in for loop - USHORT nNumGP=pGPL->FindGluePoint(nId); + sal_uInt16 nNumGP=pGPL->FindGluePoint(nId); if (nNumGP!=SDRGLUEPOINT_NOTFOUND) { const SdrGluePoint& rGP=(*pGPL)[nNumGP]; @@ -947,21 +947,21 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode) case SDRDRAG_TRANSPARENCE: { // add interactive transparence handle - ULONG nMarkAnz = GetMarkedObjectCount(); + sal_uIntPtr nMarkAnz = GetMarkedObjectCount(); if(nMarkAnz == 1) { SdrObject* pObj = GetMarkedObjectByIndex(0); SdrModel* pModel = GetModel(); const SfxItemSet& rSet = pObj->GetMergedItemSet(); - if(SFX_ITEM_SET != rSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, FALSE)) + if(SFX_ITEM_SET != rSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, sal_False)) { // add this item, it's not yet there XFillFloatTransparenceItem aNewItem( (const XFillFloatTransparenceItem&)rSet.Get(XATTR_FILLFLOATTRANSPARENCE)); XGradient aGrad = aNewItem.GetGradientValue(); - aNewItem.SetEnabled(TRUE); + aNewItem.SetEnabled(sal_True); aGrad.SetStartIntens(100); aGrad.SetEndIntens(100); aNewItem.SetGradientValue(aGrad); @@ -991,9 +991,9 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode) // build handles const Point aTmpPos1(basegfx::fround(aGradTransVector.maPositionA.getX()), basegfx::fround(aGradTransVector.maPositionA.getY())); const Point aTmpPos2(basegfx::fround(aGradTransVector.maPositionB.getX()), basegfx::fround(aGradTransVector.maPositionB.getY())); - SdrHdlColor* pColHdl1 = new SdrHdlColor(aTmpPos1, aGradTransVector.aCol1, SDR_HANDLE_COLOR_SIZE_NORMAL, TRUE); - SdrHdlColor* pColHdl2 = new SdrHdlColor(aTmpPos2, aGradTransVector.aCol2, SDR_HANDLE_COLOR_SIZE_NORMAL, TRUE); - SdrHdlGradient* pGradHdl = new SdrHdlGradient(aTmpPos1, aTmpPos2, FALSE); + SdrHdlColor* pColHdl1 = new SdrHdlColor(aTmpPos1, aGradTransVector.aCol1, SDR_HANDLE_COLOR_SIZE_NORMAL, sal_True); + SdrHdlColor* pColHdl2 = new SdrHdlColor(aTmpPos2, aGradTransVector.aCol2, SDR_HANDLE_COLOR_SIZE_NORMAL, sal_True); + SdrHdlGradient* pGradHdl = new SdrHdlGradient(aTmpPos1, aTmpPos2, sal_False); DBG_ASSERT(pColHdl1 && pColHdl2 && pGradHdl, "Got not all necessary handles!!"); // link them @@ -1012,7 +1012,7 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode) case SDRDRAG_GRADIENT: { // add interactive gradient handle - ULONG nMarkAnz = GetMarkedObjectCount(); + sal_uIntPtr nMarkAnz = GetMarkedObjectCount(); if(nMarkAnz == 1) { SdrObject* pObj = GetMarkedObjectByIndex(0); @@ -1033,9 +1033,9 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode) // build handles const Point aTmpPos1(basegfx::fround(aGradTransVector.maPositionA.getX()), basegfx::fround(aGradTransVector.maPositionA.getY())); const Point aTmpPos2(basegfx::fround(aGradTransVector.maPositionB.getX()), basegfx::fround(aGradTransVector.maPositionB.getY())); - SdrHdlColor* pColHdl1 = new SdrHdlColor(aTmpPos1, aGradTransVector.aCol1, aHdlSize, FALSE); - SdrHdlColor* pColHdl2 = new SdrHdlColor(aTmpPos2, aGradTransVector.aCol2, aHdlSize, FALSE); - SdrHdlGradient* pGradHdl = new SdrHdlGradient(aTmpPos1, aTmpPos2, TRUE); + SdrHdlColor* pColHdl1 = new SdrHdlColor(aTmpPos1, aGradTransVector.aCol1, aHdlSize, sal_False); + SdrHdlColor* pColHdl2 = new SdrHdlColor(aTmpPos2, aGradTransVector.aCol2, aHdlSize, sal_False); + SdrHdlGradient* pGradHdl = new SdrHdlGradient(aTmpPos1, aTmpPos2, sal_True); DBG_ASSERT(pColHdl1 && pColHdl2 && pGradHdl, "Got not all necessary handles!!"); // link them @@ -1062,7 +1062,7 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode) } /** handle mouse over effects for handles */ -BOOL SdrMarkView::MouseMove(const MouseEvent& rMEvt, Window* pWin) +sal_Bool SdrMarkView::MouseMove(const MouseEvent& rMEvt, Window* pWin) { if(aHdl.GetHdlCount()) { @@ -1074,9 +1074,9 @@ BOOL SdrMarkView::MouseMove(const MouseEvent& rMEvt, Window* pWin) } // notify last mouse over handle that he lost the mouse - const ULONG nHdlCount = aHdl.GetHdlCount(); + const sal_uIntPtr nHdlCount = aHdl.GetHdlCount(); - for(ULONG nHdl = 0; nHdl < nHdlCount; nHdl++ ) + for(sal_uIntPtr nHdl = 0; nHdl < nHdlCount; nHdl++ ) { SdrHdl* pCurrentHdl = GetHdl(nHdl); if( pCurrentHdl->mbMouseOver ) @@ -1216,13 +1216,13 @@ void SdrMarkView::SetRef2(const Point& rPt) void SdrMarkView::CheckMarked() { - for (ULONG nm=GetMarkedObjectCount(); nm>0;) { + for (sal_uIntPtr nm=GetMarkedObjectCount(); nm>0;) { nm--; SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); SdrPageView* pPV=pM->GetPageView(); SdrLayerID nLay=pObj->GetLayer(); - BOOL bRaus=!pObj->IsInserted(); // Obj geloescht? + sal_Bool bRaus=!pObj->IsInserted(); // Obj geloescht? if (!pObj->Is3DObj()) { bRaus=bRaus || pObj->GetPage()!=pPV->GetPage(); // Obj ploetzlich in anderer Page oder Group } @@ -1261,7 +1261,7 @@ void SdrMarkView::CheckMarked() // #97995# at least reset the remembered BoundRect to prevent handle // generation if bForceFrameHandles is TRUE. - bMarkedObjRectDirty = TRUE; + bMarkedObjRectDirty = sal_True; } void SdrMarkView::SetMarkRects() @@ -1275,12 +1275,12 @@ void SdrMarkView::SetMarkRects() } } -void SdrMarkView::SetFrameHandles(BOOL bOn) +void SdrMarkView::SetFrameHandles(sal_Bool bOn) { if (bOn!=bForceFrameHandles) { - BOOL bOld=ImpIsFrameHandles(); + sal_Bool bOld=ImpIsFrameHandles(); bForceFrameHandles=bOn; - BOOL bNew=ImpIsFrameHandles(); + sal_Bool bNew=ImpIsFrameHandles(); if (bNew!=bOld) { AdjustMarkHdl(); //HMHTRUE); MarkListHasChanged(); @@ -1291,12 +1291,12 @@ void SdrMarkView::SetFrameHandles(BOOL bOn) void SdrMarkView::SetEditMode(SdrViewEditMode eMode) { if (eMode!=eEditMode) { - BOOL bGlue0=eEditMode==SDREDITMODE_GLUEPOINTEDIT; - BOOL bEdge0=((SdrCreateView*)this)->IsEdgeTool(); + sal_Bool bGlue0=eEditMode==SDREDITMODE_GLUEPOINTEDIT; + sal_Bool bEdge0=((SdrCreateView*)this)->IsEdgeTool(); eEditMode0=eEditMode; eEditMode=eMode; - BOOL bGlue1=eEditMode==SDREDITMODE_GLUEPOINTEDIT; - BOOL bEdge1=((SdrCreateView*)this)->IsEdgeTool(); + sal_Bool bGlue1=eEditMode==SDREDITMODE_GLUEPOINTEDIT; + sal_Bool bEdge1=((SdrCreateView*)this)->IsEdgeTool(); // etwas Aufwand um Flackern zu verhindern beim Umschalten // zwischen GlueEdit und EdgeTool if (bGlue1 && !bGlue0) ImpSetGlueVisible2(bGlue1); @@ -1308,7 +1308,7 @@ void SdrMarkView::SetEditMode(SdrViewEditMode eMode) //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SdrMarkView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const +sal_Bool SdrMarkView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const { if (pObj) { @@ -1317,65 +1317,65 @@ BOOL SdrMarkView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const { // Objekt nicht selektierbar oder // SdrUnoObj nicht im DesignMode - return FALSE; + return sal_False; } } - return pPV!=NULL ? pPV->IsObjMarkable(pObj) : TRUE; + return pPV!=NULL ? pPV->IsObjMarkable(pObj) : sal_True; } -BOOL SdrMarkView::IsMarkedObjHit(const Point& rPnt, short nTol) const +sal_Bool SdrMarkView::IsMarkedObjHit(const Point& rPnt, short nTol) const { - BOOL bRet=FALSE; + sal_Bool bRet=sal_False; nTol=ImpGetHitTolLogic(nTol,NULL); Point aPt(rPnt); - for (ULONG nm=0; nm<GetMarkedObjectCount() && !bRet; nm++) { + for (sal_uIntPtr nm=0; nm<GetMarkedObjectCount() && !bRet; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); - bRet = 0 != CheckSingleSdrObjectHit(aPt,USHORT(nTol),pM->GetMarkedSdrObj(),pM->GetPageView(),0,0); + bRet = 0 != CheckSingleSdrObjectHit(aPt,sal_uInt16(nTol),pM->GetMarkedSdrObj(),pM->GetPageView(),0,0); } return bRet; } -SdrHdl* SdrMarkView::PickHandle(const Point& rPnt, ULONG nOptions, SdrHdl* pHdl0) const +SdrHdl* SdrMarkView::PickHandle(const Point& rPnt, sal_uIntPtr nOptions, SdrHdl* pHdl0) const { if (bSomeObjChgdFlag) { // ggf. Handles neu berechnen lassen! FlushComeBackTimer(); } - BOOL bBack=(nOptions & SDRSEARCH_BACKWARD) !=0; - BOOL bNext=(nOptions & SDRSEARCH_NEXT) !=0; + sal_Bool bBack=(nOptions & SDRSEARCH_BACKWARD) !=0; + sal_Bool bNext=(nOptions & SDRSEARCH_NEXT) !=0; Point aPt(rPnt); return aHdl.IsHdlListHit(aPt,bBack,bNext,pHdl0); } -BOOL SdrMarkView::MarkObj(const Point& rPnt, short nTol, BOOL bToggle, BOOL bDeep) +sal_Bool SdrMarkView::MarkObj(const Point& rPnt, short nTol, sal_Bool bToggle, sal_Bool bDeep) { SdrObject* pObj; SdrPageView* pPV; nTol=ImpGetHitTolLogic(nTol,NULL); - ULONG nOptions=SDRSEARCH_PICKMARKABLE; + sal_uIntPtr nOptions=SDRSEARCH_PICKMARKABLE; if (bDeep) nOptions=nOptions|SDRSEARCH_DEEP; - BOOL bRet=PickObj(rPnt,(USHORT)nTol,pObj,pPV,nOptions); + sal_Bool bRet=PickObj(rPnt,(sal_uInt16)nTol,pObj,pPV,nOptions); if (bRet) { - BOOL bUnmark=bToggle && IsObjMarked(pObj); + sal_Bool bUnmark=bToggle && IsObjMarked(pObj); MarkObj(pObj,pPV,bUnmark); } return bRet; } -BOOL SdrMarkView::MarkNextObj(BOOL bPrev) +sal_Bool SdrMarkView::MarkNextObj(sal_Bool bPrev) { SdrPageView* pPageView = GetSdrPageView(); if(!pPageView) { - return FALSE; + return sal_False; } SortMarkedObjects(); - ULONG nMarkAnz=GetMarkedObjectCount(); - ULONG nChgMarkNum = ULONG_MAX; // Nummer des zu ersetzenden MarkEntries - ULONG nSearchObjNum = bPrev ? 0 : ULONG_MAX; + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + sal_uIntPtr nChgMarkNum = ULONG_MAX; // Nummer des zu ersetzenden MarkEntries + sal_uIntPtr nSearchObjNum = bPrev ? 0 : ULONG_MAX; if (nMarkAnz!=0) { - nChgMarkNum=bPrev ? 0 : ULONG(nMarkAnz-1); + nChgMarkNum=bPrev ? 0 : sal_uIntPtr(nMarkAnz-1); SdrMark* pM=GetSdrMarkByIndex(nChgMarkNum); OSL_ASSERT(pM!=NULL); if (pM->GetMarkedSdrObj() != NULL) @@ -1384,7 +1384,7 @@ BOOL SdrMarkView::MarkNextObj(BOOL bPrev) SdrObject* pMarkObj=NULL; SdrObjList* pSearchObjList=pPageView->GetObjList(); - ULONG nObjAnz=pSearchObjList->GetObjCount(); + sal_uIntPtr nObjAnz=pSearchObjList->GetObjCount(); if (nObjAnz!=0) { if (nSearchObjNum>nObjAnz) nSearchObjNum=nObjAnz; while (pMarkObj==NULL && ((!bPrev && nSearchObjNum>0) || (bPrev && nSearchObjNum<nObjAnz))) @@ -1405,7 +1405,7 @@ BOOL SdrMarkView::MarkNextObj(BOOL bPrev) if(!pMarkObj) { - return FALSE; + return sal_False; } if (nChgMarkNum!=ULONG_MAX) @@ -1413,32 +1413,32 @@ BOOL SdrMarkView::MarkNextObj(BOOL bPrev) GetMarkedObjectListWriteAccess().DeleteMark(nChgMarkNum); } MarkObj(pMarkObj,pPageView); // ruft auch MarkListHasChanged(), AdjustMarkHdl() - return TRUE; + return sal_True; } -BOOL SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, BOOL bPrev) +sal_Bool SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, sal_Bool bPrev) { SortMarkedObjects(); nTol=ImpGetHitTolLogic(nTol,NULL); Point aPt(rPnt); SdrMark* pTopMarkHit=NULL; SdrMark* pBtmMarkHit=NULL; - ULONG nTopMarkHit=0; - ULONG nBtmMarkHit=0; + sal_uIntPtr nTopMarkHit=0; + sal_uIntPtr nBtmMarkHit=0; // oberstes der markierten Objekte suchen, das von rPnt getroffen wird - ULONG nMarkAnz=GetMarkedObjectCount(); - ULONG nm=0; + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + sal_uIntPtr nm=0; for (nm=nMarkAnz; nm>0 && pTopMarkHit==NULL;) { nm--; SdrMark* pM=GetSdrMarkByIndex(nm); - if(CheckSingleSdrObjectHit(aPt,USHORT(nTol),pM->GetMarkedSdrObj(),pM->GetPageView(),0,0)) + if(CheckSingleSdrObjectHit(aPt,sal_uInt16(nTol),pM->GetMarkedSdrObj(),pM->GetPageView(),0,0)) { pTopMarkHit=pM; nTopMarkHit=nm; } } // Nichts gefunden, dann ganz normal ein Obj markieren. - if (pTopMarkHit==NULL) return MarkObj(rPnt,USHORT(nTol),FALSE); + if (pTopMarkHit==NULL) return MarkObj(rPnt,sal_uInt16(nTol),sal_False); SdrObject* pTopObjHit=pTopMarkHit->GetMarkedSdrObj(); SdrObjList* pObjList=pTopObjHit->GetObjList(); @@ -1448,7 +1448,7 @@ BOOL SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, BOOL bPrev) for (nm=0; nm<nMarkAnz && pBtmMarkHit==NULL; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrPageView* pPV2=pM->GetPageView(); - if (pPV2==pPV && CheckSingleSdrObjectHit(aPt,USHORT(nTol),pM->GetMarkedSdrObj(),pPV2,0,0)) + if (pPV2==pPV && CheckSingleSdrObjectHit(aPt,sal_uInt16(nTol),pM->GetMarkedSdrObj(),pPV2,0,0)) { pBtmMarkHit=pM; nBtmMarkHit=nm; @@ -1456,10 +1456,10 @@ BOOL SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, BOOL bPrev) } if (pBtmMarkHit==NULL) { pBtmMarkHit=pTopMarkHit; nBtmMarkHit=nTopMarkHit; } SdrObject* pBtmObjHit=pBtmMarkHit->GetMarkedSdrObj(); - ULONG nObjAnz=pObjList->GetObjCount(); + sal_uIntPtr nObjAnz=pObjList->GetObjCount(); // #110988# - //ULONG nSearchBeg=bPrev ? pBtmObjHit->GetOrdNum()+1 : pTopObjHit->GetOrdNum(); + //sal_uIntPtr nSearchBeg=bPrev ? pBtmObjHit->GetOrdNum()+1 : pTopObjHit->GetOrdNum(); sal_uInt32 nSearchBeg; E3dScene* pScene = NULL; SdrObject* pObjHit = (bPrev) ? pBtmObjHit : pTopObjHit; @@ -1490,7 +1490,7 @@ BOOL SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, BOOL bPrev) nSearchBeg = nOrdNumTop; } - ULONG no=nSearchBeg; + sal_uIntPtr no=nSearchBeg; SdrObject* pFndObj=NULL; //SdrObject* pAktObj=NULL; while (pFndObj==NULL && ((!bPrev && no>0) || (bPrev && no<nObjAnz))) { @@ -1506,7 +1506,7 @@ BOOL SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, BOOL bPrev) pObj = pObjList->GetObj(no); } - if (CheckSingleSdrObjectHit(aPt,USHORT(nTol),pObj,pPV,SDRSEARCH_TESTMARKABLE,0)) + if (CheckSingleSdrObjectHit(aPt,sal_uInt16(nTol),pObj,pPV,SDRSEARCH_TESTMARKABLE,0)) { if (TryToFindMarkedObject(pObj)==CONTAINER_ENTRY_NOTFOUND) { pFndObj=pObj; @@ -1526,9 +1526,9 @@ BOOL SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, BOOL bPrev) return pFndObj!=NULL; } -BOOL SdrMarkView::MarkObj(const Rectangle& rRect, BOOL bUnmark) +sal_Bool SdrMarkView::MarkObj(const Rectangle& rRect, sal_Bool bUnmark) { - BOOL bFnd=FALSE; + sal_Bool bFnd=sal_False; Rectangle aR(rRect); SdrObject* pObj; SdrObjList* pObjList; @@ -1539,8 +1539,8 @@ BOOL SdrMarkView::MarkObj(const Rectangle& rRect, BOOL bUnmark) { pObjList=pPV->GetObjList(); Rectangle aFrm1(aR); - ULONG nObjAnz=pObjList->GetObjCount(); - for (ULONG nO=0; nO<nObjAnz; nO++) { + sal_uIntPtr nObjAnz=pObjList->GetObjCount(); + for (sal_uIntPtr nO=0; nO<nObjAnz; nO++) { pObj=pObjList->GetObj(nO); Rectangle aRect(pObj->GetCurrentBoundRect()); if (aFrm1.IsInside(aRect)) { @@ -1548,14 +1548,14 @@ BOOL SdrMarkView::MarkObj(const Rectangle& rRect, BOOL bUnmark) if (IsObjMarkable(pObj,pPV)) { GetMarkedObjectListWriteAccess().InsertEntry(SdrMark(pObj,pPV)); - bFnd=TRUE; + bFnd=sal_True; } } else { - ULONG nPos=TryToFindMarkedObject(pObj); + sal_uIntPtr nPos=TryToFindMarkedObject(pObj); if (nPos!=CONTAINER_ENTRY_NOTFOUND) { GetMarkedObjectListWriteAccess().DeleteMark(nPos); - bFnd=TRUE; + bFnd=sal_True; } } } @@ -1570,7 +1570,7 @@ BOOL SdrMarkView::MarkObj(const Rectangle& rRect, BOOL bUnmark) return bFnd; } -void SdrMarkView::MarkObj(SdrObject* pObj, SdrPageView* pPV, BOOL bUnmark, BOOL bImpNoSetMarkHdl) +void SdrMarkView::MarkObj(SdrObject* pObj, SdrPageView* pPV, sal_Bool bUnmark, sal_Bool bImpNoSetMarkHdl) { if (pObj!=NULL && pPV!=NULL && IsObjMarkable(pObj, pPV)) { BrkAction(); @@ -1580,7 +1580,7 @@ void SdrMarkView::MarkObj(SdrObject* pObj, SdrPageView* pPV, BOOL bUnmark, BOOL } else { - ULONG nPos=TryToFindMarkedObject(pObj); + sal_uIntPtr nPos=TryToFindMarkedObject(pObj); if (nPos!=CONTAINER_ENTRY_NOTFOUND) { GetMarkedObjectListWriteAccess().DeleteMark(nPos); @@ -1597,20 +1597,20 @@ void SdrMarkView::MarkObj(SdrObject* pObj, SdrPageView* pPV, BOOL bUnmark, BOOL } } -BOOL SdrMarkView::IsObjMarked(SdrObject* pObj) const +sal_Bool SdrMarkView::IsObjMarked(SdrObject* pObj) const { // nicht so ganz die feine Art: Da FindObject() nicht const ist // muss ich mich hier auf non-const casten. - ULONG nPos=((SdrMarkView*)this)->TryToFindMarkedObject(pObj); + sal_uIntPtr nPos=((SdrMarkView*)this)->TryToFindMarkedObject(pObj); return nPos!=CONTAINER_ENTRY_NOTFOUND; } -USHORT SdrMarkView::GetMarkHdlSizePixel() const +sal_uInt16 SdrMarkView::GetMarkHdlSizePixel() const { return aHdl.GetHdlSize()*2+1; } -void SdrMarkView::SetSolidMarkHdl(BOOL bOn) +void SdrMarkView::SetSolidMarkHdl(sal_Bool bOn) { if (bOn!=aHdl.IsFineHdl()) { //HMHBOOL bMerk=IsMarkHdlShown(); @@ -1620,7 +1620,7 @@ void SdrMarkView::SetSolidMarkHdl(BOOL bOn) } } -void SdrMarkView::SetMarkHdlSizePixel(USHORT nSiz) +void SdrMarkView::SetMarkHdlSizePixel(sal_uInt16 nSiz) { if (nSiz<3) nSiz=3; nSiz/=2; @@ -1633,7 +1633,7 @@ void SdrMarkView::SetMarkHdlSizePixel(USHORT nSiz) } #define SDRSEARCH_IMPISMASTER 0x80000000 /* MasterPage wird gerade durchsucht */ -SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, SdrObject* pObj, SdrPageView* pPV, ULONG nOptions, const SetOfByte* pMVisLay) const +SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, sal_uIntPtr nOptions, const SetOfByte* pMVisLay) const { if(((nOptions & SDRSEARCH_IMPISMASTER) && pObj->IsNotVisibleAsMaster()) || (!pObj->IsVisible())) { @@ -1646,7 +1646,7 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, const bool bTXT(pObj->ISA(SdrTextObj) && ((SdrTextObj*)pObj)->IsTextFrame()); SdrObject* pRet=NULL; Rectangle aRect(pObj->GetCurrentBoundRect()); - USHORT nTol2(nTol); + sal_uInt16 nTol2(nTol); // double tolerance for OLE, text frames and objects in // active text edit @@ -1699,9 +1699,9 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, return pRet; } -SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, SdrObjList* pOL, SdrPageView* pPV, ULONG nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj) const +SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList* pOL, SdrPageView* pPV, sal_uIntPtr nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj) const { - BOOL bBack=(nOptions & SDRSEARCH_BACKWARD)!=0; + sal_Bool bBack=(nOptions & SDRSEARCH_BACKWARD)!=0; SdrObject* pRet=NULL; rpRootObj=NULL; if (pOL!=NULL) @@ -1710,8 +1710,8 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, sal_Bool bRemap(pOL->GetOwnerObj() && pOL->GetOwnerObj()->ISA(E3dScene)); E3dScene* pRemapScene = (bRemap ? (E3dScene*)pOL->GetOwnerObj() : 0L); - ULONG nObjAnz=pOL->GetObjCount(); - ULONG nObjNum=bBack ? 0 : nObjAnz; + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + sal_uIntPtr nObjNum=bBack ? 0 : nObjAnz; while (pRet==NULL && (bBack ? nObjNum<nObjAnz : nObjNum>0)) { if (!bBack) nObjNum--; SdrObject* pObj; @@ -1734,12 +1734,12 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, return pRet; } -BOOL SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG nOptions) const +sal_Bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions) const { return PickObj(rPnt,nTol,rpObj,rpPV,nOptions,NULL,NULL,NULL); } -BOOL SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG nOptions, SdrObject** ppRootObj, ULONG* pnMarkNum, USHORT* pnPassNum) const +sal_Bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions, SdrObject** ppRootObj, sal_uIntPtr* pnMarkNum, sal_uInt16* pnPassNum) const { // Fehlt noch Pass2,Pass3 SortMarkedObjects(); if (ppRootObj!=NULL) *ppRootObj=NULL; @@ -1747,14 +1747,14 @@ BOOL SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrP if (pnPassNum!=NULL) *pnPassNum=0; rpObj=NULL; rpPV=NULL; - BOOL bWholePage=(nOptions & SDRSEARCH_WHOLEPAGE) !=0; - BOOL bMarked=(nOptions & SDRSEARCH_MARKED) !=0; - BOOL bMasters=!bMarked && (nOptions & SDRSEARCH_ALSOONMASTER) !=0; - BOOL bBack=(nOptions & SDRSEARCH_BACKWARD) !=0; + sal_Bool bWholePage=(nOptions & SDRSEARCH_WHOLEPAGE) !=0; + sal_Bool bMarked=(nOptions & SDRSEARCH_MARKED) !=0; + sal_Bool bMasters=!bMarked && (nOptions & SDRSEARCH_ALSOONMASTER) !=0; + sal_Bool bBack=(nOptions & SDRSEARCH_BACKWARD) !=0; #if OSL_DEBUG_LEVEL > 0 - BOOL bNext=(nOptions & SDRSEARCH_NEXT) !=0; (void)bNext; // n.i. - BOOL bBoundCheckOn2ndPass=(nOptions & SDRSEARCH_PASS2BOUND) !=0; (void)bBoundCheckOn2ndPass;// n.i. - BOOL bCheckNearestOn3rdPass=(nOptions & SDRSEARCH_PASS3NEAREST) !=0; (void)bCheckNearestOn3rdPass;// n.i. + sal_Bool bNext=(nOptions & SDRSEARCH_NEXT) !=0; (void)bNext; // n.i. + sal_Bool bBoundCheckOn2ndPass=(nOptions & SDRSEARCH_PASS2BOUND) !=0; (void)bBoundCheckOn2ndPass;// n.i. + sal_Bool bCheckNearestOn3rdPass=(nOptions & SDRSEARCH_PASS3NEAREST) !=0; (void)bCheckNearestOn3rdPass;// n.i. #endif if (nTol<0) nTol=ImpGetHitTolLogic(nTol,NULL); Point aPt(rPnt); @@ -1767,8 +1767,8 @@ BOOL SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrP pPV=((SdrObjEditView*)this)->GetTextEditPageView(); } if (bMarked) { - ULONG nMrkAnz=GetMarkedObjectCount(); - ULONG nMrkNum=bBack ? 0 : nMrkAnz; + sal_uIntPtr nMrkAnz=GetMarkedObjectCount(); + sal_uIntPtr nMrkNum=bBack ? 0 : nMrkAnz; while (pHitObj==NULL && (bBack ? nMrkNum<nMrkAnz : nMrkNum>0)) { if (!bBack) nMrkNum--; SdrMark* pM=GetSdrMarkByIndex(nMrkNum); @@ -1785,18 +1785,18 @@ BOOL SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrP if(pPV) { SdrPage* pPage=pPV->GetPage(); - USHORT nPgAnz=1; + sal_uInt16 nPgAnz=1; if(bMasters && pPage->TRG_HasMasterPage()) { nPgAnz++; } - BOOL bExtraPassForWholePage=bWholePage && pPage!=pPV->GetObjList(); + sal_Bool bExtraPassForWholePage=bWholePage && pPage!=pPV->GetObjList(); if (bExtraPassForWholePage) nPgAnz++; // Suche erst in AktObjList, dann auf der gesamten Page - USHORT nPgNum=bBack ? 0 : nPgAnz; + sal_uInt16 nPgNum=bBack ? 0 : nPgAnz; while (pHitObj==NULL && (bBack ? nPgNum<nPgAnz : nPgNum>0)) { - ULONG nTmpOptions=nOptions; + sal_uIntPtr nTmpOptions=nOptions; if (!bBack) nPgNum--; const SetOfByte* pMVisLay=NULL; SdrObjList* pObjList=NULL; @@ -1858,19 +1858,19 @@ BOOL SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrP return rpObj!=NULL; } -BOOL SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG* pnMarkNum, ULONG nOptions) const +sal_Bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr* pnMarkNum, sal_uIntPtr nOptions) const { SortMarkedObjects(); - BOOL bBoundCheckOn2ndPass=(nOptions & SDRSEARCH_PASS2BOUND) !=0; - BOOL bCheckNearestOn3rdPass=(nOptions & SDRSEARCH_PASS3NEAREST) !=0; + sal_Bool bBoundCheckOn2ndPass=(nOptions & SDRSEARCH_PASS2BOUND) !=0; + sal_Bool bCheckNearestOn3rdPass=(nOptions & SDRSEARCH_PASS3NEAREST) !=0; rpObj=NULL; rpPV=NULL; if (pnMarkNum!=NULL) *pnMarkNum=CONTAINER_ENTRY_NOTFOUND; Point aPt(rPnt); - USHORT nTol=(USHORT)nHitTolLog; - BOOL bFnd=FALSE; - ULONG nMarkAnz=GetMarkedObjectCount(); - ULONG nMarkNum; + sal_uInt16 nTol=(sal_uInt16)nHitTolLog; + sal_Bool bFnd=sal_False; + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + sal_uIntPtr nMarkNum; for (nMarkNum=nMarkAnz; nMarkNum>0 && !bFnd;) { nMarkNum--; SdrMark* pM=GetSdrMarkByIndex(nMarkNum); @@ -1886,8 +1886,8 @@ BOOL SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageVie if ((bBoundCheckOn2ndPass || bCheckNearestOn3rdPass) && !bFnd) { SdrObject* pBestObj=NULL; SdrPageView* pBestPV=NULL; - ULONG nBestMarkNum=0; - ULONG nBestDist=ULONG_MAX; + sal_uIntPtr nBestMarkNum=0; + sal_uIntPtr nBestDist=ULONG_MAX; for (nMarkNum=nMarkAnz; nMarkNum>0 && !bFnd;) { nMarkNum--; SdrMark* pM=GetSdrMarkByIndex(nMarkNum); @@ -1899,12 +1899,12 @@ BOOL SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageVie aRect.Right ()+=nTol; aRect.Bottom()+=nTol; if (aRect.IsInside(aPt)) { - bFnd=TRUE; + bFnd=sal_True; rpObj=pObj; rpPV=pPV; if (pnMarkNum!=NULL) *pnMarkNum=nMarkNum; } else if (bCheckNearestOn3rdPass) { - ULONG nDist=0; + sal_uIntPtr nDist=0; if (aPt.X()<aRect.Left()) nDist+=aRect.Left()-aPt.X(); if (aPt.X()>aRect.Right()) nDist+=aPt.X()-aRect.Right(); if (aPt.Y()<aRect.Top()) nDist+=aRect.Top()-aPt.Y(); @@ -1933,7 +1933,7 @@ SdrHitKind SdrMarkView::PickSomething(const Point& rPnt, short nTol) const Point aPt(rPnt); SdrObject* pObj=NULL; SdrPageView* pPV=NULL; - if (eRet==SDRHIT_NONE && PickObj(rPnt,USHORT(nTol),pObj,pPV,SDRSEARCH_PICKMARKABLE)) { + if (eRet==SDRHIT_NONE && PickObj(rPnt,sal_uInt16(nTol),pObj,pPV,SDRSEARCH_PICKMARKABLE)) { Rectangle aRct1(aPt-Point(nTol,nTol),aPt+Point(nTol,nTol)); // HitRect fuer Toleranz Rectangle aBR(pObj->GetCurrentBoundRect()); if (aRct1.IsInside(aBR.TopLeft())) eRet=SDRHIT_BOUNDTL; @@ -2016,7 +2016,7 @@ void SdrMarkView::AdjustMarkHdl() //HMHBOOL bRestraintPaint) Rectangle SdrMarkView::GetMarkedObjBoundRect() const { Rectangle aRect; - for (ULONG nm=0; nm<GetMarkedObjectCount(); nm++) { + for (sal_uIntPtr nm=0; nm<GetMarkedObjectCount(); nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pO=pM->GetMarkedSdrObj(); Rectangle aR1(pO->GetCurrentBoundRect()); @@ -2029,9 +2029,9 @@ Rectangle SdrMarkView::GetMarkedObjBoundRect() const const Rectangle& SdrMarkView::GetMarkedObjRect() const { if (bMarkedObjRectDirty) { - ((SdrMarkView*)this)->bMarkedObjRectDirty=FALSE; + ((SdrMarkView*)this)->bMarkedObjRectDirty=sal_False; Rectangle aRect; - for (ULONG nm=0; nm<GetMarkedObjectCount(); nm++) { + for (sal_uIntPtr nm=0; nm<GetMarkedObjectCount(); nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pO=pM->GetMarkedSdrObj(); Rectangle aR1(pO->GetSnapRect()); @@ -2045,7 +2045,7 @@ const Rectangle& SdrMarkView::GetMarkedObjRect() const //////////////////////////////////////////////////////////////////////////////////////////////////// -void SdrMarkView::ImpTakeDescriptionStr(USHORT nStrCacheID, XubString& rStr, USHORT nVal, USHORT nOpt) const +void SdrMarkView::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr, sal_uInt16 nVal, sal_uInt16 nOpt) const { rStr = ImpGetResStr(nStrCacheID); xub_StrLen nPos = rStr.SearchAscii("%1"); @@ -2079,9 +2079,9 @@ void SdrMarkView::ImpTakeDescriptionStr(USHORT nStrCacheID, XubString& rStr, USH //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SdrMarkView::EnterMarkedGroup() +sal_Bool SdrMarkView::EnterMarkedGroup() { - BOOL bRet=FALSE; + sal_Bool bRet=sal_False; // Es wird nur die erste gefundene Gruppe (also nur in einer PageView) geentert // Weil PageView::EnterGroup ein AdjustMarkHdl ruft. // Das muss ich per Flag mal unterbinden vvvvvvvv @@ -2089,7 +2089,7 @@ BOOL SdrMarkView::EnterMarkedGroup() if(pPV) { - BOOL bEnter=FALSE; + sal_Bool bEnter=sal_False; for (sal_uInt32 nm(GetMarkedObjectCount()); nm > 0 && !bEnter;) { nm--; @@ -2098,8 +2098,8 @@ BOOL SdrMarkView::EnterMarkedGroup() SdrObject* pObj=pM->GetMarkedSdrObj(); if (pObj->IsGroupObject()) { if (pPV->EnterGroup(pObj)) { - bRet=TRUE; - bEnter=TRUE; + bRet=sal_True; + bEnter=sal_True; } } } @@ -2113,18 +2113,18 @@ BOOL SdrMarkView::EnterMarkedGroup() void SdrMarkView::MarkListHasChanged() { GetMarkedObjectListWriteAccess().SetNameDirty(); - SetEdgesOfMarkedNodesDirty(); // bEdgesOfMarkedNodesDirty=TRUE; + SetEdgesOfMarkedNodesDirty(); // bEdgesOfMarkedNodesDirty=sal_True; - bMarkedObjRectDirty=TRUE; - bMarkedPointsRectsDirty=TRUE; + bMarkedObjRectDirty=sal_True; + bMarkedPointsRectsDirty=sal_True; #ifdef DBG_UTIL if (pItemBrowser!=NULL) pItemBrowser->SetDirty(); #endif - BOOL bOneEdgeMarked=FALSE; + sal_Bool bOneEdgeMarked=sal_False; if (GetMarkedObjectCount()==1) { const SdrObject* pObj=GetMarkedObjectByIndex(0); if (pObj->GetObjInventor()==SdrInventor) { - UINT16 nIdent=pObj->GetObjIdentifier(); + sal_uInt16 nIdent=pObj->GetObjIdentifier(); bOneEdgeMarked=nIdent==OBJ_EDGE; } } @@ -2133,17 +2133,17 @@ void SdrMarkView::MarkListHasChanged() //////////////////////////////////////////////////////////////////////////////////////////////////// -void SdrMarkView::SetMoveOutside(BOOL bOn) +void SdrMarkView::SetMoveOutside(sal_Bool bOn) { aHdl.SetMoveOutside(bOn); } -BOOL SdrMarkView::IsMoveOutside() const +sal_Bool SdrMarkView::IsMoveOutside() const { return aHdl.IsMoveOutside(); } -void SdrMarkView::SetDesignMode( BOOL _bOn ) +void SdrMarkView::SetDesignMode( sal_Bool _bOn ) { if ( bDesignMode != _bOn ) { diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx index 6f3f0a658d69..3ac2df22674c 100644..100755 --- a/svx/source/svdraw/svdmrkv1.cxx +++ b/svx/source/svdraw/svdmrkv1.cxx @@ -32,7 +32,7 @@ #include <svx/svdmrkv.hxx> #include <svx/svdetc.hxx> #include <svx/svdoedge.hxx> -#include "svdglob.hxx" +#include "svx/svdglob.hxx" #include <svx/svdpagv.hxx> #include <svx/svdpage.hxx> #include "svddrgm1.hxx" @@ -51,14 +51,14 @@ // //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SdrMarkView::HasMarkablePoints() const +sal_Bool SdrMarkView::HasMarkablePoints() const { ForceUndirtyMrkPnt(); bool bRet=false; if (!ImpIsFrameHandles()) { - ULONG nMarkAnz=GetMarkedObjectCount(); + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); if (nMarkAnz<=nFrameHandlesLimit) { - for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) { + for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrObject* pObj=pM->GetMarkedSdrObj(); bRet=pObj->IsPolyObj(); @@ -68,14 +68,14 @@ BOOL SdrMarkView::HasMarkablePoints() const return bRet; } -ULONG SdrMarkView::GetMarkablePointCount() const +sal_uIntPtr SdrMarkView::GetMarkablePointCount() const { ForceUndirtyMrkPnt(); - ULONG nAnz=0; + sal_uIntPtr nAnz=0; if (!ImpIsFrameHandles()) { - ULONG nMarkAnz=GetMarkedObjectCount(); + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); if (nMarkAnz<=nFrameHandlesLimit) { - for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { + for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrObject* pObj=pM->GetMarkedSdrObj(); if (pObj->IsPolyObj()) { @@ -87,14 +87,14 @@ ULONG SdrMarkView::GetMarkablePointCount() const return nAnz; } -BOOL SdrMarkView::HasMarkedPoints() const +sal_Bool SdrMarkView::HasMarkedPoints() const { ForceUndirtyMrkPnt(); - BOOL bRet=FALSE; + sal_Bool bRet=sal_False; if (!ImpIsFrameHandles()) { - ULONG nMarkAnz=GetMarkedObjectCount(); + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); if (nMarkAnz<=nFrameHandlesLimit) { - for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) { + for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrUShortCont* pPts=pM->GetMarkedPoints(); bRet=pPts!=NULL && pPts->GetCount()!=0; @@ -104,14 +104,14 @@ BOOL SdrMarkView::HasMarkedPoints() const return bRet; } -ULONG SdrMarkView::GetMarkedPointCount() const +sal_uIntPtr SdrMarkView::GetMarkedPointCount() const { ForceUndirtyMrkPnt(); - ULONG nAnz=0; + sal_uIntPtr nAnz=0; if (!ImpIsFrameHandles()) { - ULONG nMarkAnz=GetMarkedObjectCount(); + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); if (nMarkAnz<=nFrameHandlesLimit) { - for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { + for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrUShortCont* pPts=pM->GetMarkedPoints(); if (pPts!=NULL) nAnz+=pPts->GetCount(); @@ -121,33 +121,33 @@ ULONG SdrMarkView::GetMarkedPointCount() const return nAnz; } -BOOL SdrMarkView::IsPointMarkable(const SdrHdl& rHdl) const +sal_Bool SdrMarkView::IsPointMarkable(const SdrHdl& rHdl) const { return !ImpIsFrameHandles() && &rHdl!=NULL && !rHdl.IsPlusHdl() && rHdl.GetKind()!=HDL_GLUE && rHdl.GetKind()!=HDL_SMARTTAG && rHdl.GetObj()!=NULL && rHdl.GetObj()->IsPolyObj(); } -BOOL SdrMarkView::MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark) +sal_Bool SdrMarkView::MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmark) { return ImpMarkPoint( pHdl, pMark, bUnmark ); } -BOOL SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark) +sal_Bool SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmark) { if (pHdl==NULL || pHdl->IsPlusHdl() || pHdl->GetKind()==HDL_GLUE) - return FALSE; + return sal_False; if (pHdl->IsSelected() != bUnmark) - return FALSE; + return sal_False; SdrObject* pObj=pHdl->GetObj(); if (pObj==NULL || !pObj->IsPolyObj()) - return FALSE; + return sal_False; if (pMark==NULL) { - ULONG nMarkNum=TryToFindMarkedObject(pObj); + sal_uIntPtr nMarkNum=TryToFindMarkedObject(pObj); if (nMarkNum==CONTAINER_ENTRY_NOTFOUND) - return FALSE; + return sal_False; pMark=GetSdrMarkByIndex(nMarkNum); } const sal_uInt32 nHdlNum(pHdl->GetObjHdlNum()); @@ -158,14 +158,14 @@ BOOL SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark) } else { - ULONG nBla=pPts->GetPos((sal_uInt16)nHdlNum); + sal_uIntPtr nBla=pPts->GetPos((sal_uInt16)nHdlNum); if (nBla!=CONTAINER_ENTRY_NOTFOUND) { pPts->Remove(nBla); } else { - return FALSE; // Fehlerfall! + return sal_False; // Fehlerfall! } } @@ -182,14 +182,14 @@ BOOL SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark) { pPlusHdl->SetObj(pObj); pPlusHdl->SetPageView(pMark->GetPageView()); - pPlusHdl->SetPlusHdl(TRUE); + pPlusHdl->SetPlusHdl(sal_True); aHdl.AddHdl(pPlusHdl); } } } else { - for (ULONG i = aHdl.GetHdlCount(); i>0;) + for (sal_uIntPtr i = aHdl.GetHdlCount(); i>0;) { i--; SdrHdl* pPlusHdl=aHdl.GetHdl(i); @@ -205,18 +205,18 @@ BOOL SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark) // #97016# II: Sort handles. This was missing in ImpMarkPoint all the time. aHdl.Sort(); - return TRUE; + return sal_True; } -BOOL SdrMarkView::MarkPoint(SdrHdl& rHdl, BOOL bUnmark) +sal_Bool SdrMarkView::MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark) { - if (&rHdl==NULL) return FALSE; + if (&rHdl==NULL) return sal_False; ForceUndirtyMrkPnt(); - BOOL bRet=FALSE; + sal_Bool bRet=sal_False; const SdrObject* pObj=rHdl.GetObj(); if (IsPointMarkable(rHdl) && rHdl.IsSelected()==bUnmark) { - ULONG nMarkNum=TryToFindMarkedObject(pObj); + sal_uIntPtr nMarkNum=TryToFindMarkedObject(pObj); if (nMarkNum!=CONTAINER_ENTRY_NOTFOUND) { SdrMark* pM=GetSdrMarkByIndex(nMarkNum); SdrUShortCont* pPts=pM->ForceMarkedPoints(); @@ -224,7 +224,7 @@ BOOL SdrMarkView::MarkPoint(SdrHdl& rHdl, BOOL bUnmark) if (ImpMarkPoint(&rHdl,pM,bUnmark)) { pPts->ForceSort(); MarkListHasChanged(); - bRet=TRUE; + bRet=sal_True; } } } @@ -232,18 +232,18 @@ BOOL SdrMarkView::MarkPoint(SdrHdl& rHdl, BOOL bUnmark) return bRet; } -BOOL SdrMarkView::MarkPoints(const Rectangle* pRect, BOOL bUnmark) +sal_Bool SdrMarkView::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark) { ForceUndirtyMrkPnt(); - BOOL bChgd=FALSE; + sal_Bool bChgd=sal_False; SortMarkedObjects(); const SdrObject* pObj0=NULL; const SdrPageView* pPV0=NULL; SdrMark* pM=NULL; aHdl.Sort(); //HMHBOOL bHideHdl=IsMarkHdlShown() && IsSolidMarkHdl() && !bPlusHdlAlways; - ULONG nHdlAnz=aHdl.GetHdlCount(); - for (ULONG nHdlNum=nHdlAnz; nHdlNum>0;) { + sal_uIntPtr nHdlAnz=aHdl.GetHdlCount(); + for (sal_uIntPtr nHdlNum=nHdlAnz; nHdlNum>0;) { nHdlNum--; SdrHdl* pHdl=aHdl.GetHdl(nHdlNum); if (IsPointMarkable(*pHdl) && pHdl->IsSelected()==bUnmark) { @@ -254,7 +254,7 @@ BOOL SdrMarkView::MarkPoints(const Rectangle* pRect, BOOL bUnmark) SdrUShortCont* pPts=pM->GetMarkedPoints(); if (pPts!=NULL) pPts->ForceSort(); } - ULONG nMarkNum=TryToFindMarkedObject(pObj); // damit ImpMarkPoint() nicht staendig das + sal_uIntPtr nMarkNum=TryToFindMarkedObject(pObj); // damit ImpMarkPoint() nicht staendig das if (nMarkNum!=CONTAINER_ENTRY_NOTFOUND) { // Objekt in der MarkList suchen muss. pM=GetSdrMarkByIndex(nMarkNum); pObj0=pObj; @@ -276,7 +276,7 @@ BOOL SdrMarkView::MarkPoints(const Rectangle* pRect, BOOL bUnmark) //HMHsal_uInt32 nAnz=pHdl->GetObj()->GetPlusHdlCount(*pHdl); //HMHif (nAnz!=0L) HideMarkHdl(); // #36987# //HMH} - if (ImpMarkPoint(pHdl,pM,bUnmark)) bChgd=TRUE; + if (ImpMarkPoint(pHdl,pM,bUnmark)) bChgd=sal_True; } } } @@ -292,10 +292,10 @@ BOOL SdrMarkView::MarkPoints(const Rectangle* pRect, BOOL bUnmark) return bChgd; } -BOOL SdrMarkView::MarkNextPoint(BOOL /*bPrev*/) +sal_Bool SdrMarkView::MarkNextPoint(sal_Bool /*bPrev*/) { ForceUndirtyMrkPnt(); - BOOL bChgd=FALSE; + sal_Bool bChgd=sal_False; SortMarkedObjects(); // ... if (bChgd) { @@ -304,10 +304,10 @@ BOOL SdrMarkView::MarkNextPoint(BOOL /*bPrev*/) return bChgd; } -BOOL SdrMarkView::MarkNextPoint(const Point& /*rPnt*/, BOOL /*bPrev*/) +sal_Bool SdrMarkView::MarkNextPoint(const Point& /*rPnt*/, sal_Bool /*bPrev*/) { ForceUndirtyMrkPnt(); - BOOL bChgd=FALSE; + sal_Bool bChgd=sal_False; SortMarkedObjects(); // ... if (bChgd) { @@ -323,7 +323,7 @@ const Rectangle& SdrMarkView::GetMarkedPointsRect() const return aMarkedPointsRect; } -void SdrMarkView::SetPlusHandlesAlwaysVisible(BOOL bOn) +void SdrMarkView::SetPlusHandlesAlwaysVisible(sal_Bool bOn) { // HandlePaint optimieren !!!!!!! ForceUndirtyMrkPnt(); if (bOn!=bPlusHdlAlways) { @@ -344,8 +344,8 @@ void SdrMarkView::ImpSetPointsRects() const { Rectangle aPnts; Rectangle aGlue; - ULONG nHdlAnz=aHdl.GetHdlCount(); - for (ULONG nHdlNum=0; nHdlNum<nHdlAnz; nHdlNum++) { + sal_uIntPtr nHdlAnz=aHdl.GetHdlCount(); + for (sal_uIntPtr nHdlNum=0; nHdlNum<nHdlAnz; nHdlNum++) { const SdrHdl* pHdl=aHdl.GetHdl(nHdlNum); SdrHdlKind eKind=pHdl->GetKind(); if ((eKind==HDL_POLY && pHdl->IsSelected()) || eKind==HDL_GLUE) { @@ -363,7 +363,7 @@ void SdrMarkView::ImpSetPointsRects() const } ((SdrMarkView*)this)->aMarkedPointsRect=aPnts; ((SdrMarkView*)this)->aMarkedGluePointsRect=aGlue; - ((SdrMarkView*)this)->bMarkedPointsRectsDirty=FALSE; + ((SdrMarkView*)this)->bMarkedPointsRectsDirty=sal_False; } //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -372,9 +372,9 @@ void SdrMarkView::ImpSetPointsRects() const void SdrMarkView::UndirtyMrkPnt() const { - BOOL bChg=FALSE; - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { + sal_Bool bChg=sal_False; + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrObject* pObj=pM->GetMarkedSdrObj(); // PolyPoints @@ -396,7 +396,7 @@ void SdrMarkView::UndirtyMrkPnt() const if(nPtNum >= nMax) { pPts->Remove(nIndex); - bChg = TRUE; + bChg = sal_True; } } } @@ -406,7 +406,7 @@ void SdrMarkView::UndirtyMrkPnt() const if(pPts && pPts->GetCount()) { pPts->Clear(); - bChg = TRUE; + bChg = sal_True; } } } @@ -420,37 +420,37 @@ void SdrMarkView::UndirtyMrkPnt() const // Eintraege (Id's) die nicht in der GluePointList des // Objekts enthalten sind pPts->ForceSort(); - for (ULONG nIndex=pPts->GetCount(); nIndex>0;) { + for (sal_uIntPtr nIndex=pPts->GetCount(); nIndex>0;) { nIndex--; - USHORT nId=pPts->GetObject(nIndex); + sal_uInt16 nId=pPts->GetObject(nIndex); if (pGPL->FindGluePoint(nId)==SDRGLUEPOINT_NOTFOUND) { pPts->Remove(nIndex); - bChg=TRUE; + bChg=sal_True; } } } else { if (pPts!=NULL && pPts->GetCount()!=0) { pPts->Clear(); // Objekt hat keine Klebepunkte (mehr) - bChg=TRUE; + bChg=sal_True; } } } } - if (bChg) ((SdrMarkView*)this)->bMarkedPointsRectsDirty=TRUE; - ((SdrMarkView*)this)->bMrkPntDirty=FALSE; + if (bChg) ((SdrMarkView*)this)->bMarkedPointsRectsDirty=sal_True; + ((SdrMarkView*)this)->bMrkPntDirty=sal_False; } //////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SdrMarkView::HasMarkableGluePoints() const +sal_Bool SdrMarkView::HasMarkableGluePoints() const { - BOOL bRet=FALSE; + sal_Bool bRet=sal_False; if (IsGluePointEditMode()) { ForceUndirtyMrkPnt(); - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) { + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrGluePointList* pGPL=pObj->GetGluePointList(); @@ -462,7 +462,7 @@ BOOL SdrMarkView::HasMarkableGluePoints() const { if((*pGPL)[a].IsUserDefined()) { - bRet = TRUE; + bRet = sal_True; } } } @@ -471,13 +471,13 @@ BOOL SdrMarkView::HasMarkableGluePoints() const return bRet; } -ULONG SdrMarkView::GetMarkableGluePointCount() const +sal_uIntPtr SdrMarkView::GetMarkableGluePointCount() const { - ULONG nAnz=0; + sal_uIntPtr nAnz=0; if (IsGluePointEditMode()) { ForceUndirtyMrkPnt(); - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrGluePointList* pGPL=pObj->GetGluePointList(); @@ -498,12 +498,12 @@ ULONG SdrMarkView::GetMarkableGluePointCount() const return nAnz; } -BOOL SdrMarkView::HasMarkedGluePoints() const +sal_Bool SdrMarkView::HasMarkedGluePoints() const { ForceUndirtyMrkPnt(); - BOOL bRet=FALSE; - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) { + sal_Bool bRet=sal_False; + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrUShortCont* pPts=pM->GetMarkedGluePoints(); bRet=pPts!=NULL && pPts->GetCount()!=0; @@ -511,12 +511,12 @@ BOOL SdrMarkView::HasMarkedGluePoints() const return bRet; } -ULONG SdrMarkView::GetMarkedGluePointCount() const +sal_uIntPtr SdrMarkView::GetMarkedGluePointCount() const { ForceUndirtyMrkPnt(); - ULONG nAnz=0; - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { + sal_uIntPtr nAnz=0; + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrUShortCont* pPts=pM->GetMarkedGluePoints(); if (pPts!=NULL) nAnz+=pPts->GetCount(); @@ -524,14 +524,14 @@ ULONG SdrMarkView::GetMarkedGluePointCount() const return nAnz; } -BOOL SdrMarkView::MarkGluePoints(const Rectangle* pRect, BOOL bUnmark) +sal_Bool SdrMarkView::MarkGluePoints(const Rectangle* pRect, sal_Bool bUnmark) { - if (!IsGluePointEditMode() && !bUnmark) return FALSE; + if (!IsGluePointEditMode() && !bUnmark) return sal_False; ForceUndirtyMrkPnt(); - BOOL bChgd=FALSE; + sal_Bool bChgd=sal_False; SortMarkedObjects(); - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrGluePointList* pGPL=pObj->GetGluePointList(); @@ -539,12 +539,12 @@ BOOL SdrMarkView::MarkGluePoints(const Rectangle* pRect, BOOL bUnmark) if (bUnmark && pRect==NULL) { // UnmarkAll if (pPts!=NULL && pPts->GetCount()!=0) { pPts->Clear(); - bChgd=TRUE; + bChgd=sal_True; } } else { if (pGPL!=NULL && (pPts!=NULL || !bUnmark)) { - USHORT nGPAnz=pGPL->GetCount(); - for (USHORT nGPNum=0; nGPNum<nGPAnz; nGPNum++) { + sal_uInt16 nGPAnz=pGPL->GetCount(); + for (sal_uInt16 nGPNum=0; nGPNum<nGPAnz; nGPNum++) { const SdrGluePoint& rGP=(*pGPL)[nGPNum]; // #i38892# @@ -554,13 +554,13 @@ BOOL SdrMarkView::MarkGluePoints(const Rectangle* pRect, BOOL bUnmark) if (pRect==NULL || pRect->IsInside(aPos)) { if (pPts==NULL) pPts=pM->ForceMarkedGluePoints(); else pPts->ForceSort(); - ULONG nPos=pPts->GetPos(rGP.GetId()); + sal_uIntPtr nPos=pPts->GetPos(rGP.GetId()); if (!bUnmark && nPos==CONTAINER_ENTRY_NOTFOUND) { - bChgd=TRUE; + bChgd=sal_True; pPts->Insert(rGP.GetId()); } if (bUnmark && nPos!=CONTAINER_ENTRY_NOTFOUND) { - bChgd=TRUE; + bChgd=sal_True; pPts->Remove(nPos); } } @@ -576,24 +576,24 @@ BOOL SdrMarkView::MarkGluePoints(const Rectangle* pRect, BOOL bUnmark) return bChgd; } -BOOL SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, USHORT& rnId, SdrPageView*& rpPV, ULONG nOptions) const +sal_Bool SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16& rnId, SdrPageView*& rpPV, sal_uIntPtr nOptions) const { SdrObject* pObj0=rpObj; //SdrPageView* pPV0=rpPV; - USHORT nId0=rnId; + sal_uInt16 nId0=rnId; rpObj=NULL; rpPV=NULL; rnId=0; - if (!IsGluePointEditMode()) return FALSE; - BOOL bBack=(nOptions & SDRSEARCH_BACKWARD) !=0; - BOOL bNext=(nOptions & SDRSEARCH_NEXT) !=0; + if (!IsGluePointEditMode()) return sal_False; + sal_Bool bBack=(nOptions & SDRSEARCH_BACKWARD) !=0; + sal_Bool bNext=(nOptions & SDRSEARCH_NEXT) !=0; OutputDevice* pOut=(OutputDevice*)pActualOutDev; if (pOut==NULL) pOut=GetFirstOutputDevice(); //GetWin(0); - if (pOut==NULL) return FALSE; + if (pOut==NULL) return sal_False; SortMarkedObjects(); - ULONG nMarkAnz=GetMarkedObjectCount(); - ULONG nMarkNum=bBack ? 0 : nMarkAnz; + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + sal_uIntPtr nMarkNum=bBack ? 0 : nMarkAnz; if (bNext) { nMarkNum=((SdrMarkView*)this)->TryToFindMarkedObject(pObj0); - if (nMarkNum==CONTAINER_ENTRY_NOTFOUND) return FALSE; + if (nMarkNum==CONTAINER_ENTRY_NOTFOUND) return sal_False; if (!bBack) nMarkNum++; } while (bBack ? nMarkNum<nMarkAnz : nMarkNum>0) { @@ -603,7 +603,7 @@ BOOL SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, USHORT& rn SdrPageView* pPV=pM->GetPageView(); const SdrGluePointList* pGPL=pObj->GetGluePointList(); if (pGPL!=NULL) { - USHORT nNum=pGPL->HitTest(rPnt,*pOut,pObj,bBack,bNext,nId0); + sal_uInt16 nNum=pGPL->HitTest(rPnt,*pOut,pObj,bBack,bNext,nId0); if (nNum!=SDRGLUEPOINT_NOTFOUND) { // #i38892# @@ -614,34 +614,34 @@ BOOL SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, USHORT& rn rpObj=pObj; rnId=(*pGPL)[nNum].GetId(); rpPV=pPV; - return TRUE; + return sal_True; } } } - bNext=FALSE; // HitNextGluePoint nur beim ersten Obj + bNext=sal_False; // HitNextGluePoint nur beim ersten Obj if (bBack) nMarkNum++; } - return FALSE; + return sal_False; } -BOOL SdrMarkView::MarkGluePoint(const SdrObject* pObj, USHORT nId, const SdrPageView* /*pPV*/, BOOL bUnmark) +sal_Bool SdrMarkView::MarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* /*pPV*/, sal_Bool bUnmark) { - if (!IsGluePointEditMode()) return FALSE; + if (!IsGluePointEditMode()) return sal_False; ForceUndirtyMrkPnt(); - BOOL bChgd=FALSE; + sal_Bool bChgd=sal_False; if (pObj!=NULL) { - ULONG nMarkPos=TryToFindMarkedObject(pObj); + sal_uIntPtr nMarkPos=TryToFindMarkedObject(pObj); if (nMarkPos!=CONTAINER_ENTRY_NOTFOUND) { SdrMark* pM=GetSdrMarkByIndex(nMarkPos); SdrUShortCont* pPts=bUnmark ? pM->GetMarkedGluePoints() : pM->ForceMarkedGluePoints(); if (pPts!=NULL) { - ULONG nPointPos=pPts->GetPos(nId); + sal_uIntPtr nPointPos=pPts->GetPos(nId); if (!bUnmark && nPointPos==CONTAINER_ENTRY_NOTFOUND) { - bChgd=TRUE; + bChgd=sal_True; pPts->Insert(nId); } if (bUnmark && nPointPos!=CONTAINER_ENTRY_NOTFOUND) { - bChgd=TRUE; + bChgd=sal_True; pPts->Remove(nPointPos); } } @@ -657,11 +657,11 @@ BOOL SdrMarkView::MarkGluePoint(const SdrObject* pObj, USHORT nId, const SdrPage return bChgd; } -BOOL SdrMarkView::IsGluePointMarked(const SdrObject* pObj, USHORT nId) const +sal_Bool SdrMarkView::IsGluePointMarked(const SdrObject* pObj, sal_uInt16 nId) const { ForceUndirtyMrkPnt(); - BOOL bRet=FALSE; - ULONG nPos=((SdrMarkView*)this)->TryToFindMarkedObject(pObj); // casting auf NonConst + sal_Bool bRet=sal_False; + sal_uIntPtr nPos=((SdrMarkView*)this)->TryToFindMarkedObject(pObj); // casting auf NonConst if (nPos!=CONTAINER_ENTRY_NOTFOUND) { const SdrMark* pM=GetSdrMarkByIndex(nPos); const SdrUShortCont* pPts=pM->GetMarkedGluePoints(); @@ -672,18 +672,18 @@ BOOL SdrMarkView::IsGluePointMarked(const SdrObject* pObj, USHORT nId) const return bRet; } -BOOL SdrMarkView::UnmarkGluePoint(const SdrHdl& rHdl) +sal_Bool SdrMarkView::UnmarkGluePoint(const SdrHdl& rHdl) { if (&rHdl!=NULL && rHdl.GetKind()==HDL_GLUE && rHdl.GetObj()!=NULL) { - return MarkGluePoint(rHdl.GetObj(),(sal_uInt16)rHdl.GetObjHdlNum(),rHdl.GetPageView(),TRUE); - } else return FALSE; + return MarkGluePoint(rHdl.GetObj(),(sal_uInt16)rHdl.GetObjHdlNum(),rHdl.GetPageView(),sal_True); + } else return sal_False; } -SdrHdl* SdrMarkView::GetGluePointHdl(const SdrObject* pObj, USHORT nId) const +SdrHdl* SdrMarkView::GetGluePointHdl(const SdrObject* pObj, sal_uInt16 nId) const { ForceUndirtyMrkPnt(); - ULONG nHdlAnz=aHdl.GetHdlCount(); - for (ULONG nHdlNum=0; nHdlNum<nHdlAnz; nHdlNum++) { + sal_uIntPtr nHdlAnz=aHdl.GetHdlCount(); + for (sal_uIntPtr nHdlNum=0; nHdlNum<nHdlAnz; nHdlNum++) { SdrHdl* pHdl=aHdl.GetHdl(nHdlNum); if (pHdl->GetObj()==pObj && pHdl->GetKind()==HDL_GLUE && @@ -692,10 +692,10 @@ SdrHdl* SdrMarkView::GetGluePointHdl(const SdrObject* pObj, USHORT nId) const return NULL; } -BOOL SdrMarkView::MarkNextGluePoint(BOOL /*bPrev*/) +sal_Bool SdrMarkView::MarkNextGluePoint(sal_Bool /*bPrev*/) { ForceUndirtyMrkPnt(); - BOOL bChgd=FALSE; + sal_Bool bChgd=sal_False; SortMarkedObjects(); // ... if (bChgd) { @@ -704,10 +704,10 @@ BOOL SdrMarkView::MarkNextGluePoint(BOOL /*bPrev*/) return bChgd; } -BOOL SdrMarkView::MarkNextGluePoint(const Point& /*rPnt*/, BOOL /*bPrev*/) +sal_Bool SdrMarkView::MarkNextGluePoint(const Point& /*rPnt*/, sal_Bool /*bPrev*/) { ForceUndirtyMrkPnt(); - BOOL bChgd=FALSE; + sal_Bool bChgd=sal_False; SortMarkedObjects(); // ... if (bChgd) { diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 07d3b789a8a4..ecfa3051262a 100644..100755 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <svx/svdoashp.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <svx/unoshape.hxx> #include <ucbhelper/content.hxx> #include <ucbhelper/contentbroker.hxx> @@ -53,22 +53,22 @@ #include <svx/xpoly.hxx> #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdobj.hxx> #include <svx/svdtrans.hxx> #include <svx/svdetc.hxx> #include <svx/svdattrx.hxx> // NotPersistItems #include <svx/svdoedge.hxx> // #32383# Die Verbinder nach Move nochmal anbroadcasten -#include "svdglob.hxx" // StringCache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Objektname #include <editeng/eeitem.hxx> #include "editeng/editstat.hxx" #include <svx/svdoutl.hxx> #include <editeng/outlobj.hxx> #include <svx/sdtfchim.hxx> -#include "../customshapes/EnhancedCustomShapeGeometry.hxx" -#include "../customshapes/EnhancedCustomShapeTypeNames.hxx" -#include "../customshapes/EnhancedCustomShape2d.hxx" +#include "../svx/EnhancedCustomShapeGeometry.hxx" +#include "../svx/EnhancedCustomShapeTypeNames.hxx" +#include "../svx/EnhancedCustomShape2d.hxx" #include <com/sun/star/beans/PropertyValues.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp> @@ -631,7 +631,7 @@ SdrObjCustomShape::SdrObjCustomShape() : fObjectRotation( 0.0 ), mpLastShadowGeometry(0L) { - bTextFrame = TRUE; + bTextFrame = sal_True; } SdrObjCustomShape::~SdrObjCustomShape() @@ -1622,17 +1622,17 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) void SdrObjCustomShape::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { rInfo.bResizeFreeAllowed=fObjectRotation == 0.0; - rInfo.bResizePropAllowed=TRUE; - rInfo.bRotateFreeAllowed=TRUE; - rInfo.bRotate90Allowed =TRUE; - rInfo.bMirrorFreeAllowed=TRUE; - rInfo.bMirror45Allowed =TRUE; - rInfo.bMirror90Allowed =TRUE; - rInfo.bTransparenceAllowed = FALSE; - rInfo.bGradientAllowed = FALSE; - rInfo.bShearAllowed =TRUE; - rInfo.bEdgeRadiusAllowed=FALSE; - rInfo.bNoContortion =TRUE; + rInfo.bResizePropAllowed=sal_True; + rInfo.bRotateFreeAllowed=sal_True; + rInfo.bRotate90Allowed =sal_True; + rInfo.bMirrorFreeAllowed=sal_True; + rInfo.bMirror45Allowed =sal_True; + rInfo.bMirror90Allowed =sal_True; + rInfo.bTransparenceAllowed = sal_False; + rInfo.bGradientAllowed = sal_False; + rInfo.bShearAllowed =sal_True; + rInfo.bEdgeRadiusAllowed=sal_False; + rInfo.bNoContortion =sal_True; // #i37011# if ( mXRenderedCustomShape.is() ) @@ -1679,9 +1679,9 @@ void SdrObjCustomShape::SetModel(SdrModel* pNewModel) mXRenderedCustomShape.clear(); } -UINT16 SdrObjCustomShape::GetObjIdentifier() const +sal_uInt16 SdrObjCustomShape::GetObjIdentifier() const { - return UINT16(OBJ_CUSTOMSHAPE); + return sal_uInt16(OBJ_CUSTOMSHAPE); } //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -1997,9 +1997,9 @@ void SdrObjCustomShape::NbcShear( const Point& rRef, long nWink, double tn, bool //////////////////////////////////////////////////////////////////////////////////////////////////// -SdrGluePoint SdrObjCustomShape::GetVertexGluePoint(USHORT nPosNum) const +SdrGluePoint SdrObjCustomShape::GetVertexGluePoint(sal_uInt16 nPosNum) const { - INT32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue(); + sal_Int32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue(); // #i25616# if(!LineIsOutsideGeometry()) @@ -2019,7 +2019,7 @@ SdrGluePoint SdrObjCustomShape::GetVertexGluePoint(USHORT nPosNum) const if (aGeo.nDrehWink!=0) RotatePoint(aPt,aRect.TopLeft(),aGeo.nSin,aGeo.nCos); aPt-=GetSnapRect().Center(); SdrGluePoint aGP(aPt); - aGP.SetPercent(FALSE); + aGP.SetPercent(sal_False); return aGP; } @@ -2051,7 +2051,7 @@ void SdrObjCustomShape::ImpCheckCustomGluePointsAreAdded() for(a = 0; a < pSource->GetCount(); a++) { SdrGluePoint aCopy((*pSource)[a]); - aCopy.SetUserDefined(FALSE); + aCopy.SetUserDefined(sal_False); aNewList.Insert(aCopy); } @@ -2066,9 +2066,9 @@ void SdrObjCustomShape::ImpCheckCustomGluePointsAreAdded() Polygon aPoly( aRect ); if( nShearWink ) { - USHORT nPointCount=aPoly.GetSize(); - for (USHORT i=0; i<nPointCount; i++) - ShearPoint(aPoly[i],aRect.Center(), fTan, FALSE ); + sal_uInt16 nPointCount=aPoly.GetSize(); + for (sal_uInt16 i=0; i<nPointCount; i++) + ShearPoint(aPoly[i],aRect.Center(), fTan, sal_False ); } if ( aGeo.nDrehWink ) aPoly.Rotate( aRect.Center(), aGeo.nDrehWink / 10 ); @@ -2463,7 +2463,7 @@ void SdrObjCustomShape::DragCreateObject( SdrDragStat& rStat ) } SetBoundRectDirty(); - bSnapRectDirty=TRUE; + bSnapRectDirty=sal_True; } bool SdrObjCustomShape::BegCreate( SdrDragStat& rDrag ) @@ -2480,7 +2480,7 @@ bool SdrObjCustomShape::MovCreate(SdrDragStat& rStat) } DragCreateObject( rStat ); SetRectsDirty(); - return TRUE; + return sal_True; } bool SdrObjCustomShape::EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd ) @@ -2526,7 +2526,7 @@ bool SdrObjCustomShape::IsAutoGrowHeight() const const SfxItemSet& rSet = GetMergedItemSet(); bool bIsAutoGrowHeight = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue(); if ( bIsAutoGrowHeight && IsVerticalWriting() ) - bIsAutoGrowHeight = ((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue() == FALSE; + bIsAutoGrowHeight = ((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue() == sal_False; return bIsAutoGrowHeight; } bool SdrObjCustomShape::IsAutoGrowWidth() const @@ -2534,7 +2534,7 @@ bool SdrObjCustomShape::IsAutoGrowWidth() const const SfxItemSet& rSet = GetMergedItemSet(); bool bIsAutoGrowWidth = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue(); if ( bIsAutoGrowWidth && !IsVerticalWriting() ) - bIsAutoGrowWidth = ((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue() == FALSE; + bIsAutoGrowWidth = ((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue() == sal_False; return bIsAutoGrowWidth; } @@ -2658,7 +2658,7 @@ bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt, { Outliner& rOutliner=ImpGetDrawOutliner(); rOutliner.SetPaperSize(aSiz); - rOutliner.SetUpdateMode(TRUE); + rOutliner.SetUpdateMode(sal_True); // !!! hier sollte ich wohl auch noch mal die Optimierung mit // bPortionInfoChecked usw einbauen OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject(); @@ -2695,9 +2695,9 @@ bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt, long nWdtGrow = nWdt-(rR.Right()-rR.Left()); long nHgtGrow = nHgt-(rR.Bottom()-rR.Top()); if ( nWdtGrow == 0 ) - bWdtGrow = FALSE; + bWdtGrow = sal_False; if ( nHgtGrow == 0 ) - bHgtGrow=FALSE; + bHgtGrow=sal_False; if ( bWdtGrow || bHgtGrow ) { if ( bWdtGrow ) @@ -2737,11 +2737,11 @@ bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt, aD2-=aD1; rR.Move(aD2.X(),aD2.Y()); } - return TRUE; + return sal_True; } } } - return FALSE; + return sal_False; } Rectangle SdrObjCustomShape::ImpCalculateTextFrame( const bool bHgt, const bool bWdt ) @@ -2968,13 +2968,13 @@ void SdrObjCustomShape::TakeTextAnchorRect( Rectangle& rAnchorRect ) const SdrTextObj::TakeTextAnchorRect( rAnchorRect ); } void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, - Rectangle* pAnchorRect, BOOL /*bLineWidth*/) const + Rectangle* pAnchorRect, sal_Bool /*bLineWidth*/) const { Rectangle aAnkRect; // Rect innerhalb dem geankert wird TakeTextAnchorRect(aAnkRect); SdrTextVertAdjust eVAdj=GetTextVerticalAdjust(); SdrTextHorzAdjust eHAdj=GetTextHorizontalAdjust(); - ULONG nStat0=rOutliner.GetControlWord(); + sal_uIntPtr nStat0=rOutliner.GetControlWord(); Size aNullSize; rOutliner.SetControlWord(nStat0|EE_CNTRL_AUTOPAGESIZE); @@ -3011,7 +3011,7 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRe if (pPara) { - BOOL bHitTest = FALSE; + sal_Bool bHitTest = sal_False; if( pModel ) bHitTest = &pModel->GetHitTestOutliner() == &rOutliner; @@ -3022,7 +3022,7 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRe if( bHitTest ) rOutliner.SetTextObj( this ); - rOutliner.SetUpdateMode(TRUE); + rOutliner.SetUpdateMode(sal_True); rOutliner.SetText(*pPara); } } @@ -3033,7 +3033,7 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRe if (pEdtOutl && !bNoEditText && pPara) delete pPara; - rOutliner.SetUpdateMode(TRUE); + rOutliner.SetUpdateMode(sal_True); rOutliner.SetControlWord(nStat0); SdrText* pText = getActiveText(); @@ -3103,7 +3103,7 @@ void SdrObjCustomShape::NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject { SdrTextObj::NbcSetOutlinerParaObject( pTextObject ); SetBoundRectDirty(); - SetRectsDirty(TRUE); + SetRectsDirty(sal_True); InvalidateRenderGeometry(); } @@ -3147,7 +3147,7 @@ basegfx::B2DPolyPolygon SdrObjCustomShape::TakeContour() const return basegfx::B2DPolyPolygon(); } -SdrObject* SdrObjCustomShape::DoConvertToPolyObj(BOOL bBezier) const +SdrObject* SdrObjCustomShape::DoConvertToPolyObj(sal_Bool bBezier) const { // #i37011# SdrObject* pRetval = 0L; @@ -3318,7 +3318,7 @@ void SdrObjCustomShape::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, GeoStat aGeoStat; aGeoStat.nShearWink = FRound((atan(fShearX) / F_PI180) * 100.0); aGeoStat.RecalcTan(); - Shear(Point(), aGeoStat.nShearWink, aGeoStat.nTan, FALSE); + Shear(Point(), aGeoStat.nShearWink, aGeoStat.nTan, sal_False); } // rotation? @@ -3366,8 +3366,8 @@ sal_Bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, ba Point aRef1( ( aBoundRect.Left() + aBoundRect.Right() ) >> 1, aBoundRect.Top() ); Point aRef2( aRef1.X(), aRef1.Y() + 1000 ); - USHORT i; - USHORT nPntAnz=aPol.GetSize(); + sal_uInt16 i; + sal_uInt16 nPntAnz=aPol.GetSize(); for (i=0; i<nPntAnz; i++) { MirrorPoint(aPol[i],aRef1,aRef2); @@ -3388,8 +3388,8 @@ sal_Bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, ba Point aRef1( aBoundRect.Left(), ( aBoundRect.Top() + aBoundRect.Bottom() ) >> 1 ); Point aRef2( aRef1.X() + 1000, aRef1.Y() ); - USHORT i; - USHORT nPntAnz=aPol.GetSize(); + sal_uInt16 i; + sal_uInt16 nPntAnz=aPol.GetSize(); for (i=0; i<nPntAnz; i++) { MirrorPoint(aPol[i],aRef1,aRef2); diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx index abf73b4a31f7..23b7eccc40d6 100644..100755 --- a/svx/source/svdraw/svdoattr.cxx +++ b/svx/source/svdraw/svdoattr.cxx @@ -31,7 +31,7 @@ #include <svx/svdoattr.hxx> #include <svx/xpool.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> #include <svx/svdattr.hxx> @@ -140,7 +140,7 @@ void SdrAttrObj::SetModel(SdrModel* pNewModel) void SdrAttrObj::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint) { SfxSimpleHint *pSimple = PTR_CAST(SfxSimpleHint, &rHint); - BOOL bDataChg(pSimple && SFX_HINT_DATACHANGED == pSimple->GetId()); + sal_Bool bDataChg(pSimple && SFX_HINT_DATACHANGED == pSimple->GetId()); if(bDataChg) { @@ -167,12 +167,12 @@ sal_Int32 SdrAttrObj::ImpGetLineWdt() const return nRetval; } -BOOL SdrAttrObj::HasFill() const +sal_Bool SdrAttrObj::HasFill() const { return bClosedObj && ((XFillStyleItem&)(GetProperties().GetObjectItemSet().Get(XATTR_FILLSTYLE))).GetValue()!=XFILL_NONE; } -BOOL SdrAttrObj::HasLine() const +sal_Bool SdrAttrObj::HasLine() const { return ((XLineStyleItem&)(GetProperties().GetObjectItemSet().Get(XATTR_LINESTYLE))).GetValue()!=XLINE_NONE; } diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 016abd7c6723..d8827fa0d99e 100644..100755 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -48,8 +48,8 @@ #include <svx/svdpage.hxx> #include <svx/svdovirt.hxx> // Fuer Add/Del Ref #include <svx/svdview.hxx> // fuer Dragging (Ortho abfragen) -#include "svdglob.hxx" // StringCache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // StringCache +#include <svx/svdstr.hrc> // Objektname #include <svx/svdogrp.hxx> // Factory #include <svx/svdopath.hxx> // Factory #include <svx/svdoedge.hxx> // Factory @@ -75,7 +75,7 @@ #include <svx/xlndsit.hxx> #include <svx/xlnclit.hxx> #include <svx/xflclit.hxx> -#include "svditer.hxx" +#include <svx/svditer.hxx> #include <svx/xlntrit.hxx> #include <svx/xfltrit.hxx> #include <svx/xfltrit.hxx> @@ -151,12 +151,12 @@ void SdrObjUserData::operator=(const SdrObjUserData& /*rData*/) // nicht impl sal_Bool SdrObjUserData::operator==(const SdrObjUserData& /*rData*/) const // nicht implementiert { - return FALSE; + return sal_False; } sal_Bool SdrObjUserData::operator!=(const SdrObjUserData& /*rData*/) const // nicht implementiert { - return FALSE; + return sal_False; } SdrObjUserData::~SdrObjUserData() @@ -165,7 +165,7 @@ SdrObjUserData::~SdrObjUserData() bool SdrObjUserData::HasMacro(const SdrObject* /*pObj*/) const { - return FALSE; + return sal_False; } SdrObject* SdrObjUserData::CheckMacroHit(const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const @@ -209,7 +209,7 @@ void SdrObjUserData::PaintMacro(OutputDevice& rOut, const Rectangle& /*rDirtyRec bool SdrObjUserData::DoMacro(const SdrObjMacroHitRec& /*rRec*/, SdrObject* /*pObj*/) { - return FALSE; + return sal_False; } XubString SdrObjUserData::GetMacroPopupComment(const SdrObjMacroHitRec& /*rRec*/, const SdrObject* /*pObj*/) const @@ -219,8 +219,8 @@ XubString SdrObjUserData::GetMacroPopupComment(const SdrObjMacroHitRec& /*rRec*/ void SdrObjUserDataList::Clear() { - USHORT nAnz=GetUserDataCount(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=GetUserDataCount(); + for (sal_uInt16 i=0; i<nAnz; i++) { delete GetUserData(i); } aList.Clear(); @@ -232,10 +232,10 @@ DBG_NAME(SdrObjGeoData); SdrObjGeoData::SdrObjGeoData(): pGPL(NULL), - bMovProt(FALSE), - bSizProt(FALSE), - bNoPrint(FALSE), - bClosedObj(FALSE), + bMovProt(sal_False), + bSizProt(sal_False), + bNoPrint(sal_False), + bClosedObj(sal_False), mbVisible(true), mnLayerID(0) { @@ -272,10 +272,10 @@ SdrObjPlusData* SdrObjPlusData::Clone(SdrObject* pObj1) const { SdrObjPlusData* pNeuPlusData=new SdrObjPlusData; if (pUserDataList!=NULL) { - USHORT nAnz=pUserDataList->GetUserDataCount(); + sal_uInt16 nAnz=pUserDataList->GetUserDataCount(); if (nAnz!=0) { pNeuPlusData->pUserDataList=new SdrObjUserDataList; - for (USHORT i=0; i<nAnz; i++) { + for (sal_uInt16 i=0; i<nAnz; i++) { SdrObjUserData* pNeuUserData=pUserDataList->GetUserData(i)->Clone(pObj1); if (pNeuUserData!=NULL) { pNeuPlusData->pUserDataList->InsertUserData(pNeuUserData); @@ -405,17 +405,17 @@ SdrObject::SdrObject() ,maWeakUnoShape() { DBG_CTOR(SdrObject,NULL); - bVirtObj =FALSE; - bSnapRectDirty =TRUE; - bNetLock =FALSE; - bInserted =FALSE; - bGrouped =FALSE; - bMovProt =FALSE; - bSizProt =FALSE; - bNoPrint =FALSE; - bEmptyPresObj =FALSE; - bNotVisibleAsMaster=FALSE; - bClosedObj =FALSE; + bVirtObj =sal_False; + bSnapRectDirty =sal_True; + bNetLock =sal_False; + bInserted =sal_False; + bGrouped =sal_False; + bMovProt =sal_False; + bSizProt =sal_False; + bNoPrint =sal_False; + bEmptyPresObj =sal_False; + bNotVisibleAsMaster=sal_False; + bClosedObj =sal_False; mbVisible = true; // #i25616# @@ -425,13 +425,13 @@ SdrObject::SdrObject() mbSupportTextIndentingOnLineWidthChange = sal_False; //#110094#-1 - //bWriterFlyFrame =FALSE; + //bWriterFlyFrame =sal_False; - bNotMasterCachable=FALSE; - bIsEdge=FALSE; - bIs3DObj=FALSE; - bMarkProt=FALSE; - bIsUnoObj=FALSE; + bNotMasterCachable=sal_False; + bIsEdge=sal_False; + bIs3DObj=sal_False; + bMarkProt=sal_False; + bIsUnoObj=sal_False; } SdrObject::~SdrObject() @@ -507,7 +507,7 @@ void SdrObject::SetRectsDirty(sal_Bool bNotMyself) { if (!bNotMyself) { SetBoundRectDirty(); - bSnapRectDirty=TRUE; + bSnapRectDirty=sal_True; } if (pObjList!=NULL) { pObjList->SetRectsDirty(); @@ -587,29 +587,29 @@ SdrItemPool* SdrObject::GetObjectItemPool() const return &SdrObject::GetGlobalDrawObjectItemPool(); } -UINT32 SdrObject::GetObjInventor() const +sal_uInt32 SdrObject::GetObjInventor() const { return SdrInventor; } -UINT16 SdrObject::GetObjIdentifier() const +sal_uInt16 SdrObject::GetObjIdentifier() const { - return UINT16(OBJ_NONE); + return sal_uInt16(OBJ_NONE); } void SdrObject::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { - rInfo.bRotateFreeAllowed=FALSE; - rInfo.bMirrorFreeAllowed=FALSE; - rInfo.bTransparenceAllowed = FALSE; - rInfo.bGradientAllowed = FALSE; - rInfo.bShearAllowed =FALSE; - rInfo.bEdgeRadiusAllowed=FALSE; - rInfo.bCanConvToPath =FALSE; - rInfo.bCanConvToPoly =FALSE; - rInfo.bCanConvToContour = FALSE; - rInfo.bCanConvToPathLineToArea=FALSE; - rInfo.bCanConvToPolyLineToArea=FALSE; + rInfo.bRotateFreeAllowed=sal_False; + rInfo.bMirrorFreeAllowed=sal_False; + rInfo.bTransparenceAllowed = sal_False; + rInfo.bGradientAllowed = sal_False; + rInfo.bShearAllowed =sal_False; + rInfo.bEdgeRadiusAllowed=sal_False; + rInfo.bCanConvToPath =sal_False; + rInfo.bCanConvToPoly =sal_False; + rInfo.bCanConvToContour = sal_False; + rInfo.bCanConvToPathLineToArea=sal_False; + rInfo.bCanConvToPolyLineToArea=sal_False; } SdrLayerID SdrObject::GetLayer() const @@ -622,8 +622,8 @@ void SdrObject::getMergedHierarchyLayerSet(SetOfByte& rSet) const rSet.Set(GetLayer()); SdrObjList* pOL=GetSubList(); if (pOL!=NULL) { - ULONG nObjAnz=pOL->GetObjCount(); - for (ULONG nObjNum=0; nObjNum<nObjAnz; nObjNum++) { + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + for (sal_uIntPtr nObjNum=0; nObjNum<nObjAnz; nObjNum++) { pOL->GetObj(nObjNum)->getMergedHierarchyLayerSet(rSet); } } @@ -681,7 +681,7 @@ AutoTimer* SdrObject::ForceAutoTimer() bool SdrObject::HasRefPoint() const { - return FALSE; + return sal_False; } Point SdrObject::GetRefPoint() const @@ -859,7 +859,7 @@ String SdrObject::GetHTMLName() const return String(); } -UINT32 SdrObject::GetOrdNum() const +sal_uInt32 SdrObject::GetOrdNum() const { if (pObjList!=NULL) { if (pObjList->IsObjOrdNumsDirty()) { @@ -932,7 +932,7 @@ void SdrObject::RecalcBoundRect() if(xPrimitives.hasElements()) { // use neutral ViewInformation and get the range of the primitives - const drawinglayer::geometry::ViewInformation2D aViewInformation2D(0); + const drawinglayer::geometry::ViewInformation2D aViewInformation2D; const basegfx::B2DRange aRange(drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence(xPrimitives, aViewInformation2D)); if(!aRange.isEmpty()) @@ -998,7 +998,7 @@ sal_Bool SdrObject::SingleObjectPainter(OutputDevice& rOut) const return sal_True; } -BOOL SdrObject::LineGeometryUsageIsNecessary() const +sal_Bool SdrObject::LineGeometryUsageIsNecessary() const { XLineStyle eXLS = (XLineStyle)((const XLineStyleItem&)GetMergedItem(XATTR_LINESTYLE)).GetValue(); return (eXLS != XLINE_NONE); @@ -1049,7 +1049,7 @@ void SdrObject::operator=(const SdrObject& rObj) bEmptyPresObj =rObj.bEmptyPresObj; //NotVisibleAsMaster wird nicht kopiert: nun doch! (25-07-1995, Joe) bNotVisibleAsMaster=rObj.bNotVisibleAsMaster; - bSnapRectDirty=TRUE; //rObj.bSnapRectDirty; + bSnapRectDirty=sal_True; //rObj.bSnapRectDirty; bNotMasterCachable=rObj.bNotMasterCachable; if (pPlusData!=NULL) { delete pPlusData; pPlusData=NULL; } if (rObj.pPlusData!=NULL) { @@ -1080,7 +1080,7 @@ void SdrObject::TakeObjNamePlural(XubString& rName) const rName=ImpGetResStr(STR_ObjNamePluralNONE); } -void SdrObject::ImpTakeDescriptionStr(USHORT nStrCacheID, XubString& rStr, USHORT nVal) const +void SdrObject::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr, sal_uInt16 nVal) const { rStr = ImpGetResStr(nStrCacheID); @@ -1160,17 +1160,17 @@ basegfx::B2DPolyPolygon SdrObject::TakeContour() const { // create connections if connector, will be cleaned up when // deleting the connector again - SdrObject* pLeft = pEdgeObj->GetConnectedNode(TRUE); - SdrObject* pRight = pEdgeObj->GetConnectedNode(FALSE); + SdrObject* pLeft = pEdgeObj->GetConnectedNode(sal_True); + SdrObject* pRight = pEdgeObj->GetConnectedNode(sal_False); if(pLeft) { - pClone->ConnectToNode(TRUE, pLeft); + pClone->ConnectToNode(sal_True, pLeft); } if(pRight) { - pClone->ConnectToNode(FALSE, pRight); + pClone->ConnectToNode(sal_False, pRight); } } @@ -1194,7 +1194,7 @@ basegfx::B2DPolyPolygon SdrObject::TakeContour() const if(xSequence.hasElements()) { // use neutral ViewInformation - const drawinglayer::geometry::ViewInformation2D aViewInformation2D(0); + const drawinglayer::geometry::ViewInformation2D aViewInformation2D; // create extractor, process and get result drawinglayer::processor2d::ContourExtractor2D aExtractor(aViewInformation2D); @@ -1400,7 +1400,7 @@ bool SdrObject::BegCreate(SdrDragStat& rStat) aRect1.Justify(); rStat.SetActionRect(aRect1); aOutRect = aRect1; - return TRUE; + return sal_True; } bool SdrObject::MovCreate(SdrDragStat& rStat) @@ -1415,9 +1415,9 @@ bool SdrObject::MovCreate(SdrDragStat& rStat) // cause no further prolems // // SetBoundRectDirty(); - // bSnapRectDirty=TRUE; + // bSnapRectDirty=sal_True; - return TRUE; + return sal_True; } bool SdrObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) @@ -1438,7 +1438,7 @@ void SdrObject::BrkCreate(SdrDragStat& /*rStat*/) bool SdrObject::BckCreate(SdrDragStat& /*rStat*/) { - return FALSE; + return sal_False; } basegfx::B2DPolyPolygon SdrObject::TakeCreatePoly(const SdrDragStat& rDrag) const @@ -1488,7 +1488,7 @@ void SdrObject::NbcResize(const Point& rRef, const Fraction& xFact, const Fracti void SdrObject::NbcRotate(const Point& rRef, long nWink, double sn, double cs) { - SetGlueReallyAbsolute(TRUE); + SetGlueReallyAbsolute(sal_True); aOutRect.Move(-rRef.X(),-rRef.Y()); Rectangle R(aOutRect); if (sn==1.0 && cs==0.0) { // 90deg @@ -1511,12 +1511,12 @@ void SdrObject::NbcRotate(const Point& rRef, long nWink, double sn, double cs) aOutRect.Justify(); // Sicherheitshalber SetRectsDirty(); NbcRotateGluePoints(rRef,nWink,sn,cs); - SetGlueReallyAbsolute(FALSE); + SetGlueReallyAbsolute(sal_False); } void SdrObject::NbcMirror(const Point& rRef1, const Point& rRef2) { - SetGlueReallyAbsolute(TRUE); + SetGlueReallyAbsolute(sal_True); aOutRect.Move(-rRef1.X(),-rRef1.Y()); Rectangle R(aOutRect); long dx=rRef2.X()-rRef1.X(); @@ -1542,14 +1542,14 @@ void SdrObject::NbcMirror(const Point& rRef1, const Point& rRef2) aOutRect.Justify(); // Sicherheitshalber SetRectsDirty(); NbcMirrorGluePoints(rRef1,rRef2); - SetGlueReallyAbsolute(FALSE); + SetGlueReallyAbsolute(sal_False); } void SdrObject::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) { - SetGlueReallyAbsolute(TRUE); + SetGlueReallyAbsolute(sal_True); NbcShearGluePoints(rRef,nWink,tn,bVShear); - SetGlueReallyAbsolute(FALSE); + SetGlueReallyAbsolute(sal_False); } void SdrObject::Move(const Size& rSiz) @@ -1758,12 +1758,12 @@ void SdrObject::NbcSetPoint(const Point& /*rPnt*/, sal_uInt32 /*i*/) bool SdrObject::HasTextEdit() const { - return FALSE; + return sal_False; } sal_Bool SdrObject::BegTextEdit(SdrOutliner& /*rOutl*/) { - return FALSE; + return sal_False; } void SdrObject::EndTextEdit(SdrOutliner& /*rOutl*/) @@ -1815,8 +1815,8 @@ void SdrObject::BurnInStyleSheetAttributes() SdrObjUserData* SdrObject::ImpGetMacroUserData() const { SdrObjUserData* pData=NULL; - USHORT nAnz=GetUserDataCount(); - for (USHORT nNum=nAnz; nNum>0 && pData==NULL;) { + sal_uInt16 nAnz=GetUserDataCount(); + for (sal_uInt16 nNum=nAnz; nNum>0 && pData==NULL;) { nNum--; pData=GetUserData(nNum); if (!pData->HasMacro(this)) pData=NULL; @@ -1827,7 +1827,7 @@ SdrObjUserData* SdrObject::ImpGetMacroUserData() const bool SdrObject::HasMacro() const { SdrObjUserData* pData=ImpGetMacroUserData(); - return pData!=NULL ? pData->HasMacro(this) : FALSE; + return pData!=NULL ? pData->HasMacro(this) : sal_False; } SdrObject* SdrObject::CheckMacroHit(const SdrObjMacroHitRec& rRec) const @@ -1889,7 +1889,7 @@ bool SdrObject::DoMacro(const SdrObjMacroHitRec& rRec) if (pData!=NULL) { return pData->DoMacro(rRec,this); } - return FALSE; + return sal_False; } XubString SdrObject::GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const @@ -2052,41 +2052,41 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr) Point aRef1(rSnap.Center()); Point aRef2(aRef1); aRef2.Y()++; const SfxPoolItem *pPoolItem=NULL; - if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1X,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1X,sal_True,&pPoolItem)==SFX_ITEM_SET) { aRef1.X()=((const SdrTransformRef1XItem*)pPoolItem)->GetValue(); } - if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1Y,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1Y,sal_True,&pPoolItem)==SFX_ITEM_SET) { aRef1.Y()=((const SdrTransformRef1YItem*)pPoolItem)->GetValue(); } - if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2X,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2X,sal_True,&pPoolItem)==SFX_ITEM_SET) { aRef2.X()=((const SdrTransformRef2XItem*)pPoolItem)->GetValue(); } - if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2Y,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2Y,sal_True,&pPoolItem)==SFX_ITEM_SET) { aRef2.Y()=((const SdrTransformRef2YItem*)pPoolItem)->GetValue(); } Rectangle aNewSnap(rSnap); - if (rAttr.GetItemState(SDRATTR_MOVEX,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_MOVEX,sal_True,&pPoolItem)==SFX_ITEM_SET) { long n=((const SdrMoveXItem*)pPoolItem)->GetValue(); aNewSnap.Move(n,0); } - if (rAttr.GetItemState(SDRATTR_MOVEY,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_MOVEY,sal_True,&pPoolItem)==SFX_ITEM_SET) { long n=((const SdrMoveYItem*)pPoolItem)->GetValue(); aNewSnap.Move(0,n); } - if (rAttr.GetItemState(SDRATTR_ONEPOSITIONX,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_ONEPOSITIONX,sal_True,&pPoolItem)==SFX_ITEM_SET) { long n=((const SdrOnePositionXItem*)pPoolItem)->GetValue(); aNewSnap.Move(n-aNewSnap.Left(),0); } - if (rAttr.GetItemState(SDRATTR_ONEPOSITIONY,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_ONEPOSITIONY,sal_True,&pPoolItem)==SFX_ITEM_SET) { long n=((const SdrOnePositionYItem*)pPoolItem)->GetValue(); aNewSnap.Move(0,n-aNewSnap.Top()); } - if (rAttr.GetItemState(SDRATTR_ONESIZEWIDTH,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_ONESIZEWIDTH,sal_True,&pPoolItem)==SFX_ITEM_SET) { long n=((const SdrOneSizeWidthItem*)pPoolItem)->GetValue(); aNewSnap.Right()=aNewSnap.Left()+n; } - if (rAttr.GetItemState(SDRATTR_ONESIZEHEIGHT,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_ONESIZEHEIGHT,sal_True,&pPoolItem)==SFX_ITEM_SET) { long n=((const SdrOneSizeHeightItem*)pPoolItem)->GetValue(); aNewSnap.Bottom()=aNewSnap.Top()+n; } @@ -2098,15 +2098,15 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr) } } - if (rAttr.GetItemState(SDRATTR_SHEARANGLE,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_SHEARANGLE,sal_True,&pPoolItem)==SFX_ITEM_SET) { long n=((const SdrShearAngleItem*)pPoolItem)->GetValue(); n-=GetShearAngle(); if (n!=0) { double nTan=tan(n*nPi180); - NbcShear(aRef1,n,nTan,FALSE); + NbcShear(aRef1,n,nTan,sal_False); } } - if (rAttr.GetItemState(SDRATTR_ROTATEANGLE,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_ROTATEANGLE,sal_True,&pPoolItem)==SFX_ITEM_SET) { long n=((const SdrRotateAngleItem*)pPoolItem)->GetValue(); n-=GetRotateAngle(); if (n!=0) { @@ -2115,28 +2115,28 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr) NbcRotate(aRef1,n,nSin,nCos); } } - if (rAttr.GetItemState(SDRATTR_ROTATEONE,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_ROTATEONE,sal_True,&pPoolItem)==SFX_ITEM_SET) { long n=((const SdrRotateOneItem*)pPoolItem)->GetValue(); double nSin=sin(n*nPi180); double nCos=cos(n*nPi180); NbcRotate(aRef1,n,nSin,nCos); } - if (rAttr.GetItemState(SDRATTR_HORZSHEARONE,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_HORZSHEARONE,sal_True,&pPoolItem)==SFX_ITEM_SET) { long n=((const SdrHorzShearOneItem*)pPoolItem)->GetValue(); double nTan=tan(n*nPi180); - NbcShear(aRef1,n,nTan,FALSE); + NbcShear(aRef1,n,nTan,sal_False); } - if (rAttr.GetItemState(SDRATTR_VERTSHEARONE,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_VERTSHEARONE,sal_True,&pPoolItem)==SFX_ITEM_SET) { long n=((const SdrVertShearOneItem*)pPoolItem)->GetValue(); double nTan=tan(n*nPi180); - NbcShear(aRef1,n,nTan,TRUE); + NbcShear(aRef1,n,nTan,sal_True); } - if (rAttr.GetItemState(SDRATTR_OBJMOVEPROTECT,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_OBJMOVEPROTECT,sal_True,&pPoolItem)==SFX_ITEM_SET) { bool b=((const SdrObjMoveProtectItem*)pPoolItem)->GetValue(); SetMoveProtect(b); } - if (rAttr.GetItemState(SDRATTR_OBJSIZEPROTECT,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_OBJSIZEPROTECT,sal_True,&pPoolItem)==SFX_ITEM_SET) { bool b=((const SdrObjSizeProtectItem*)pPoolItem)->GetValue(); SetResizeProtect(b); } @@ -2145,25 +2145,25 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr) if( IsMoveProtect() ) SetResizeProtect( true ); - if (rAttr.GetItemState(SDRATTR_OBJPRINTABLE,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_OBJPRINTABLE,sal_True,&pPoolItem)==SFX_ITEM_SET) { bool b=((const SdrObjPrintableItem*)pPoolItem)->GetValue(); SetPrintable(b); } - if (rAttr.GetItemState(SDRATTR_OBJVISIBLE,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_OBJVISIBLE,sal_True,&pPoolItem)==SFX_ITEM_SET) { bool b=((const SdrObjVisibleItem*)pPoolItem)->GetValue(); SetVisible(b); } SdrLayerID nLayer=SDRLAYER_NOTFOUND; - if (rAttr.GetItemState(SDRATTR_LAYERID,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_LAYERID,sal_True,&pPoolItem)==SFX_ITEM_SET) { nLayer=((const SdrLayerIdItem*)pPoolItem)->GetValue(); } - if (rAttr.GetItemState(SDRATTR_LAYERNAME,TRUE,&pPoolItem)==SFX_ITEM_SET && pModel!=NULL) { + if (rAttr.GetItemState(SDRATTR_LAYERNAME,sal_True,&pPoolItem)==SFX_ITEM_SET && pModel!=NULL) { XubString aLayerName=((const SdrLayerNameItem*)pPoolItem)->GetValue(); const SdrLayerAdmin* pLayAd=pPage!=NULL ? &pPage->GetLayerAdmin() : pModel!=NULL ? &pModel->GetLayerAdmin() : NULL; if (pLayAd!=NULL) { - const SdrLayer* pLayer=pLayAd->GetLayer(aLayerName, TRUE); + const SdrLayer* pLayer=pLayAd->GetLayer(aLayerName, sal_True); if (pLayer!=NULL) { nLayer=pLayer->GetID(); } @@ -2174,16 +2174,16 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr) NbcSetLayer(nLayer); } - if (rAttr.GetItemState(SDRATTR_OBJECTNAME,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_OBJECTNAME,sal_True,&pPoolItem)==SFX_ITEM_SET) { XubString aName=((const SdrObjectNameItem*)pPoolItem)->GetValue(); SetName(aName); } Rectangle aNewLogic(rLogic); - if (rAttr.GetItemState(SDRATTR_LOGICSIZEWIDTH,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_LOGICSIZEWIDTH,sal_True,&pPoolItem)==SFX_ITEM_SET) { long n=((const SdrLogicSizeWidthItem*)pPoolItem)->GetValue(); aNewLogic.Right()=aNewLogic.Left()+n; } - if (rAttr.GetItemState(SDRATTR_LOGICSIZEHEIGHT,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_LOGICSIZEHEIGHT,sal_True,&pPoolItem)==SFX_ITEM_SET) { long n=((const SdrLogicSizeHeightItem*)pPoolItem)->GetValue(); aNewLogic.Bottom()=aNewLogic.Top()+n; } @@ -2192,10 +2192,10 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr) } Fraction aResizeX(1,1); Fraction aResizeY(1,1); - if (rAttr.GetItemState(SDRATTR_RESIZEXONE,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_RESIZEXONE,sal_True,&pPoolItem)==SFX_ITEM_SET) { aResizeX*=((const SdrResizeXOneItem*)pPoolItem)->GetValue(); } - if (rAttr.GetItemState(SDRATTR_RESIZEYONE,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_RESIZEYONE,sal_True,&pPoolItem)==SFX_ITEM_SET) { aResizeY*=((const SdrResizeYOneItem*)pPoolItem)->GetValue(); } if (aResizeX!=Fraction(1,1) || aResizeY!=Fraction(1,1)) { @@ -2205,7 +2205,7 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr) void lcl_SetItem(SfxItemSet& rAttr, bool bMerge, const SfxPoolItem& rItem) { - if (bMerge) rAttr.MergeValue(rItem,TRUE); + if (bMerge) rAttr.MergeValue(rItem,sal_True); else rAttr.Put(rItem); } @@ -2288,7 +2288,7 @@ bool SdrObject::IsNode() const return true; } -SdrGluePoint SdrObject::GetVertexGluePoint(USHORT nPosNum) const +SdrGluePoint SdrObject::GetVertexGluePoint(sal_uInt16 nPosNum) const { // #i41936# Use SnapRect for default GluePoints const Rectangle aR(GetSnapRect()); @@ -2304,12 +2304,12 @@ SdrGluePoint SdrObject::GetVertexGluePoint(USHORT nPosNum) const aPt -= aR.Center(); SdrGluePoint aGP(aPt); - aGP.SetPercent(FALSE); + aGP.SetPercent(sal_False); return aGP; } -SdrGluePoint SdrObject::GetCornerGluePoint(USHORT nPosNum) const +SdrGluePoint SdrObject::GetCornerGluePoint(sal_uInt16 nPosNum) const { Rectangle aR(GetCurrentBoundRect()); Point aPt; @@ -2321,7 +2321,7 @@ SdrGluePoint SdrObject::GetCornerGluePoint(USHORT nPosNum) const } aPt-=GetSnapRect().Center(); SdrGluePoint aGP(aPt); - aGP.SetPercent(FALSE); + aGP.SetPercent(sal_False); return aGP; } @@ -2410,7 +2410,7 @@ SdrObject* SdrObject::GetConnectedNode(bool /*bTail1*/) const //////////////////////////////////////////////////////////////////////////////////////////////////// -SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, BOOL bForceLineDash) const +SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, sal_Bool bForceLineDash) const { bool bNoChange(true); @@ -2423,7 +2423,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, BOOL bForceLineDas if(xSequence.hasElements()) { // use neutral ViewInformation - const drawinglayer::geometry::ViewInformation2D aViewInformation2D(0); + const drawinglayer::geometry::ViewInformation2D aViewInformation2D; // create extractor, process and get result drawinglayer::processor2d::LineGeometryExtractor2D aExtractor(aViewInformation2D); @@ -2471,7 +2471,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, BOOL bForceLineDas aSet.Put(XLineWidthItem(0L)); aSet.Put(XLineStyleItem(XLINE_NONE)); Color aColorLine = ((const XLineColorItem&)(aSet.Get(XATTR_LINECOLOR))).GetColorValue(); - UINT16 nTransLine = ((const XLineTransparenceItem&)(aSet.Get(XATTR_LINETRANSPARENCE))).GetValue(); + sal_uInt16 nTransLine = ((const XLineTransparenceItem&)(aSet.Get(XATTR_LINETRANSPARENCE))).GetValue(); aSet.Put(XFillColorItem(XubString(), aColorLine)); aSet.Put(XFillStyleItem(XFILL_SOLID)); aSet.Put(XFillTransparenceItem(nTransLine)); @@ -2584,7 +2584,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, BOOL bForceLineDas } // convert this path object to contour object, even when it is a group -SdrObject* SdrObject::ConvertToContourObj(SdrObject* pRet, BOOL bForceLineDash) const +SdrObject* SdrObject::ConvertToContourObj(SdrObject* pRet, sal_Bool bForceLineDash) const { if(pRet->ISA(SdrObjGroup)) { @@ -2592,7 +2592,7 @@ SdrObject* SdrObject::ConvertToContourObj(SdrObject* pRet, BOOL bForceLineDash) SdrObject* pGroup = new SdrObjGroup; pGroup->SetModel(pRet->GetModel()); - for(UINT32 a=0;a<pObjList2->GetObjCount();a++) + for(sal_uInt32 a=0;a<pObjList2->GetObjCount();a++) { SdrObject* pIterObj = pObjList2->GetObj(a); pGroup->GetSubList()->NbcInsertObject(ConvertToContourObj(pIterObj, bForceLineDash)); @@ -2626,7 +2626,7 @@ SdrObject* SdrObject::ConvertToContourObj(SdrObject* pRet, BOOL bForceLineDash) //////////////////////////////////////////////////////////////////////////////////////////////////// -SdrObject* SdrObject::ConvertToPolyObj(BOOL bBezier, BOOL bLineToArea) const +SdrObject* SdrObject::ConvertToPolyObj(sal_Bool bBezier, sal_Bool bLineToArea) const { SdrObject* pRet = DoConvertToPolyObj(bBezier); @@ -2648,7 +2648,7 @@ SdrObject* SdrObject::ConvertToPolyObj(BOOL bBezier, BOOL bLineToArea) const //////////////////////////////////////////////////////////////////////////////////////////////////// -SdrObject* SdrObject::DoConvertToPolyObj(BOOL /*bBezier*/) const +SdrObject* SdrObject::DoConvertToPolyObj(sal_Bool /*bBezier*/) const { return NULL; } @@ -2723,19 +2723,19 @@ void SdrObject::SetVisible(sal_Bool bVisible) //////////////////////////////////////////////////////////////////////////////////////////////////// -USHORT SdrObject::GetUserDataCount() const +sal_uInt16 SdrObject::GetUserDataCount() const { if (pPlusData==NULL || pPlusData->pUserDataList==NULL) return 0; return pPlusData->pUserDataList->GetUserDataCount(); } -SdrObjUserData* SdrObject::GetUserData(USHORT nNum) const +SdrObjUserData* SdrObject::GetUserData(sal_uInt16 nNum) const { if (pPlusData==NULL || pPlusData->pUserDataList==NULL) return NULL; return pPlusData->pUserDataList->GetUserData(nNum); } -void SdrObject::InsertUserData(SdrObjUserData* pData, USHORT nPos) +void SdrObject::InsertUserData(SdrObjUserData* pData, sal_uInt16 nPos) { if (pData!=NULL) { ImpForcePlusData(); @@ -2746,9 +2746,9 @@ void SdrObject::InsertUserData(SdrObjUserData* pData, USHORT nPos) } } -void SdrObject::DeleteUserData(USHORT nNum) +void SdrObject::DeleteUserData(sal_uInt16 nNum) { - USHORT nAnz=GetUserDataCount(); + sal_uInt16 nAnz=GetUserDataCount(); if (nNum<nAnz) { pPlusData->pUserDataList->DeleteUserData(nNum); if (nAnz==1) { @@ -2848,7 +2848,7 @@ void SdrObject::MigrateItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, S } } -sal_Bool SdrObject::IsTransparent( BOOL /*bCheckForAlphaChannel*/) const +sal_Bool SdrObject::IsTransparent( sal_Bool /*bCheckForAlphaChannel*/) const { bool bRet = false; @@ -2865,7 +2865,7 @@ sal_Bool SdrObject::IsTransparent( BOOL /*bCheckForAlphaChannel*/) const ( ( rAttr.GetItemState( XATTR_FILLFLOATTRANSPARENCE ) == SFX_ITEM_SET ) && ( (const XFillFloatTransparenceItem&) rAttr.Get( XATTR_FILLFLOATTRANSPARENCE ) ).IsEnabled() ) ) { - bRet = TRUE; + bRet = sal_True; } else if( pO->ISA( SdrGrafObj ) ) { @@ -2873,7 +2873,7 @@ sal_Bool SdrObject::IsTransparent( BOOL /*bCheckForAlphaChannel*/) const if( ( (const SdrGrafTransparenceItem&) rAttr.Get( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() || ( pGrafObj->GetGraphicType() == GRAPHIC_BITMAP && pGrafObj->GetGraphic().GetBitmapEx().IsAlpha() ) ) { - bRet = TRUE; + bRet = sal_True; } } } @@ -2887,7 +2887,7 @@ sal_Bool SdrObject::IsTransparent( BOOL /*bCheckForAlphaChannel*/) const ( ( rAttr.GetItemState( XATTR_FILLFLOATTRANSPARENCE ) == SFX_ITEM_SET ) && ( (const XFillFloatTransparenceItem&) rAttr.Get( XATTR_FILLFLOATTRANSPARENCE ) ).IsEnabled() ) ) { - bRet = TRUE; + bRet = sal_True; } else if( ISA( SdrGrafObj ) ) { @@ -3149,7 +3149,7 @@ void SdrObject::SetContextWritingMode( const sal_Int16 /*_nContextWritingMode*/ // //////////////////////////////////////////////////////////////////////////////////////////////////// -SdrObjFactory::SdrObjFactory(UINT32 nInvent, UINT16 nIdent, SdrPage* pNewPage, SdrModel* pNewModel) +SdrObjFactory::SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pNewPage, SdrModel* pNewModel) { nInventor=nInvent; nIdentifier=nIdent; @@ -3160,7 +3160,7 @@ SdrObjFactory::SdrObjFactory(UINT32 nInvent, UINT16 nIdent, SdrPage* pNewPage, S pNewData=NULL; } -SdrObjFactory::SdrObjFactory(UINT32 nInvent, UINT16 nIdent, SdrObject* pObj1) +SdrObjFactory::SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrObject* pObj1) { nInventor=nInvent; nIdentifier=nIdent; @@ -3171,7 +3171,7 @@ SdrObjFactory::SdrObjFactory(UINT32 nInvent, UINT16 nIdent, SdrObject* pObj1) pNewData=NULL; } -SdrObject* SdrObjFactory::MakeNewObject(UINT32 nInvent, UINT16 nIdent, SdrPage* pPage, SdrModel* pModel) +SdrObject* SdrObjFactory::MakeNewObject(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pPage, SdrModel* pModel) { if(pModel == NULL && pPage != NULL) pModel = pPage->GetModel(); @@ -3181,37 +3181,37 @@ SdrObject* SdrObjFactory::MakeNewObject(UINT32 nInvent, UINT16 nIdent, SdrPage* { switch (nIdent) { - case USHORT(OBJ_NONE ): pObj=new SdrObject; break; - case USHORT(OBJ_GRUP ): pObj=new SdrObjGroup; break; - case USHORT(OBJ_LINE ): pObj=new SdrPathObj(OBJ_LINE ); break; - case USHORT(OBJ_POLY ): pObj=new SdrPathObj(OBJ_POLY ); break; - case USHORT(OBJ_PLIN ): pObj=new SdrPathObj(OBJ_PLIN ); break; - case USHORT(OBJ_PATHLINE ): pObj=new SdrPathObj(OBJ_PATHLINE ); break; - case USHORT(OBJ_PATHFILL ): pObj=new SdrPathObj(OBJ_PATHFILL ); break; - case USHORT(OBJ_FREELINE ): pObj=new SdrPathObj(OBJ_FREELINE ); break; - case USHORT(OBJ_FREEFILL ): pObj=new SdrPathObj(OBJ_FREEFILL ); break; - case USHORT(OBJ_PATHPOLY ): pObj=new SdrPathObj(OBJ_POLY ); break; - case USHORT(OBJ_PATHPLIN ): pObj=new SdrPathObj(OBJ_PLIN ); break; - case USHORT(OBJ_EDGE ): pObj=new SdrEdgeObj; break; - case USHORT(OBJ_RECT ): pObj=new SdrRectObj; break; - case USHORT(OBJ_CIRC ): pObj=new SdrCircObj(OBJ_CIRC ); break; - case USHORT(OBJ_SECT ): pObj=new SdrCircObj(OBJ_SECT ); break; - case USHORT(OBJ_CARC ): pObj=new SdrCircObj(OBJ_CARC ); break; - case USHORT(OBJ_CCUT ): pObj=new SdrCircObj(OBJ_CCUT ); break; - case USHORT(OBJ_TEXT ): pObj=new SdrRectObj(OBJ_TEXT ); break; - case USHORT(OBJ_TEXTEXT ): pObj=new SdrRectObj(OBJ_TEXTEXT ); break; - case USHORT(OBJ_TITLETEXT ): pObj=new SdrRectObj(OBJ_TITLETEXT ); break; - case USHORT(OBJ_OUTLINETEXT): pObj=new SdrRectObj(OBJ_OUTLINETEXT); break; - case USHORT(OBJ_MEASURE ): pObj=new SdrMeasureObj; break; - case USHORT(OBJ_GRAF ): pObj=new SdrGrafObj; break; - case USHORT(OBJ_OLE2 ): pObj=new SdrOle2Obj; break; - case USHORT(OBJ_FRAME ): pObj=new SdrOle2Obj(TRUE); break; - case USHORT(OBJ_CAPTION ): pObj=new SdrCaptionObj; break; - case USHORT(OBJ_PAGE ): pObj=new SdrPageObj; break; - case USHORT(OBJ_UNO ): pObj=new SdrUnoObj(String()); break; - case USHORT(OBJ_CUSTOMSHAPE ): pObj=new SdrObjCustomShape(); break; - case USHORT(OBJ_MEDIA ): pObj=new SdrMediaObj(); break; - case USHORT(OBJ_TABLE ): pObj=new ::sdr::table::SdrTableObj(pModel); break; + case sal_uInt16(OBJ_NONE ): pObj=new SdrObject; break; + case sal_uInt16(OBJ_GRUP ): pObj=new SdrObjGroup; break; + case sal_uInt16(OBJ_LINE ): pObj=new SdrPathObj(OBJ_LINE ); break; + case sal_uInt16(OBJ_POLY ): pObj=new SdrPathObj(OBJ_POLY ); break; + case sal_uInt16(OBJ_PLIN ): pObj=new SdrPathObj(OBJ_PLIN ); break; + case sal_uInt16(OBJ_PATHLINE ): pObj=new SdrPathObj(OBJ_PATHLINE ); break; + case sal_uInt16(OBJ_PATHFILL ): pObj=new SdrPathObj(OBJ_PATHFILL ); break; + case sal_uInt16(OBJ_FREELINE ): pObj=new SdrPathObj(OBJ_FREELINE ); break; + case sal_uInt16(OBJ_FREEFILL ): pObj=new SdrPathObj(OBJ_FREEFILL ); break; + case sal_uInt16(OBJ_PATHPOLY ): pObj=new SdrPathObj(OBJ_POLY ); break; + case sal_uInt16(OBJ_PATHPLIN ): pObj=new SdrPathObj(OBJ_PLIN ); break; + case sal_uInt16(OBJ_EDGE ): pObj=new SdrEdgeObj; break; + case sal_uInt16(OBJ_RECT ): pObj=new SdrRectObj; break; + case sal_uInt16(OBJ_CIRC ): pObj=new SdrCircObj(OBJ_CIRC ); break; + case sal_uInt16(OBJ_SECT ): pObj=new SdrCircObj(OBJ_SECT ); break; + case sal_uInt16(OBJ_CARC ): pObj=new SdrCircObj(OBJ_CARC ); break; + case sal_uInt16(OBJ_CCUT ): pObj=new SdrCircObj(OBJ_CCUT ); break; + case sal_uInt16(OBJ_TEXT ): pObj=new SdrRectObj(OBJ_TEXT ); break; + case sal_uInt16(OBJ_TEXTEXT ): pObj=new SdrRectObj(OBJ_TEXTEXT ); break; + case sal_uInt16(OBJ_TITLETEXT ): pObj=new SdrRectObj(OBJ_TITLETEXT ); break; + case sal_uInt16(OBJ_OUTLINETEXT): pObj=new SdrRectObj(OBJ_OUTLINETEXT); break; + case sal_uInt16(OBJ_MEASURE ): pObj=new SdrMeasureObj; break; + case sal_uInt16(OBJ_GRAF ): pObj=new SdrGrafObj; break; + case sal_uInt16(OBJ_OLE2 ): pObj=new SdrOle2Obj; break; + case sal_uInt16(OBJ_FRAME ): pObj=new SdrOle2Obj(sal_True); break; + case sal_uInt16(OBJ_CAPTION ): pObj=new SdrCaptionObj; break; + case sal_uInt16(OBJ_PAGE ): pObj=new SdrPageObj; break; + case sal_uInt16(OBJ_UNO ): pObj=new SdrUnoObj(String()); break; + case sal_uInt16(OBJ_CUSTOMSHAPE ): pObj=new SdrObjCustomShape(); break; + case sal_uInt16(OBJ_MEDIA ): pObj=new SdrMediaObj(); break; + case sal_uInt16(OBJ_TABLE ): pObj=new ::sdr::table::SdrTableObj(pModel); break; } } @@ -3245,13 +3245,13 @@ SdrObject* SdrObjFactory::MakeNewObject(UINT32 nInvent, UINT16 nIdent, SdrPage* return pObj; } -SdrObjUserData* SdrObjFactory::MakeNewObjUserData(UINT32 nInvent, UINT16 nIdent, SdrObject* pObj1) +SdrObjUserData* SdrObjFactory::MakeNewObjUserData(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrObject* pObj1) { SdrObjUserData* pData=NULL; if (nInvent==SdrInventor) { switch (nIdent) { - case USHORT(SDRUSERDATA_OBJTEXTLINK) : pData=new ImpSdrObjTextLinkUserData((SdrTextObj*)pObj1); break; + case sal_uInt16(SDRUSERDATA_OBJTEXTLINK) : pData=new ImpSdrObjTextLinkUserData((SdrTextObj*)pObj1); break; } } if (pData==NULL) { diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index bf716dc7fd59..0bad6f44213b 100644..100755 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -42,8 +42,8 @@ #include <svx/svddrag.hxx> #include <svx/svdmodel.hxx> #include <svx/svdview.hxx> // fuer RectSnap -#include "svdglob.hxx" // StringCache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Objektname #include <svx/svdogrp.hxx> #include <svx/svdpage.hxx> #include <svx/xflhtit.hxx> @@ -86,15 +86,15 @@ public: ImpCaptParams() { eType =SDRCAPT_TYPE3; - bFixedAngle=FALSE; + bFixedAngle=sal_False; nAngle =4500; nGap =0; eEscDir =SDRCAPT_ESCHORIZONTAL; - bEscRel =TRUE; + bEscRel =sal_True; nEscRel =5000; nEscAbs =0; nLineLen =0; - bFitLineLen=TRUE; + bFitLineLen=sal_True; } void CalcEscPos(const Point& rTail, const Rectangle& rRect, Point& rPt, EscDir& rDir) const; }; @@ -202,24 +202,24 @@ TYPEINIT1(SdrCaptionObj,SdrRectObj); SdrCaptionObj::SdrCaptionObj(): SdrRectObj(OBJ_TEXT), aTailPoly(3), // Default Groesse: 3 Punkte = 2 Linien - mbSpecialTextBoxShadow(FALSE), - mbFixedTail(FALSE) + mbSpecialTextBoxShadow(sal_False), + mbFixedTail(sal_False) { } SdrCaptionObj::SdrCaptionObj(const Rectangle& rRect): SdrRectObj(OBJ_TEXT,rRect), aTailPoly(3), // Default Groesse: 3 Punkte = 2 Linien - mbSpecialTextBoxShadow(FALSE), - mbFixedTail(FALSE) + mbSpecialTextBoxShadow(sal_False), + mbFixedTail(sal_False) { } SdrCaptionObj::SdrCaptionObj(const Rectangle& rRect, const Point& rTail): SdrRectObj(OBJ_TEXT,rRect), aTailPoly(3), // Default Groesse: 3 Punkte = 2 Linien - mbSpecialTextBoxShadow(FALSE), - mbFixedTail(FALSE) + mbSpecialTextBoxShadow(sal_False), + mbFixedTail(sal_False) { aTailPoly[0]=maFixedTailPos=rTail; } @@ -230,25 +230,25 @@ SdrCaptionObj::~SdrCaptionObj() void SdrCaptionObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { - rInfo.bRotateFreeAllowed=FALSE; - rInfo.bRotate90Allowed =FALSE; - rInfo.bMirrorFreeAllowed=FALSE; - rInfo.bMirror45Allowed =FALSE; - rInfo.bMirror90Allowed =FALSE; - rInfo.bTransparenceAllowed = FALSE; - rInfo.bGradientAllowed = FALSE; - rInfo.bShearAllowed =FALSE; - rInfo.bEdgeRadiusAllowed=FALSE; - rInfo.bCanConvToPath =TRUE; - rInfo.bCanConvToPoly =TRUE; - rInfo.bCanConvToPathLineToArea=FALSE; - rInfo.bCanConvToPolyLineToArea=FALSE; + rInfo.bRotateFreeAllowed=sal_False; + rInfo.bRotate90Allowed =sal_False; + rInfo.bMirrorFreeAllowed=sal_False; + rInfo.bMirror45Allowed =sal_False; + rInfo.bMirror90Allowed =sal_False; + rInfo.bTransparenceAllowed = sal_False; + rInfo.bGradientAllowed = sal_False; + rInfo.bShearAllowed =sal_False; + rInfo.bEdgeRadiusAllowed=sal_False; + rInfo.bCanConvToPath =sal_True; + rInfo.bCanConvToPoly =sal_True; + rInfo.bCanConvToPathLineToArea=sal_False; + rInfo.bCanConvToPolyLineToArea=sal_False; rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary()); } -UINT16 SdrCaptionObj::GetObjIdentifier() const +sal_uInt16 SdrCaptionObj::GetObjIdentifier() const { - return UINT16(OBJ_CAPTION); + return sal_uInt16(OBJ_CAPTION); } void SdrCaptionObj::operator=(const SdrObject& rObj) @@ -560,7 +560,7 @@ void SdrCaptionObj::ImpCalcTail(const ImpCaptParams& rPara, Polygon& rPoly, Rect bool SdrCaptionObj::BegCreate(SdrDragStat& rStat) { - if (aRect.IsEmpty()) return FALSE; // Create z.Zt. nur mit vorgegebenen Rect + if (aRect.IsEmpty()) return sal_False; // Create z.Zt. nur mit vorgegebenen Rect ImpCaptParams aPara; ImpGetCaptParams(aPara); @@ -568,7 +568,7 @@ bool SdrCaptionObj::BegCreate(SdrDragStat& rStat) aTailPoly[0]=rStat.GetStart(); ImpCalcTail(aPara,aTailPoly,aRect); rStat.SetActionRect(aRect); - return TRUE; + return sal_True; } bool SdrCaptionObj::MovCreate(SdrDragStat& rStat) @@ -579,8 +579,8 @@ bool SdrCaptionObj::MovCreate(SdrDragStat& rStat) ImpCalcTail(aPara,aTailPoly,aRect); rStat.SetActionRect(aRect); SetBoundRectDirty(); - bSnapRectDirty=TRUE; - return TRUE; + bSnapRectDirty=sal_True; + return sal_True; } bool SdrCaptionObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) @@ -595,7 +595,7 @@ bool SdrCaptionObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) bool SdrCaptionObj::BckCreate(SdrDragStat& /*rStat*/) { - return FALSE; + return sal_False; } void SdrCaptionObj::BrkCreate(SdrDragStat& /*rStat*/) @@ -756,7 +756,7 @@ void SdrCaptionObj::RestGeoData(const SdrObjGeoData& rGeo) aTailPoly=rCGeo.aTailPoly; } -SdrObject* SdrCaptionObj::DoConvertToPolyObj(BOOL bBezier) const +SdrObject* SdrCaptionObj::DoConvertToPolyObj(sal_Bool bBezier) const { // #42334# - Convert implementiert SdrObject* pRect=SdrRectObj::DoConvertToPolyObj(bBezier); SdrObject* pTail = ImpConvertMakeObj(basegfx::B2DPolyPolygon(aTailPoly.getB2DPolygon()), sal_False, bBezier); diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index a96ed7d4e53e..273908513697 100644..100755 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -48,8 +48,8 @@ #include <svx/svdpage.hxx> #include <svx/svdopath.hxx> // fuer die Objektkonvertierung #include <svx/svdview.hxx> // Zum Draggen (Ortho) -#include "svdglob.hxx" // StringCache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Objektname #include <editeng/eeitem.hxx> #include "svdoimp.hxx" #include <svx/sdr/properties/circleproperties.hxx> @@ -154,15 +154,15 @@ SdrCircObj::~SdrCircObj() void SdrCircObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { bool bCanConv=!HasText() || ImpCanConvTextToCurve(); - rInfo.bEdgeRadiusAllowed = FALSE; + rInfo.bEdgeRadiusAllowed = sal_False; rInfo.bCanConvToPath=bCanConv; rInfo.bCanConvToPoly=bCanConv; rInfo.bCanConvToContour = !IsFontwork() && (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary()); } -UINT16 SdrCircObj::GetObjIdentifier() const +sal_uInt16 SdrCircObj::GetObjIdentifier() const { - return UINT16(meCircleKind); + return sal_uInt16(meCircleKind); } bool SdrCircObj::PaintNeedsXPolyCirc() const @@ -172,10 +172,8 @@ bool SdrCircObj::PaintNeedsXPolyCirc() const // und wenn nicht WIN dann (erstmal) auch fuer Kreis-/Ellipsenausschnitte // und Kreis-/Ellipsenboegen (wg. Genauigkeit) bool bNeed=aGeo.nDrehWink!=0 || aGeo.nShearWink!=0 || meCircleKind==OBJ_CCUT; -#ifndef WIN // Wenn nicht Win, dann fuer alle ausser Vollkreis (erstmal!!!) if (meCircleKind!=OBJ_CIRC) bNeed = true; -#endif const SfxItemSet& rSet = GetObjectItemSet(); if(!bNeed) @@ -298,7 +296,7 @@ void SdrCircObj::RecalcXPoly() void SdrCircObj::TakeObjNameSingul(XubString& rName) const { - USHORT nID=STR_ObjNameSingulCIRC; + sal_uInt16 nID=STR_ObjNameSingulCIRC; if (aRect.GetWidth()==aRect.GetHeight() && aGeo.nShearWink==0) { switch (meCircleKind) { case OBJ_CIRC: nID=STR_ObjNameSingulCIRC; break; @@ -330,7 +328,7 @@ void SdrCircObj::TakeObjNameSingul(XubString& rName) const void SdrCircObj::TakeObjNamePlural(XubString& rName) const { - USHORT nID=STR_ObjNamePluralCIRC; + sal_uInt16 nID=STR_ObjNamePluralCIRC; if (aRect.GetWidth()==aRect.GetHeight() && aGeo.nShearWink==0) { switch (meCircleKind) { case OBJ_CIRC: nID=STR_ObjNamePluralCIRC; break; @@ -388,7 +386,7 @@ public: nStart(0), nEnd(0), nWink(0), - bRight(FALSE) + bRight(sal_False) {} void SetCreateParams(SdrDragStat& rStat); }; @@ -599,7 +597,7 @@ String SdrCircObj::getSpecialDragComment(const SdrDragStat& rDrag) const nWink = pU->nEnd; } - aStr += GetWinkStr(nWink,FALSE); + aStr += GetWinkStr(nWink,sal_False); aStr += sal_Unicode(')'); } @@ -616,7 +614,7 @@ String SdrCircObj::getSpecialDragComment(const SdrDragStat& rDrag) const ImpTakeDescriptionStr(STR_DragCircAngle, aStr); aStr.AppendAscii(" ("); - aStr += GetWinkStr(nWink,FALSE); + aStr += GetWinkStr(nWink,sal_False); aStr += sal_Unicode(')'); return aStr; @@ -702,7 +700,7 @@ bool SdrCircObj::BegCreate(SdrDragStat& rStat) rStat.SetActionRect(aRect1); aRect = aRect1; ImpSetCreateParams(rStat); - return TRUE; + return sal_True; } bool SdrCircObj::MovCreate(SdrDragStat& rStat) @@ -715,7 +713,7 @@ bool SdrCircObj::MovCreate(SdrDragStat& rStat) nStartWink=pU->nStart; nEndWink=pU->nEnd; SetBoundRectDirty(); - bSnapRectDirty=TRUE; + bSnapRectDirty=sal_True; SetXPolyDirty(); // #i103058# push current angle settings to ItemSet to @@ -725,7 +723,7 @@ bool SdrCircObj::MovCreate(SdrDragStat& rStat) ImpSetCircInfoToAttr(); } - return TRUE; + return sal_True; } bool SdrCircObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) @@ -1102,8 +1100,8 @@ void SdrCircObj::ImpSetAttrToCircInfo() sal_Int32 nNewStart = ((SdrCircStartAngleItem&)rSet.Get(SDRATTR_CIRCSTARTANGLE)).GetValue(); sal_Int32 nNewEnd = ((SdrCircEndAngleItem&)rSet.Get(SDRATTR_CIRCENDANGLE)).GetValue(); - BOOL bKindChg = meCircleKind != eNewKind; - BOOL bWinkChg = nNewStart != nStartWink || nNewEnd != nEndWink; + sal_Bool bKindChg = meCircleKind != eNewKind; + sal_Bool bWinkChg = nNewStart != nStartWink || nNewEnd != nEndWink; if(bKindChg || bWinkChg) { @@ -1159,7 +1157,7 @@ void SdrCircObj::ImpSetCircInfoToAttr() } } -SdrObject* SdrCircObj::DoConvertToPolyObj(BOOL bBezier) const +SdrObject* SdrCircObj::DoConvertToPolyObj(sal_Bool bBezier) const { const sal_Bool bFill(OBJ_CARC == meCircleKind ? sal_False : sal_True); const basegfx::B2DPolygon aCircPolygon(ImpCalcXPolyCirc(meCircleKind, aRect, nStartWink, nEndWink)); diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index 7249d8ba1aa0..d61bab8dafdc 100644..100755 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -44,8 +44,8 @@ #include <svx/svdhdl.hxx> #include <svx/svdtrans.hxx> #include <svx/svdetc.hxx> -#include "svdglob.hxx" // StringCache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Objektname #include <svl/style.hxx> #include <svl/smplhint.hxx> #include <editeng/eeitem.hxx> @@ -69,12 +69,12 @@ void SdrObjConnection::ResetVars() nConId=0; nXDist=0; nYDist=0; - bBestConn=TRUE; - bBestVertex=TRUE; - bXDistOvr=FALSE; - bYDistOvr=FALSE; - bAutoVertex=FALSE; - bAutoCorner=FALSE; + bBestConn=sal_True; + bBestVertex=sal_True; + bXDistOvr=sal_False; + bYDistOvr=sal_False; + bAutoVertex=sal_False; + bAutoCorner=sal_False; } bool SdrObjConnection::TakeGluePoint(SdrGluePoint& rGP, bool bSetAbsPos) const @@ -90,7 +90,7 @@ bool SdrObjConnection::TakeGluePoint(SdrGluePoint& rGP, bool bSetAbsPos) const } else { const SdrGluePointList* pGPL=pObj->GetGluePointList(); if (pGPL!=NULL) { - USHORT nNum=pGPL->FindGluePoint(nConId); + sal_uInt16 nNum=pGPL->FindGluePoint(nConId); if (nNum!=SDRGLUEPOINT_NOTFOUND) { rGP=(*pGPL)[nNum]; bRet = true; @@ -118,7 +118,7 @@ Point& SdrEdgeInfoRec::ImpGetLineVersatzPoint(SdrEdgeLineCode eLineCode) return aMiddleLine; } -USHORT SdrEdgeInfoRec::ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const +sal_uInt16 SdrEdgeInfoRec::ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const { switch (eLineCode) { case OBJ1LINE2 : return 1; @@ -132,7 +132,7 @@ USHORT SdrEdgeInfoRec::ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolygon& bool SdrEdgeInfoRec::ImpIsHorzLine(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const { - USHORT nIdx=ImpGetPolyIdx(eLineCode,rXP); + sal_uInt16 nIdx=ImpGetPolyIdx(eLineCode,rXP); bool bHorz=nAngle1==0 || nAngle1==18000; if (eLineCode==OBJ2LINE2 || eLineCode==OBJ2LINE3) { nIdx=rXP.GetPointCount()-nIdx; // #36314# @@ -186,16 +186,16 @@ SdrEdgeObj::SdrEdgeObj() // #110649# mbBoundRectCalculationRunning(sal_False) { - bClosedObj=FALSE; - bIsEdge=TRUE; + bClosedObj=sal_False; + bIsEdge=sal_True; pEdgeTrack=new XPolygon; } SdrEdgeObj::~SdrEdgeObj() { - DisconnectFromNode(TRUE); - DisconnectFromNode(FALSE); + DisconnectFromNode(sal_True); + DisconnectFromNode(sal_False); delete pEdgeTrack; } @@ -244,8 +244,8 @@ void SdrEdgeObj::ImpSetAttrToEdgeInfo() } else if(eKind == SDREDGE_THREELINES) { - BOOL bHor1 = aEdgeInfo.nAngle1 == 0 || aEdgeInfo.nAngle1 == 18000; - BOOL bHor2 = aEdgeInfo.nAngle2 == 0 || aEdgeInfo.nAngle2 == 18000; + sal_Bool bHor1 = aEdgeInfo.nAngle1 == 0 || aEdgeInfo.nAngle1 == 18000; + sal_Bool bHor2 = aEdgeInfo.nAngle2 == 0 || aEdgeInfo.nAngle2 == 18000; if(bHor1) { @@ -315,8 +315,8 @@ void SdrEdgeObj::ImpSetEdgeInfoToAttr() } else if(eKind == SDREDGE_THREELINES) { - BOOL bHor1 = aEdgeInfo.nAngle1 == 0 || aEdgeInfo.nAngle1 == 18000; - BOOL bHor2 = aEdgeInfo.nAngle2 == 0 || aEdgeInfo.nAngle2 == 18000; + sal_Bool bHor1 = aEdgeInfo.nAngle1 == 0 || aEdgeInfo.nAngle1 == 18000; + sal_Bool bHor2 = aEdgeInfo.nAngle2 == 0 || aEdgeInfo.nAngle2 == 18000; n = 2; nVals[0] = bHor1 ? aEdgeInfo.aObj1Line2.X() : aEdgeInfo.aObj1Line2.Y(); @@ -365,24 +365,24 @@ void SdrEdgeObj::ImpSetEdgeInfoToAttr() void SdrEdgeObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { - rInfo.bRotateFreeAllowed=FALSE; - rInfo.bRotate90Allowed =FALSE; - rInfo.bMirrorFreeAllowed=FALSE; - rInfo.bMirror45Allowed =FALSE; - rInfo.bMirror90Allowed =FALSE; - rInfo.bTransparenceAllowed = FALSE; - rInfo.bGradientAllowed = FALSE; - rInfo.bShearAllowed =FALSE; - rInfo.bEdgeRadiusAllowed=FALSE; + rInfo.bRotateFreeAllowed=sal_False; + rInfo.bRotate90Allowed =sal_False; + rInfo.bMirrorFreeAllowed=sal_False; + rInfo.bMirror45Allowed =sal_False; + rInfo.bMirror90Allowed =sal_False; + rInfo.bTransparenceAllowed = sal_False; + rInfo.bGradientAllowed = sal_False; + rInfo.bShearAllowed =sal_False; + rInfo.bEdgeRadiusAllowed=sal_False; bool bCanConv=!HasText() || ImpCanConvTextToCurve(); rInfo.bCanConvToPath=bCanConv; rInfo.bCanConvToPoly=bCanConv; rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary()); } -UINT16 SdrEdgeObj::GetObjIdentifier() const +sal_uInt16 SdrEdgeObj::GetObjIdentifier() const { - return UINT16(OBJ_EDGE); + return sal_uInt16(OBJ_EDGE); } const Rectangle& SdrEdgeObj::GetCurrentBoundRect() const @@ -420,15 +420,15 @@ bool SdrEdgeObj::IsNode() const return true; } -SdrGluePoint SdrEdgeObj::GetVertexGluePoint(USHORT nNum) const +SdrGluePoint SdrEdgeObj::GetVertexGluePoint(sal_uInt16 nNum) const { Point aPt; - USHORT nPntAnz=pEdgeTrack->GetPointCount(); + sal_uInt16 nPntAnz=pEdgeTrack->GetPointCount(); if (nPntAnz>0) { Point aOfs = GetSnapRect().Center(); - if (nNum==2 && GetConnectedNode(TRUE)==NULL) aPt=(*pEdgeTrack)[0]; - else if (nNum==3 && GetConnectedNode(FALSE)==NULL) aPt=(*pEdgeTrack)[nPntAnz-1]; + if (nNum==2 && GetConnectedNode(sal_True)==NULL) aPt=(*pEdgeTrack)[0]; + else if (nNum==3 && GetConnectedNode(sal_False)==NULL) aPt=(*pEdgeTrack)[nPntAnz-1]; else { if ((nPntAnz & 1) ==1) { aPt=(*pEdgeTrack)[nPntAnz/2]; @@ -444,11 +444,11 @@ SdrGluePoint SdrEdgeObj::GetVertexGluePoint(USHORT nNum) const aPt-=aOfs; } SdrGluePoint aGP(aPt); - aGP.SetPercent(FALSE); + aGP.SetPercent(sal_False); return aGP; } -SdrGluePoint SdrEdgeObj::GetCornerGluePoint(USHORT nNum) const +SdrGluePoint SdrEdgeObj::GetCornerGluePoint(sal_uInt16 nNum) const { return GetVertexGluePoint(nNum); } @@ -499,13 +499,13 @@ bool SdrEdgeObj::CheckNodeConnection(bool bTail1) const { bool bRet = false; const SdrObjConnection& rCon=GetConnection(bTail1); - USHORT nPtAnz=pEdgeTrack->GetPointCount(); + sal_uInt16 nPtAnz=pEdgeTrack->GetPointCount(); if (rCon.pObj!=NULL && rCon.pObj->GetPage()==pPage && nPtAnz!=0) { const SdrGluePointList* pGPL=rCon.pObj->GetGluePointList(); - USHORT nConAnz=pGPL==NULL ? 0 : pGPL->GetCount(); - USHORT nGesAnz=nConAnz+8; - Point aTail(bTail1 ? (*pEdgeTrack)[0] : (*pEdgeTrack)[USHORT(nPtAnz-1)]); - for (USHORT i=0; i<nGesAnz && !bRet; i++) { + sal_uInt16 nConAnz=pGPL==NULL ? 0 : pGPL->GetCount(); + sal_uInt16 nGesAnz=nConAnz+8; + Point aTail(bTail1 ? (*pEdgeTrack)[0] : (*pEdgeTrack)[sal_uInt16(nPtAnz-1)]); + for (sal_uInt16 i=0; i<nGesAnz && !bRet; i++) { if (i<nConAnz) { // UserDefined bRet=aTail==(*pGPL)[i].GetAbsolutePos(*rCon.pObj); } else if (i<nConAnz+4) { // Vertex @@ -522,7 +522,7 @@ bool SdrEdgeObj::CheckNodeConnection(bool bTail1) const void SdrEdgeObj::ImpSetTailPoint(bool bTail1, const Point& rPt) { - USHORT nPtAnz=pEdgeTrack->GetPointCount(); + sal_uInt16 nPtAnz=pEdgeTrack->GetPointCount(); if (nPtAnz==0) { (*pEdgeTrack)[0]=rPt; (*pEdgeTrack)[1]=rPt; @@ -530,7 +530,7 @@ void SdrEdgeObj::ImpSetTailPoint(bool bTail1, const Point& rPt) if (!bTail1) (*pEdgeTrack)[1]=rPt; else { (*pEdgeTrack)[1]=(*pEdgeTrack)[0]; (*pEdgeTrack)[0]=rPt; } } else { - if (!bTail1) (*pEdgeTrack)[USHORT(nPtAnz-1)]=rPt; + if (!bTail1) (*pEdgeTrack)[sal_uInt16(nPtAnz-1)]=rPt; else (*pEdgeTrack)[0]=rPt; } ImpRecalcEdgeTrack(); @@ -598,7 +598,7 @@ void SdrEdgeObj::ImpRecalcEdgeTrack() } } -USHORT SdrEdgeObj::ImpCalcEscAngle(SdrObject* pObj, const Point& rPt) const +sal_uInt16 SdrEdgeObj::ImpCalcEscAngle(SdrObject* pObj, const Point& rPt) const { if (pObj==NULL) return SDRESC_ALL; Rectangle aR(pObj->GetSnapRect()); @@ -613,7 +613,7 @@ USHORT SdrEdgeObj::ImpCalcEscAngle(SdrObject* pObj, const Point& rPt) const bool bDiag=Abs(dx-dy)<2; if (bxMitt && byMitt) return SDRESC_ALL; // In der Mitte if (bDiag) { // diagonal - USHORT nRet=0; + sal_uInt16 nRet=0; if (byMitt) nRet|=SDRESC_VERT; if (bxMitt) nRet|=SDRESC_HORZ; if (dxl<dxr) { // Links @@ -639,7 +639,7 @@ USHORT SdrEdgeObj::ImpCalcEscAngle(SdrObject* pObj, const Point& rPt) const bool SdrEdgeObj::ImpStripPolyPoints(XPolygon& /*rXP*/) const { // fehlende Implementation !!! - return FALSE; + return sal_False; } XPolygon SdrEdgeObj::ImpCalcObjToCenter(const Point& rStPt, long nEscAngle, const Rectangle& rRect, const Point& rMeeting) const @@ -705,7 +705,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection& { Point aPt1,aPt2; SdrGluePoint aGP1,aGP2; - USHORT nEsc1=SDRESC_ALL,nEsc2=SDRESC_ALL; + sal_uInt16 nEsc1=SDRESC_ALL,nEsc2=SDRESC_ALL; Rectangle aBoundRect1; Rectangle aBoundRect2; Rectangle aBewareRect1; @@ -713,7 +713,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection& // Erstmal die alten Endpunkte wiederholen if (rTrack0.GetPointCount()!=0) { aPt1=rTrack0[0]; - USHORT nSiz=rTrack0.GetPointCount(); + sal_uInt16 nSiz=rTrack0.GetPointCount(); nSiz--; aPt2=rTrack0[nSiz]; } else { @@ -775,36 +775,36 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection& aBewareRect2=aBoundRect2; } XPolygon aBestXP; - ULONG nBestQual=0xFFFFFFFF; + sal_uIntPtr nBestQual=0xFFFFFFFF; SdrEdgeInfoRec aBestInfo; bool bAuto1=bCon1 && rCon1.bBestVertex; bool bAuto2=bCon2 && rCon2.bBestVertex; - if (bAuto1) rCon1.bAutoVertex=TRUE; - if (bAuto2) rCon2.bAutoVertex=TRUE; - USHORT nBestAuto1=0; - USHORT nBestAuto2=0; - USHORT nAnz1=bAuto1 ? 4 : 1; - USHORT nAnz2=bAuto2 ? 4 : 1; - for (USHORT nNum1=0; nNum1<nAnz1; nNum1++) { + if (bAuto1) rCon1.bAutoVertex=sal_True; + if (bAuto2) rCon2.bAutoVertex=sal_True; + sal_uInt16 nBestAuto1=0; + sal_uInt16 nBestAuto2=0; + sal_uInt16 nAnz1=bAuto1 ? 4 : 1; + sal_uInt16 nAnz2=bAuto2 ? 4 : 1; + for (sal_uInt16 nNum1=0; nNum1<nAnz1; nNum1++) { if (bAuto1) rCon1.nConId=nNum1; - if (bCon1 && rCon1.TakeGluePoint(aGP1,TRUE)) { + if (bCon1 && rCon1.TakeGluePoint(aGP1,sal_True)) { aPt1=aGP1.GetPos(); nEsc1=aGP1.GetEscDir(); if (nEsc1==SDRESC_SMART) nEsc1=ImpCalcEscAngle(rCon1.pObj,aPt1-rCon1.aObjOfs); } - for (USHORT nNum2=0; nNum2<nAnz2; nNum2++) { + for (sal_uInt16 nNum2=0; nNum2<nAnz2; nNum2++) { if (bAuto2) rCon2.nConId=nNum2; - if (bCon2 && rCon2.TakeGluePoint(aGP2,TRUE)) { + if (bCon2 && rCon2.TakeGluePoint(aGP2,sal_True)) { aPt2=aGP2.GetPos(); nEsc2=aGP2.GetEscDir(); if (nEsc2==SDRESC_SMART) nEsc2=ImpCalcEscAngle(rCon2.pObj,aPt2-rCon2.aObjOfs); } for (long nA1=0; nA1<36000; nA1+=9000) { - USHORT nE1=nA1==0 ? SDRESC_RIGHT : nA1==9000 ? SDRESC_TOP : nA1==18000 ? SDRESC_LEFT : nA1==27000 ? SDRESC_BOTTOM : 0; + sal_uInt16 nE1=nA1==0 ? SDRESC_RIGHT : nA1==9000 ? SDRESC_TOP : nA1==18000 ? SDRESC_LEFT : nA1==27000 ? SDRESC_BOTTOM : 0; for (long nA2=0; nA2<36000; nA2+=9000) { - USHORT nE2=nA2==0 ? SDRESC_RIGHT : nA2==9000 ? SDRESC_TOP : nA2==18000 ? SDRESC_LEFT : nA2==27000 ? SDRESC_BOTTOM : 0; + sal_uInt16 nE2=nA2==0 ? SDRESC_RIGHT : nA2==9000 ? SDRESC_TOP : nA2==18000 ? SDRESC_LEFT : nA2==27000 ? SDRESC_BOTTOM : 0; if ((nEsc1&nE1)!=0 && (nEsc2&nE2)!=0) { - ULONG nQual=0; + sal_uIntPtr nQual=0; SdrEdgeInfoRec aInfo; if (pInfo!=NULL) aInfo=*pInfo; XPolygon aXP(ImpCalcEdgeTrack(aPt1,nA1,aBoundRect1,aBewareRect1,aPt2,nA2,aBoundRect2,aBewareRect2,&nQual,&aInfo)); @@ -828,7 +828,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection& XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rectangle& rBoundRect1, const Rectangle& rBewareRect1, const Point& rPt2, long nAngle2, const Rectangle& rBoundRect2, const Rectangle& rBewareRect2, - ULONG* pnQuality, SdrEdgeInfoRec* pInfo) const + sal_uIntPtr* pnQuality, SdrEdgeInfoRec* pInfo) const { SdrEdgeKind eKind=((SdrEdgeKindItem&)(GetObjectItem(SDRATTR_EDGEKIND))).GetValue(); bool bRts1=nAngle1==0; @@ -903,7 +903,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } return aXP; } - USHORT nIntersections=0; + sal_uInt16 nIntersections=0; { Point aC1(aBewareRect1.Center()); Point aC2(aBewareRect2.Center()); @@ -941,8 +941,6 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec long nXMax=Max(aBewareRect1.Right(),aBewareRect2.Right()); long nYMin=Min(aBewareRect1.Top(),aBewareRect2.Top()); long nYMax=Max(aBewareRect1.Bottom(),aBewareRect2.Bottom()); - //bool bBoundOverlap=aBoundRect1.Right()>aBoundRect2.Left() && aBoundRect1.Left()<aBoundRect2.Right() && - // aBoundRect1.Bottom()>aBoundRect2.Top() && aBoundRect1.Top()<aBoundRect2.Bottom(); bool bBewareOverlap=aBewareRect1.Right()>aBewareRect2.Left() && aBewareRect1.Left()<aBewareRect2.Right() && aBewareRect1.Bottom()>aBewareRect2.Top() && aBewareRect1.Top()<aBewareRect2.Bottom(); unsigned nMainCase=3; @@ -971,21 +969,21 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } else if (nMainCase==2) { // Fall 2: if (bHor1) { // beide waagerecht - /* 9 Moeglichkeiten: ù ù ù */ - /* 2.1 Gegenueber, Ueberschneidung à ´ ù */ - /* nur auf der Y-Achse ù ù ù */ - /* 2.2, 2.3 Gegenueber, vertikal versetzt. à ù ù ù ù ù */ - /* Ueberschneidung weder auf der ù ´ ù ù ´ ù */ - /* X- noch auf der Y-Achse ù ù ù à ù ù */ - /* 2.4, 2.5 Untereinander, ù à ù ù ù ù */ - /* Ueberschneidung ù ´ ù ù ´ ù */ - /* nur auf X-Achse ù ù ù ù à ù */ - /* 2.6, 2.7 Gegeneinander, vertikal versetzt. ù ù à ù ù ù */ - /* Ueberschneidung weder auf der ù ´ ù ù ´ ù */ - /* X- noch auf der Y-Achse. ù ù ù ù ù à */ - /* 2.8 Gegeneinander. ù ù ù */ - /* Ueberschneidung nur ù ´ à */ - /* auf der Y-Achse. ù ù ù */ + /* 9 Moeglichkeiten: � � � */ + /* 2.1 Gegenueber, Ueberschneidung � � � */ + /* nur auf der Y-Achse � � � */ + /* 2.2, 2.3 Gegenueber, vertikal versetzt. � � � � � � */ + /* Ueberschneidung weder auf der � � � � � � */ + /* X- noch auf der Y-Achse � � � � � � */ + /* 2.4, 2.5 Untereinander, � � � � � � */ + /* Ueberschneidung � � � � � � */ + /* nur auf X-Achse � � � � � � */ + /* 2.6, 2.7 Gegeneinander, vertikal versetzt. � � � � � � */ + /* Ueberschneidung weder auf der � � � � � � */ + /* X- noch auf der Y-Achse. � � � � � � */ + /* 2.8 Gegeneinander. � � � */ + /* Ueberschneidung nur � � � */ + /* auf der Y-Achse. � � � */ /* 2.9 Die BewareRects der Objekte ueberschneiden */ /* sich auf X- und Y-Achse. */ /* Die Faelle gelten entsprechend umgesetzt auch fuer */ @@ -1004,7 +1002,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec // Ueberschneidung auf der Y-Achse. Faelle 2.1, 2.8, 2.9 if (aBewR1.Right()>aBewR2.Left()) { // Faelle 2.8, 2.9 - // Fall 2.8 ist immer Aussenrumlauf (bDirect=FALSE). + // Fall 2.8 ist immer Aussenrumlauf (bDirect=sal_False). // Fall 2.9 kann auch Direktverbindung sein (bei geringer // Ueberschneidung der BewareRects ohne Ueberschneidung der // Boundrects wenn die Linienaustritte sonst das BewareRect @@ -1062,7 +1060,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec // Ueberschneidung auf der Y-Achse. Faelle 2.1, 2.8, 2.9 if (aBewR1.Bottom()>aBewR2.Top()) { // Faelle 2.8, 2.9 - // Fall 2.8 ist immer Aussenrumlauf (bDirect=FALSE). + // Fall 2.8 ist immer Aussenrumlauf (bDirect=sal_False). // Fall 2.9 kann auch Direktverbindung sein (bei geringer // Ueberschneidung der BewareRects ohne Ueberschneidung der // Boundrects wenn die Linienaustritte sonst das BewareRect @@ -1113,39 +1111,39 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } } } else if (nMainCase==3) { // Fall 3: Einer waagerecht und der andere senkrecht. Sehr viele Fallunterscheidungen - /* Kleine Legende: ù ú ù ú ù -> Ohne Ueberschneidung, maximal Beruehrung. */ - /* ú ú ú ú ú -> Ueberschneidung */ - /* ù ú à ú ù -> Selbe Hoehe */ - /* ú ú ú ú ú -> Ueberschneidung */ - /* ù ú ù ú ù -> Ohne Ueberschneidung, maximal Beruehrung. */ - /* Linienaustritte links ´, rechts Ã, oben Á und unten Â. */ + /* Kleine Legende: � � � � � -> Ohne Ueberschneidung, maximal Beruehrung. */ + /* � � � � � -> Ueberschneidung */ + /* � � � � � -> Selbe Hoehe */ + /* � � � � � -> Ueberschneidung */ + /* � � � � � -> Ohne Ueberschneidung, maximal Beruehrung. */ + /* Linienaustritte links �, rechts �, oben � und unten �. */ /* Insgesamt sind 96 Konstellationen moeglich, wobei einige nicht einmal */ /* eindeutig einem Fall und damit einer Behandlungsmethode zugeordnet werden */ /* koennen. */ /* 3.1: Hierzu moegen alle Konstellationen zaehlen, die durch den */ /* Default-MeetingPoint zufriedenstellend abgedeckt sind (20+12). */ - /*    ú Á Á ú    Diese 12 ù ú ù  ù ù ú ù ú ù ù  ù ú ù ù ú ù ú ù */ - /* ú ú ú ú Á Á ú ú ú ú Konstel. ú ú ú ú ú ú ú ú ú  ú ú ú ú ú  ú ú ú ú */ - /* ù ú à ú ù ù ú ´ ú ù jedoch ù ú à ú Á ù ú à ú  Á ú ´ ú ù  ú ´ ú ù */ - /* ú ú ú ú   ú ú ú ú nur zum ú ú ú ú Á ú ú ú ú ú Á ú ú ú ú ú ú ú ú ú */ - /* Á Á Á ú   ú Á Á Á Teil: ù ú ù Á ù ù ú ù ú ù ù Á ù ú ù ù ú ù ú ù */ + /* � � � � � � � � � � Diese 12 � � � � � � � � � � � � � � � � � � � � */ + /* � � � � � � � � � � Konstel. � � � � � � � � � � � � � � � � � � � � */ + /* � � � � � � � � � � jedoch � � � � � � � � � � � � � � � � � � � � */ + /* � � � � � � � � � � nur zum � � � � � � � � � � � � � � � � � � � � */ + /* � � � � � � � � � � Teil: � � � � � � � � � � � � � � � � � � � � */ /* Letztere 16 Faelle scheiden aus, sobald sich die Objekte offen */ /* gegenueberstehen (siehe Fall 3.2). */ /* 3.2: Die Objekte stehen sich offen gegenueber und somit ist eine */ /* Verbindung mit lediglich 2 Linien moeglich (4+20). */ /* Dieser Fall hat 1. Prioritaet. */ - /* ù ú ù ú   ú ù ú ù Diese 20 ù ú ù  ù ù  ù ú ù ù ú ù ú ù ù ú ù ú ù */ - /* ú ú ú ú ú ú ú ú ú ú Konstel. ú ú ú     ú ú ú ú ú ú ú ú ú ú ú ú ú */ - /* ù ú à ú ù ù ú ´ ú ù jedoch ù ú à Á Á Á Á ´ ú ù ù ú à     ´ ú ù */ - /* ú ú ú ú ú ú ú ú ú ú nur zum ú ú ú Á Á Á Á ú ú ú ú ú ú ú ú ú ú ú ú ú */ - /* ù ú ù ú Á Á ú ù ú ù Teil: ù ú ù Á ù ù Á ù ú ù ù ú ù ú ù ù ú ù ú ù */ + /* � � � � � � � � � � Diese 20 � � � � � � � � � � � � � � � � � � � � */ + /* � � � � � � � � � � Konstel. � � � � � � � � � � � � � � � � � � � � */ + /* � � � � � � � � � � jedoch � � � � � � � � � � � � � � � � � � � � */ + /* � � � � � � � � � � nur zum � � � � � � � � � � � � � � � � � � � � */ + /* � � � � � � � � � � Teil: � � � � � � � � � � � � � � � � � � � � */ /* 3.3: Die Linienaustritte zeigen vom anderen Objekt weg bzw. hinter */ /* dessen Ruecken vorbei (52+4). */ - /* Á Á Á Á ù ù Á Á Á Á ù ú ú ú ù ù ú ù ú ù Diese 4 ù ú ù ú ù ù ú ù ú ù */ - /* Á Á Á Á ú ú Á Á Á Á    ú ú ú ú    Konstel. ú ú ú  ú ú  ú ú ú */ - /* Á Á à ú ù ù ú ´ Á Á   à ú ù ù ú ´   jedoch ù ú à ú ù ù ú ´ ú ù */ - /* Á Á Á ú ú ú ú Á Á Á     ú ú     nur zum ú ú ú Á ú ú Á ú ú ú */ - /* ù ú ù ú ù ù ú ù ú ù     ù ù     Teil: ù ú ù ú ù ù ú ù ú ù */ + /* � � � � � � � � � � � � � � � � � � � � Diese 4 � � � � � � � � � � */ + /* � � � � � � � � � � � � � � � � � � � � Konstel. � � � � � � � � � � */ + /* � � � � � � � � � � � � � � � � � � � � jedoch � � � � � � � � � � */ + /* � � � � � � � � � � � � � � � � � � � � nur zum � � � � � � � � � � */ + /* � � � � � � � � � � � � � � � � � � � � Teil: � � � � � � � � � � */ // Fall 3.2 Rectangle aTmpR1(aBewareRect1); @@ -1189,8 +1187,8 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec XPolygon aXP1(ImpCalcObjToCenter(aPt1,nAngle1,aBewareRect1,aMeeting)); XPolygon aXP2(ImpCalcObjToCenter(aPt2,nAngle2,aBewareRect2,aMeeting)); - USHORT nXP1Anz=aXP1.GetPointCount(); - USHORT nXP2Anz=aXP2.GetPointCount(); + sal_uInt16 nXP1Anz=aXP1.GetPointCount(); + sal_uInt16 nXP2Anz=aXP2.GetPointCount(); if (bInfo) { pInfo->nObj1Lines=nXP1Anz; if (nXP1Anz>1) pInfo->nObj1Lines--; pInfo->nObj2Lines=nXP2Anz; if (nXP2Anz>1) pInfo->nObj2Lines--; @@ -1228,13 +1226,13 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec // Dies wird die Mittellinie. pInfo->nMiddleLine=nXP1Anz-1; } - USHORT nNum=aXP2.GetPointCount(); + sal_uInt16 nNum=aXP2.GetPointCount(); if (aXP1[nXP1Anz-1]==aXP2[nXP2Anz-1] && nXP1Anz>1 && nXP2Anz>1) nNum--; while (nNum>0) { nNum--; aXP1.Insert(XPOLY_APPEND,aXP2[nNum],XPOLY_NORMAL); } - USHORT nPntAnz=aXP1.GetPointCount(); + sal_uInt16 nPntAnz=aXP1.GetPointCount(); char cForm=0; if (bInfo || pnQuality!=NULL) { cForm='?'; @@ -1243,8 +1241,8 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec else if (nPntAnz==4) { // Z oder U if (nAngle1==nAngle2) cForm='U'; else cForm='Z'; - } else if (nPntAnz==4) { /* Ú-¿ Ú-¿ */ - /* ... -Ù -Ù */ + } else if (nPntAnz==4) { /* �-� �-� */ + /* ... -� -� */ } else if (nPntAnz==6) { // S oder C oder ... if (nAngle1!=nAngle2) { // Fuer Typ S hat Linie2 dieselbe Richtung wie Linie4. @@ -1281,11 +1279,11 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } } if (pnQuality!=NULL) { - ULONG nQual=0; - ULONG nQual0=nQual; // Ueberlaeufe vorbeugen + sal_uIntPtr nQual=0; + sal_uIntPtr nQual0=nQual; // Ueberlaeufe vorbeugen bool bOverflow = false; Point aPt0(aXP1[0]); - for (USHORT nPntNum=1; nPntNum<nPntAnz; nPntNum++) { + for (sal_uInt16 nPntNum=1; nPntNum<nPntAnz; nPntNum++) { Point aPt1b(aXP1[nPntNum]); nQual+=Abs(aPt1b.X()-aPt0.X())+Abs(aPt1b.Y()-aPt0.Y()); if (nQual<nQual0) bOverflow = true; @@ -1293,14 +1291,14 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec aPt0=aPt1b; } - USHORT nTmp=nPntAnz; + sal_uInt16 nTmp=nPntAnz; if (cForm=='Z') { nTmp=2; // Z-Form hat gute Qualitaet (nTmp=2 statt 4) - ULONG n1=Abs(aXP1[1].X()-aXP1[0].X())+Abs(aXP1[1].Y()-aXP1[0].Y()); - ULONG n2=Abs(aXP1[2].X()-aXP1[1].X())+Abs(aXP1[2].Y()-aXP1[1].Y()); - ULONG n3=Abs(aXP1[3].X()-aXP1[2].X())+Abs(aXP1[3].Y()-aXP1[2].Y()); + sal_uIntPtr n1=Abs(aXP1[1].X()-aXP1[0].X())+Abs(aXP1[1].Y()-aXP1[0].Y()); + sal_uIntPtr n2=Abs(aXP1[2].X()-aXP1[1].X())+Abs(aXP1[2].Y()-aXP1[1].Y()); + sal_uIntPtr n3=Abs(aXP1[3].X()-aXP1[2].X())+Abs(aXP1[3].Y()-aXP1[2].Y()); // fuer moeglichst gleichlange Linien sorgen - ULONG nBesser=0; + sal_uIntPtr nBesser=0; n1+=n3; n3=n2/4; if (n1>=n2) nBesser=6; @@ -1311,7 +1309,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } if (nTmp>=3) { nQual0=nQual; - nQual+=(ULONG)nTmp*0x01000000; + nQual+=(sal_uIntPtr)nTmp*0x01000000; if (nQual<nQual0 || nTmp>15) bOverflow = true; } if (nPntAnz>=2) { // Austrittswinkel nochmal pruefen @@ -1331,13 +1329,13 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec aBewareRect1=rBewareRect1; aBewareRect2=rBewareRect2; - for (USHORT i=0; i<nPntAnz; i++) { + for (sal_uInt16 i=0; i<nPntAnz; i++) { Point aPt1b(aXP1[i]); bool b1=aPt1b.X()>aBewareRect1.Left() && aPt1b.X()<aBewareRect1.Right() && aPt1b.Y()>aBewareRect1.Top() && aPt1b.Y()<aBewareRect1.Bottom(); bool b2=aPt1b.X()>aBewareRect2.Left() && aPt1b.X()<aBewareRect2.Right() && aPt1b.Y()>aBewareRect2.Top() && aPt1b.Y()<aBewareRect2.Bottom(); - USHORT nInt0=nIntersections; + sal_uInt16 nInt0=nIntersections; if (i==0 || i==nPntAnz-1) { if (b1 && b2) nIntersections++; } else { @@ -1366,7 +1364,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } if (nPntAnz<=1) nIntersections++; nQual0=nQual; - nQual+=(ULONG)nIntersections*0x10000000; + nQual+=(sal_uIntPtr)nIntersections*0x10000000; if (nQual<nQual0 || nIntersections>15) bOverflow = true; if (bOverflow || nQual==0xFFFFFFFF) nQual=0xFFFFFFFE; @@ -1374,7 +1372,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } if (bInfo) { // nun die Linienversaetze auf aXP1 anwenden if (pInfo->nMiddleLine!=0xFFFF) { - USHORT nIdx=pInfo->ImpGetPolyIdx(MIDDLELINE,aXP1); + sal_uInt16 nIdx=pInfo->ImpGetPolyIdx(MIDDLELINE,aXP1); if (pInfo->ImpIsHorzLine(MIDDLELINE,aXP1)) { aXP1[nIdx].Y()+=pInfo->aMiddleLine.Y(); aXP1[nIdx+1].Y()+=pInfo->aMiddleLine.Y(); @@ -1384,7 +1382,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } } if (pInfo->nObj1Lines>=2) { - USHORT nIdx=pInfo->ImpGetPolyIdx(OBJ1LINE2,aXP1); + sal_uInt16 nIdx=pInfo->ImpGetPolyIdx(OBJ1LINE2,aXP1); if (pInfo->ImpIsHorzLine(OBJ1LINE2,aXP1)) { aXP1[nIdx].Y()+=pInfo->aObj1Line2.Y(); aXP1[nIdx+1].Y()+=pInfo->aObj1Line2.Y(); @@ -1394,7 +1392,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } } if (pInfo->nObj1Lines>=3) { - USHORT nIdx=pInfo->ImpGetPolyIdx(OBJ1LINE3,aXP1); + sal_uInt16 nIdx=pInfo->ImpGetPolyIdx(OBJ1LINE3,aXP1); if (pInfo->ImpIsHorzLine(OBJ1LINE3,aXP1)) { aXP1[nIdx].Y()+=pInfo->aObj1Line3.Y(); aXP1[nIdx+1].Y()+=pInfo->aObj1Line3.Y(); @@ -1404,7 +1402,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } } if (pInfo->nObj2Lines>=2) { - USHORT nIdx=pInfo->ImpGetPolyIdx(OBJ2LINE2,aXP1); + sal_uInt16 nIdx=pInfo->ImpGetPolyIdx(OBJ2LINE2,aXP1); if (pInfo->ImpIsHorzLine(OBJ2LINE2,aXP1)) { aXP1[nIdx].Y()+=pInfo->aObj2Line2.Y(); aXP1[nIdx+1].Y()+=pInfo->aObj2Line2.Y(); @@ -1414,7 +1412,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } } if (pInfo->nObj2Lines>=3) { - USHORT nIdx=pInfo->ImpGetPolyIdx(OBJ2LINE3,aXP1); + sal_uInt16 nIdx=pInfo->ImpGetPolyIdx(OBJ2LINE3,aXP1); if (pInfo->ImpIsHorzLine(OBJ2LINE3,aXP1)) { aXP1[nIdx].Y()+=pInfo->aObj2Line3.Y(); aXP1[nIdx+1].Y()+=pInfo->aObj2Line3.Y(); @@ -1502,17 +1500,17 @@ Normalisiert auf 1. Austrittswinkel nach rechts bleiben dann noch 31. Dann noch eine vertikale Spiegelung wegnormalisiert bleiben noch 16 characteristische Verlaufszuege mit 1-5 Linien: Mit 1 Linie (Typ 'I'): -- -Mit 2 Linien (Typ 'L'): -Ù -Mit 3 Linien (Typ 'U'): -¿ (Typ 'Z'): Ú- - -Ù -Ù +Mit 2 Linien (Typ 'L'): -� +Mit 3 Linien (Typ 'U'): -� (Typ 'Z'): �- + -� -� Mit 4 Linien: 1 ist nicht plausibel, 3 ist=2 (90deg Drehung). Verbleibt 2,4 - Ú-Ù Ú¿ À¿ Ú¿ Ú¿ Ú-¿ - -Ù -Ù -Ù -Ù -Ù -Ù + �-� Ú¿ � Ú¿ Ú¿ �-� + -� -� -� -� -� -� Mit 5 Linien: nicht plausibel sind 1,2,4,5. 7 ist identisch mit 3 (Richtungsumkehr) Bleibt also 3,6 und 8. '4' 'S' 'C' - ¿ Ú -¿ Ú- Ú-¿ Ú- - Ú-Ù Ú-Ù Ú-¿ Ú-¿ À¿ À¿ -Ù ³ Ú-¿ Ú-¿ À¿ Ú-¿ - -Ù -Ù -Ù Ù -Ù À- -Ù -Ù --Ù À Ù -Ù Ù -Ù À Ù + � � -� �- �-� �- + �-� �-� �-� �-� � � -� � �-� �-� � �-� + -� -� -� � -� �- -� -� --� � � -� � -� � � Insgesamt sind also 9 Grundtypen zu unterscheiden die den 400 Konstellationen aus Objektposition und Austrittswinkeln zuzuordnen sind. 4 der 9 Grundtypen haben eine 'Mittellinie'. Die Anzahl der zu Objektabstaende @@ -1532,7 +1530,7 @@ je Objekt variiert von 0-3: void SdrEdgeObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) { SfxSimpleHint* pSimple=PTR_CAST(SfxSimpleHint,&rHint); - ULONG nId=pSimple==0 ? 0 : pSimple->GetId(); + sal_uIntPtr nId=pSimple==0 ? 0 : pSimple->GetId(); bool bDataChg=nId==SFX_HINT_DATACHANGED; bool bDying=nId==SFX_HINT_DYING; bool bObj1=aCon1.pObj!=NULL && aCon1.pObj->GetBroadcaster()==&rBC; @@ -1693,10 +1691,10 @@ sal_uInt32 SdrEdgeObj::GetHdlCount() const } else if (eKind==SDREDGE_THREELINES && nPntAnz == 4L) { - if(GetConnectedNode(TRUE)) + if(GetConnectedNode(sal_True)) nHdlAnz++; - if(GetConnectedNode(FALSE)) + if(GetConnectedNode(sal_False)) nHdlAnz++; } } @@ -1711,10 +1709,10 @@ SdrHdl* SdrEdgeObj::GetHdl(sal_uInt32 nHdlNum) const if (nPntAnz!=0) { if (nHdlNum==0) { pHdl=new ImpEdgeHdl((*pEdgeTrack)[0],HDL_POLY); - if (aCon1.pObj!=NULL && aCon1.bBestVertex) pHdl->Set1PixMore(TRUE); + if (aCon1.pObj!=NULL && aCon1.bBestVertex) pHdl->Set1PixMore(sal_True); } else if (nHdlNum==1) { - pHdl=new ImpEdgeHdl((*pEdgeTrack)[USHORT(nPntAnz-1)],HDL_POLY); - if (aCon2.pObj!=NULL && aCon2.bBestVertex) pHdl->Set1PixMore(TRUE); + pHdl=new ImpEdgeHdl((*pEdgeTrack)[sal_uInt16(nPntAnz-1)],HDL_POLY); + if (aCon2.pObj!=NULL && aCon2.bBestVertex) pHdl->Set1PixMore(sal_True); } else { SdrEdgeKind eKind=((SdrEdgeKindItem&)(GetObjectItem(SDRATTR_EDGEKIND))).GetValue(); if (eKind==SDREDGE_ORTHOLINES || eKind==SDREDGE_BEZIER) { @@ -1754,7 +1752,7 @@ SdrHdl* SdrEdgeObj::GetHdl(sal_uInt32 nHdlNum) const } } else if (eKind==SDREDGE_THREELINES) { sal_uInt32 nNum(nHdlNum); - if (GetConnectedNode(TRUE)==NULL) nNum++; + if (GetConnectedNode(sal_True)==NULL) nNum++; Point aPos((*pEdgeTrack)[(sal_uInt16)nNum-1]); pHdl=new ImpEdgeHdl(aPos,HDL_POLY); if (nNum==2) ((ImpEdgeHdl*)pHdl)->SetLineCode(OBJ1LINE2); @@ -1884,7 +1882,7 @@ bool SdrEdgeObj::applySpecialDrag(SdrDragStat& rDragStat) // force recalc EdgeTrack *pEdgeTrack = ImpCalcEdgeTrack(*pEdgeTrack, aCon1, aCon2, &aEdgeInfo); - bEdgeTrackDirty=FALSE; + bEdgeTrackDirty=sal_False; // save EdgeInfos and mark object as user modified ImpSetEdgeInfoToAttr(); @@ -1986,40 +1984,40 @@ basegfx::B2DPolygon SdrEdgeObj::ImplAddConnectorOverlay(SdrDragMethod& rDragMeth bool SdrEdgeObj::BegCreate(SdrDragStat& rDragStat) { - rDragStat.SetNoSnap(TRUE); + rDragStat.SetNoSnap(sal_True); pEdgeTrack->SetPointCount(2); (*pEdgeTrack)[0]=rDragStat.GetStart(); (*pEdgeTrack)[1]=rDragStat.GetNow(); if (rDragStat.GetPageView()!=NULL) { ImpFindConnector(rDragStat.GetStart(),*rDragStat.GetPageView(),aCon1,this); - ConnectToNode(TRUE,aCon1.pObj); + ConnectToNode(sal_True,aCon1.pObj); } *pEdgeTrack=ImpCalcEdgeTrack(*pEdgeTrack,aCon1,aCon2,&aEdgeInfo); - return TRUE; + return sal_True; } bool SdrEdgeObj::MovCreate(SdrDragStat& rDragStat) { - USHORT nMax=pEdgeTrack->GetPointCount(); + sal_uInt16 nMax=pEdgeTrack->GetPointCount(); (*pEdgeTrack)[nMax-1]=rDragStat.GetNow(); if (rDragStat.GetPageView()!=NULL) { ImpFindConnector(rDragStat.GetNow(),*rDragStat.GetPageView(),aCon2,this); rDragStat.GetView()->SetConnectMarker(aCon2,*rDragStat.GetPageView()); } SetBoundRectDirty(); - bSnapRectDirty=TRUE; - ConnectToNode(FALSE,aCon2.pObj); + bSnapRectDirty=sal_True; + ConnectToNode(sal_False,aCon2.pObj); *pEdgeTrack=ImpCalcEdgeTrack(*pEdgeTrack,aCon1,aCon2,&aEdgeInfo); - bEdgeTrackDirty=FALSE; - return TRUE; + bEdgeTrackDirty=sal_False; + return sal_True; } bool SdrEdgeObj::EndCreate(SdrDragStat& rDragStat, SdrCreateCmd eCmd) { bool bOk=(eCmd==SDRCREATE_FORCEEND || rDragStat.GetPointAnz()>=2); if (bOk) { - ConnectToNode(TRUE,aCon1.pObj); - ConnectToNode(FALSE,aCon2.pObj); + ConnectToNode(sal_True,aCon1.pObj); + ConnectToNode(sal_False,aCon2.pObj); if (rDragStat.GetView()!=NULL) { rDragStat.GetView()->HideConnectMarker(); } @@ -2034,7 +2032,7 @@ bool SdrEdgeObj::BckCreate(SdrDragStat& rDragStat) if (rDragStat.GetView()!=NULL) { rDragStat.GetView()->HideConnectMarker(); } - return FALSE; + return sal_False; } void SdrEdgeObj::BrkCreate(SdrDragStat& rDragStat) @@ -2060,11 +2058,11 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO { rCon.ResetVars(); if (pOut==NULL) pOut=rPV.GetView().GetFirstOutputDevice(); // GetWin(0); - if (pOut==NULL) return FALSE; + if (pOut==NULL) return sal_False; SdrObjList* pOL=rPV.GetObjList(); const SetOfByte& rVisLayer=rPV.GetVisibleLayers(); // Sensitiver Bereich der Konnektoren ist doppelt so gross wie die Handles: - USHORT nMarkHdSiz=rPV.GetView().GetMarkHdlSizePixel(); + sal_uInt16 nMarkHdSiz=rPV.GetView().GetMarkHdlSizePixel(); Size aHalfConSiz(nMarkHdSiz,nMarkHdSiz); aHalfConSiz=pOut->PixelToLogic(aHalfConSiz); Size aHalfCenterSiz(2*aHalfConSiz.Width(),2*aHalfConSiz.Height()); @@ -2073,8 +2071,8 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO aMouseRect.Top() -=aHalfConSiz.Height(); aMouseRect.Right() +=aHalfConSiz.Width(); aMouseRect.Bottom()+=aHalfConSiz.Height(); - USHORT nBoundHitTol=(USHORT)aHalfConSiz.Width()/2; if (nBoundHitTol==0) nBoundHitTol=1; - ULONG no=pOL->GetObjCount(); + sal_uInt16 nBoundHitTol=(sal_uInt16)aHalfConSiz.Width()/2; if (nBoundHitTol==0) nBoundHitTol=1; + sal_uIntPtr no=pOL->GetObjCount(); bool bFnd = false; SdrObjConnection aTestCon; SdrObjConnection aBestCon; @@ -2095,11 +2093,11 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO // Danach kommt Vertex, Corner und Mitte(Best) gleich priorisiert. // Zum Schluss kommt noch ein HitTest aufs Obj. const SdrGluePointList* pGPL=pObj->GetGluePointList(); - USHORT nConAnz=pGPL==NULL ? 0 : pGPL->GetCount(); - USHORT nGesAnz=nConAnz+9; + sal_uInt16 nConAnz=pGPL==NULL ? 0 : pGPL->GetCount(); + sal_uInt16 nGesAnz=nConAnz+9; bool bUserFnd = false; - ULONG nBestDist=0xFFFFFFFF; - for (USHORT i=0; i<nGesAnz; i++) + sal_uIntPtr nBestDist=0xFFFFFFFF; + for (sal_uInt16 i=0; i<nGesAnz; i++) { bool bUser=i<nConAnz; bool bVertex=i>=nConAnz+0 && i<nConAnz+4; @@ -2107,7 +2105,7 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO bool bCenter=i==nConAnz+8; bool bOk = false; Point aConPos; - USHORT nConNum=i; + sal_uInt16 nConNum=i; if (bUser) { const SdrGluePoint& rGP=(*pGPL)[nConNum]; aConPos=rGP.GetAbsolutePos(*pObj); @@ -2143,14 +2141,14 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO if (bOk && aMouseRect.IsInside(aConPos)) { if (bUser) bUserFnd = true; bFnd = true; - ULONG nDist=(ULONG)Abs(aConPos.X()-rPt.X())+(ULONG)Abs(aConPos.Y()-rPt.Y()); + sal_uIntPtr nDist=(sal_uIntPtr)Abs(aConPos.X()-rPt.X())+(sal_uIntPtr)Abs(aConPos.Y()-rPt.Y()); if (nDist<nBestDist) { nBestDist=nDist; aTestCon.pObj=pObj; aTestCon.nConId=nConNum; aTestCon.bAutoCorner=bCorner; aTestCon.bAutoVertex=bVertex; - aTestCon.bBestConn=FALSE; // bCenter; + aTestCon.bBestConn=sal_False; // bCenter; aTestCon.bBestVertex=bCenter; } } @@ -2167,7 +2165,7 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO { bFnd = true; aTestCon.pObj=pObj; - aTestCon.bBestConn=TRUE; + aTestCon.bBestConn=sal_True; } } if (bFnd) { @@ -2238,7 +2236,7 @@ void SdrEdgeObj::NbcResize(const Point& rRefPnt, const Fraction& aXFact, const F } } -SdrObject* SdrEdgeObj::DoConvertToPolyObj(BOOL bBezier) const +SdrObject* SdrEdgeObj::DoConvertToPolyObj(sal_Bool bBezier) const { basegfx::B2DPolyPolygon aPolyPolygon; aPolyPolygon.append(pEdgeTrack->getB2DPolygon()); @@ -2256,7 +2254,7 @@ sal_uInt32 SdrEdgeObj::GetSnapPointCount() const Point SdrEdgeObj::GetSnapPoint(sal_uInt32 i) const { ((SdrEdgeObj*)this)->ImpUndirtyEdgeTrack(); - USHORT nAnz=pEdgeTrack->GetPointCount(); + sal_uInt16 nAnz=pEdgeTrack->GetPointCount(); if (i==0) return (*pEdgeTrack)[0]; else return (*pEdgeTrack)[nAnz-1]; } @@ -2274,7 +2272,7 @@ sal_uInt32 SdrEdgeObj::GetPointCount() const Point SdrEdgeObj::GetPoint(sal_uInt32 i) const { ((SdrEdgeObj*)this)->ImpUndirtyEdgeTrack(); - USHORT nAnz=pEdgeTrack->GetPointCount(); + sal_uInt16 nAnz=pEdgeTrack->GetPointCount(); if (0L == i) return (*pEdgeTrack)[0]; else @@ -2285,7 +2283,7 @@ void SdrEdgeObj::NbcSetPoint(const Point& rPnt, sal_uInt32 i) { // ToDo: Umconnekten fehlt noch ImpUndirtyEdgeTrack(); - USHORT nAnz=pEdgeTrack->GetPointCount(); + sal_uInt16 nAnz=pEdgeTrack->GetPointCount(); if (0L == i) (*pEdgeTrack)[0]=rPnt; if (1L == i) @@ -2341,7 +2339,7 @@ void SdrEdgeObj::RestGeoData(const SdrObjGeoData& rGeo) aEdgeInfo =rEGeo.aEdgeInfo; } -Point SdrEdgeObj::GetTailPoint( BOOL bTail ) const +Point SdrEdgeObj::GetTailPoint( sal_Bool bTail ) const { if( pEdgeTrack && pEdgeTrack->GetPointCount()!=0) { @@ -2352,7 +2350,7 @@ Point SdrEdgeObj::GetTailPoint( BOOL bTail ) const } else { - const USHORT nSiz = rTrack0.GetPointCount() - 1; + const sal_uInt16 nSiz = rTrack0.GetPointCount() - 1; return rTrack0[nSiz]; } } @@ -2366,7 +2364,7 @@ Point SdrEdgeObj::GetTailPoint( BOOL bTail ) const } -void SdrEdgeObj::SetTailPoint( BOOL bTail, const Point& rPt ) +void SdrEdgeObj::SetTailPoint( sal_Bool bTail, const Point& rPt ) { ImpSetTailPoint( bTail, rPt ); SetChanged(); @@ -2404,12 +2402,12 @@ void SdrEdgeObj::setGluePointIndex( sal_Bool bTail, sal_Int32 nIndex /* = -1 */ nIndex = 0; } - rConn1.SetConnectorId( (USHORT)nIndex ); + rConn1.SetConnectorId( (sal_uInt16)nIndex ); SetChanged(); SetRectsDirty(); ImpRecalcEdgeTrack(); - // bEdgeTrackDirty=TRUE; + // bEdgeTrackDirty=sal_True; } /** this method is used by the api to return a glue point id for a connection. diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index f9333a6b89f9..96c93b38b0aa 100644..100755 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -46,15 +46,16 @@ #include <vcl/svapp.hxx> #include <sfx2/linkmgr.hxx> +#include <sfx2/docfile.hxx> #include <svx/svdetc.hxx> -#include "svdglob.hxx" -#include "svdstr.hrc" +#include "svx/svdglob.hxx" +#include "svx/svdstr.hrc" #include <svx/svdpool.hxx> #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> #include <svx/svdmrkv.hxx> #include <svx/svdpagv.hxx> -#include "svdviter.hxx" +#include "svx/svdviter.hxx" #include <svx/svdview.hxx> #include "svtools/filter.hxx" #include <svx/svdograf.hxx> @@ -70,6 +71,8 @@ #include <svx/sdr/contact/viewcontactofgraphic.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> +#include <osl/thread.hxx> +#include <vos/mutex.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::io; @@ -81,13 +84,48 @@ using namespace ::com::sun::star::io; #define GRAFSTREAMPOS_INVALID 0xffffffff #define SWAPGRAPHIC_TIMEOUT 5000 + // ------------------ // - SdrGraphicLink - // ------------------ + +const Graphic ImpLoadLinkedGraphic( const String& rFileName, const String& rFilterName ) +{ + Graphic aGraphic; + + SfxMedium xMed( rFileName, STREAM_STD_READ, sal_True ); + xMed.DownLoad(); + + SvStream* pInStrm = xMed.GetInStream(); + if ( pInStrm ) + { + pInStrm->Seek( STREAM_SEEK_TO_BEGIN ); + GraphicFilter* pGF = GraphicFilter::GetGraphicFilter(); + + const sal_uInt16 nFilter = rFilterName.Len() && pGF->GetImportFormatCount() + ? pGF->GetImportFormatNumber( rFilterName ) + : GRFILTER_FORMAT_DONTKNOW; + + String aEmptyStr; + com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aFilterData( 1 ); + + // Room for improvment: + // As this is a linked graphic the GfxLink is not needed if saving/loading our own format. + // But this link is required by some filters to access the native graphic (pdf export/ms export), + // there we should create a new service to provide this data if needed + aFilterData[ 0 ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CreateNativeLink" ) ); + aFilterData[ 0 ].Value = Any( sal_True ); + pGF->ImportGraphic( aGraphic, aEmptyStr, *pInStrm, nFilter, NULL, 0, &aFilterData ); + } + return aGraphic; +} + +class SdrGraphicUpdater; class SdrGraphicLink : public sfx2::SvBaseLink { SdrGrafObj* pGrafObj; + SdrGraphicUpdater* pGraphicUpdater; public: SdrGraphicLink(SdrGrafObj* pObj); @@ -96,24 +134,111 @@ public: virtual void Closed(); virtual void DataChanged( const String& rMimeType, const ::com::sun::star::uno::Any & rValue ); + void DataChanged( const Graphic& rGraphic ); - BOOL Connect() { return 0 != GetRealObject(); } - void UpdateSynchron(); + sal_Bool Connect() { return 0 != GetRealObject(); } + void UpdateAsynchron(); + void RemoveGraphicUpdater(); }; +class SdrGraphicUpdater : public ::osl::Thread +{ +public: + SdrGraphicUpdater( const String& rFileName, const String& rFilterName, SdrGraphicLink& ); + virtual ~SdrGraphicUpdater( void ); + + void SAL_CALL Terminate( void ); + + sal_Bool GraphicLinkChanged( const String& rFileName ){ return mrFileName != rFileName; }; + +protected: + + /** is called from the inherited create method and acts as the + main function of this thread. + */ + virtual void SAL_CALL run(void); + + /** Called after the thread is terminated via the terminate + method. Used to kill the thread by calling delete on this. + */ + virtual void SAL_CALL onTerminated(void); + +private: + + ::osl::Mutex maMutex; + const String& mrFileName; + const String& mrFilterName; + SdrGraphicLink& mrGraphicLink; + + volatile bool mbIsTerminated; +}; + +SdrGraphicUpdater::SdrGraphicUpdater( const String& rFileName, const String& rFilterName, SdrGraphicLink& rGraphicLink ) +: mrFileName( rFileName ) +, mrFilterName( rFilterName ) +, mrGraphicLink( rGraphicLink ) +, mbIsTerminated( sal_False ) +{ + create(); +} + +SdrGraphicUpdater::~SdrGraphicUpdater( void ) +{ +} + +void SdrGraphicUpdater::Terminate() +{ + ::osl::MutexGuard aGuard( maMutex ); + mbIsTerminated = sal_True; +} + +void SAL_CALL SdrGraphicUpdater::onTerminated(void) +{ + delete this; +} + +void SAL_CALL SdrGraphicUpdater::run(void) +{ + Graphic aGraphic( ImpLoadLinkedGraphic( mrFileName, mrFilterName ) ); + ::osl::MutexGuard aGuard(maMutex); + vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + if ( !mbIsTerminated ) + { + mrGraphicLink.DataChanged( aGraphic ); + mrGraphicLink.RemoveGraphicUpdater(); + } +} + // ----------------------------------------------------------------------------- -SdrGraphicLink::SdrGraphicLink(SdrGrafObj* pObj): - ::sfx2::SvBaseLink( ::sfx2::LINKUPDATE_ONCALL, SOT_FORMATSTR_ID_SVXB ), - pGrafObj(pObj) +SdrGraphicLink::SdrGraphicLink(SdrGrafObj* pObj) +: ::sfx2::SvBaseLink( ::sfx2::LINKUPDATE_ONCALL, SOT_FORMATSTR_ID_SVXB ) +, pGrafObj( pObj ) +, pGraphicUpdater( NULL ) { - SetSynchron( FALSE ); + SetSynchron( sal_False ); } // ----------------------------------------------------------------------------- SdrGraphicLink::~SdrGraphicLink() { + if ( pGraphicUpdater ) + pGraphicUpdater->Terminate(); +} + +// ----------------------------------------------------------------------------- + +void SdrGraphicLink::DataChanged( const Graphic& rGraphic ) +{ + pGrafObj->ImpSetLinkedGraphic( rGraphic ); +} + +// ----------------------------------------------------------------------------- + +void SdrGraphicLink::RemoveGraphicUpdater() +{ + pGraphicUpdater = NULL; } // ----------------------------------------------------------------------------- @@ -136,9 +261,8 @@ void SdrGraphicLink::DataChanged( const String& rMimeType, } else if( SotExchange::GetFormatIdFromMimeType( rMimeType ) != sfx2::LinkManager::RegisterStatusInfoId() ) { - // only repaint, no objectchange - pGrafObj->ActionChanged(); - // pGrafObj->BroadcastObjectChange(); + // broadcasting, to update slidesorter + pGrafObj->BroadcastObjectChange(); } } } @@ -156,14 +280,20 @@ void SdrGraphicLink::Closed() // ----------------------------------------------------------------------------- -void SdrGraphicLink::UpdateSynchron() +void SdrGraphicLink::UpdateAsynchron() { if( GetObj() ) { - String aMimeType( SotExchange::GetFormatMimeType( GetContentType() )); - ::com::sun::star::uno::Any aValue; - GetObj()->GetData( aValue, aMimeType, TRUE ); - DataChanged( aMimeType, aValue ); + if ( pGraphicUpdater ) + { + if ( pGraphicUpdater->GraphicLinkChanged( pGrafObj->GetFileName() ) ) + { + pGraphicUpdater->Terminate(); + pGraphicUpdater = new SdrGraphicUpdater( pGrafObj->GetFileName(), pGrafObj->GetFilterName(), *this ); + } + } + else + pGraphicUpdater = new SdrGraphicUpdater( pGrafObj->GetFileName(), pGrafObj->GetFilterName(), *this ); } } @@ -196,11 +326,11 @@ TYPEINIT1(SdrGrafObj,SdrRectObj); SdrGrafObj::SdrGrafObj() : SdrRectObj(), pGraphicLink ( NULL ), - bMirrored ( FALSE ) + bMirrored ( sal_False ) { pGraphic = new GraphicObject; pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), SWAPGRAPHIC_TIMEOUT ); - bNoShear = TRUE; + bNoShear = sal_True; // #111096# mbGrafAnimationAllowed = sal_True; @@ -219,11 +349,11 @@ SdrGrafObj::SdrGrafObj() SdrGrafObj::SdrGrafObj(const Graphic& rGrf, const Rectangle& rRect) : SdrRectObj ( rRect ), pGraphicLink ( NULL ), - bMirrored ( FALSE ) + bMirrored ( sal_False ) { pGraphic = new GraphicObject( rGrf ); pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), SWAPGRAPHIC_TIMEOUT ); - bNoShear = TRUE; + bNoShear = sal_True; // #111096# mbGrafAnimationAllowed = sal_True; @@ -242,11 +372,11 @@ SdrGrafObj::SdrGrafObj(const Graphic& rGrf, const Rectangle& rRect) SdrGrafObj::SdrGrafObj( const Graphic& rGrf ) : SdrRectObj(), pGraphicLink ( NULL ), - bMirrored ( FALSE ) + bMirrored ( sal_False ) { pGraphic = new GraphicObject( rGrf ); pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), SWAPGRAPHIC_TIMEOUT ); - bNoShear = TRUE; + bNoShear = sal_True; // #111096# mbGrafAnimationAllowed = sal_True; @@ -318,7 +448,7 @@ const Graphic& SdrGrafObj::GetGraphic() const // ----------------------------------------------------------------------------- -Graphic SdrGrafObj::GetTransformedGraphic( ULONG nTransformFlags ) const +Graphic SdrGrafObj::GetTransformedGraphic( sal_uIntPtr nTransformFlags ) const { // #107947# Refactored most of the code to GraphicObject, where // everybody can use e.g. the cropping functionality @@ -326,8 +456,8 @@ Graphic SdrGrafObj::GetTransformedGraphic( ULONG nTransformFlags ) const GraphicType eType = GetGraphicType(); MapMode aDestMap( pModel->GetScaleUnit(), Point(), pModel->GetScaleFraction(), pModel->GetScaleFraction() ); const Size aDestSize( GetLogicRect().GetSize() ); - const BOOL bMirror = ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_MIRROR ) != 0; - const BOOL bRotate = ( ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_ROTATE ) != 0 ) && + const sal_Bool bMirror = ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_MIRROR ) != 0; + const sal_Bool bRotate = ( ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_ROTATE ) != 0 ) && ( aGeo.nDrehWink && aGeo.nDrehWink != 18000 ) && ( GRAPHIC_NONE != eType ); // #104115# Need cropping info earlier @@ -343,7 +473,7 @@ Graphic SdrGrafObj::GetTransformedGraphic( ULONG nTransformFlags ) const if( bMirror ) { - USHORT nMirrorCase = ( aGeo.nDrehWink == 18000 ) ? ( bMirrored ? 3 : 4 ) : ( bMirrored ? 2 : 1 ); + sal_uInt16 nMirrorCase = ( aGeo.nDrehWink == 18000 ) ? ( bMirrored ? 3 : 4 ) : ( bMirrored ? 2 : 1 ); bool bHMirr = nMirrorCase == 2 || nMirrorCase == 4; bool bVMirr = nMirrorCase == 3 || nMirrorCase == 4; @@ -448,8 +578,10 @@ void SdrGrafObj::ForceSwapIn() const const_cast< SdrGrafObj* >( this )->mbIsPreview = sal_False; } - - pGraphic->FireSwapInRequest(); + if ( pGraphicLink && pGraphic->IsSwappedOut() ) + ImpUpdateGraphicLink( sal_False ); + else + pGraphic->FireSwapInRequest(); if( pGraphic->IsSwappedOut() || ( pGraphic->GetType() == GRAPHIC_NONE ) || @@ -533,57 +665,69 @@ void SdrGrafObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const aGeo.nDrehWink % 18000 == 0 || aGeo.nDrehWink % 27000 == 0; - rInfo.bResizePropAllowed = TRUE; + rInfo.bResizePropAllowed = sal_True; rInfo.bRotateFreeAllowed = bNoPresGrf && !bAnim; rInfo.bRotate90Allowed = bNoPresGrf && !bAnim; rInfo.bMirrorFreeAllowed = bNoPresGrf && !bAnim; rInfo.bMirror45Allowed = bNoPresGrf && !bAnim; rInfo.bMirror90Allowed = !bEmptyPresObj; - rInfo.bTransparenceAllowed = FALSE; - rInfo.bGradientAllowed = FALSE; - rInfo.bShearAllowed = FALSE; - rInfo.bEdgeRadiusAllowed=FALSE; - rInfo.bCanConvToPath = FALSE; - rInfo.bCanConvToPathLineToArea = FALSE; - rInfo.bCanConvToPolyLineToArea = FALSE; + rInfo.bTransparenceAllowed = sal_False; + rInfo.bGradientAllowed = sal_False; + rInfo.bShearAllowed = sal_False; + rInfo.bEdgeRadiusAllowed=sal_False; + rInfo.bCanConvToPath = sal_False; + rInfo.bCanConvToPathLineToArea = sal_False; + rInfo.bCanConvToPolyLineToArea = sal_False; rInfo.bCanConvToPoly = !IsEPS(); rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary()); } // ----------------------------------------------------------------------------- -UINT16 SdrGrafObj::GetObjIdentifier() const +sal_uInt16 SdrGrafObj::GetObjIdentifier() const { - return UINT16( OBJ_GRAF ); + return sal_uInt16( OBJ_GRAF ); } // ----------------------------------------------------------------------------- -sal_Bool SdrGrafObj::ImpUpdateGraphicLink() const +/* The graphic of the GraphicLink will be loaded. If it is called with + bAsynchron = true then the graphic will be set later via DataChanged +*/ +sal_Bool SdrGrafObj::ImpUpdateGraphicLink( sal_Bool bAsynchron ) const { - sal_Bool bRet = sal_False; - + sal_Bool bRet = sal_False; if( pGraphicLink ) { - const sal_Bool bIsChanged = pModel->IsChanged(); - pGraphicLink->UpdateSynchron(); - pModel->SetChanged( bIsChanged ); - + if ( bAsynchron ) + pGraphicLink->UpdateAsynchron(); + else + pGraphicLink->DataChanged( ImpLoadLinkedGraphic( aFileName, aFilterName ) ); bRet = sal_True; } - return bRet; } // ----------------------------------------------------------------------------- +void SdrGrafObj::ImpSetLinkedGraphic( const Graphic& rGraphic ) +{ + const sal_Bool bIsChanged = GetModel()->IsChanged(); + NbcSetGraphic( rGraphic ); + ActionChanged(); + BroadcastObjectChange(); + GetModel()->SetChanged( bIsChanged ); +} + +// ----------------------------------------------------------------------------- + void SdrGrafObj::TakeObjNameSingul(XubString& rName) const { switch( pGraphic->GetType() ) { case GRAPHIC_BITMAP: { - const USHORT nId = ( ( pGraphic->IsTransparent() || ( (const SdrGrafTransparenceItem&) GetObjectItem( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ) ? + const sal_uInt16 nId = ( ( pGraphic->IsTransparent() || ( (const SdrGrafTransparenceItem&) GetObjectItem( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ) ? ( IsLinkedGraphic() ? STR_ObjNameSingulGRAFBMPTRANSLNK : STR_ObjNameSingulGRAFBMPTRANS ) : ( IsLinkedGraphic() ? STR_ObjNameSingulGRAFBMPLNK : STR_ObjNameSingulGRAFBMP ) ); @@ -622,7 +766,7 @@ void SdrGrafObj::TakeObjNamePlural( XubString& rName ) const { case GRAPHIC_BITMAP: { - const USHORT nId = ( ( pGraphic->IsTransparent() || ( (const SdrGrafTransparenceItem&) GetObjectItem( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ) ? + const sal_uInt16 nId = ( ( pGraphic->IsTransparent() || ( (const SdrGrafTransparenceItem&) GetObjectItem( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ) ? ( IsLinkedGraphic() ? STR_ObjNamePluralGRAFBMPTRANSLNK : STR_ObjNamePluralGRAFBMPTRANS ) : ( IsLinkedGraphic() ? STR_ObjNamePluralGRAFBMPLNK : STR_ObjNamePluralGRAFBMP ) ); @@ -781,7 +925,6 @@ void SdrGrafObj::NbcSetSnapRect(const Rectangle& rRect) void SdrGrafObj::NbcSetLogicRect( const Rectangle& rRect) { - //bool bChg=rRect.GetSize()!=aRect.GetSize(); SdrRectObj::NbcSetLogicRect(rRect); } @@ -805,9 +948,6 @@ void SdrGrafObj::SaveGeoData(SdrObjGeoData& rGeo) const void SdrGrafObj::RestGeoData(const SdrObjGeoData& rGeo) { - //long nDrehMerk = aGeo.nDrehWink; - //long nShearMerk = aGeo.nShearWink; - //bool bMirrMerk = bMirrored; Size aSizMerk( aRect.GetSize() ); SdrRectObj::RestGeoData(rGeo); @@ -898,7 +1038,7 @@ const GDIMetaFile* SdrGrafObj::GetGDIMetaFile() const // ----------------------------------------------------------------------------- -SdrObject* SdrGrafObj::DoConvertToPolyObj(BOOL bBezier) const +SdrObject* SdrGrafObj::DoConvertToPolyObj(sal_Bool bBezier) const { SdrObject* pRetval = NULL; @@ -915,7 +1055,7 @@ SdrObject* SdrGrafObj::DoConvertToPolyObj(BOOL bBezier) const aFilter.SetScaleRect(GetSnapRect()); aFilter.SetLayer(GetLayer()); - UINT32 nInsAnz = aFilter.DoImport(GetTransformedGraphic().GetGDIMetaFile(), *pGrp->GetSubList(), 0); + sal_uInt32 nInsAnz = aFilter.DoImport(GetTransformedGraphic().GetGDIMetaFile(), *pGrp->GetSubList(), 0); if(nInsAnz) { pRetval = pGrp; @@ -961,7 +1101,7 @@ SdrObject* SdrGrafObj::DoConvertToPolyObj(BOOL bBezier) const Bitmap aBitmap( GetTransformedGraphic().GetBitmap() ); XOBitmap aXBmp(aBitmap, XBITMAP_STRETCH); aSet.Put(XFillBitmapItem(String(), aXBmp)); - aSet.Put(XFillBmpTileItem(FALSE)); + aSet.Put(XFillBmpTileItem(sal_False)); pRetval->SetMergedItemSet(aSet); } @@ -999,7 +1139,7 @@ void SdrGrafObj::ImpSetAttrToGrafInfo() aGrafInfo.SetChannelG( ( (SdrGrafGreenItem&) rSet.Get( SDRATTR_GRAFGREEN ) ).GetValue() ); aGrafInfo.SetChannelB( ( (SdrGrafBlueItem&) rSet.Get( SDRATTR_GRAFBLUE ) ).GetValue() ); aGrafInfo.SetGamma( ( (SdrGrafGamma100Item&) rSet.Get( SDRATTR_GRAFGAMMA ) ).GetValue() * 0.01 ); - aGrafInfo.SetTransparency( (BYTE) FRound( Min( nTrans, (USHORT) 100 ) * 2.55 ) ); + aGrafInfo.SetTransparency( (sal_uInt8) FRound( Min( nTrans, (sal_uInt16) 100 ) * 2.55 ) ); aGrafInfo.SetInvert( ( (SdrGrafInvertItem&) rSet.Get( SDRATTR_GRAFINVERT ) ).GetValue() ); aGrafInfo.SetDrawMode( ( (SdrGrafModeItem&) rSet.Get( SDRATTR_GRAFMODE ) ).GetValue() ); aGrafInfo.SetCrop( rCrop.GetLeft(), rCrop.GetTop(), rCrop.GetRight(), rCrop.GetBottom() ); @@ -1018,7 +1158,7 @@ void SdrGrafObj::ImpSetGrafInfoToAttr() SetObjectItem( SdrGrafGreenItem( aGrafInfo.GetChannelG() ) ); SetObjectItem( SdrGrafBlueItem( aGrafInfo.GetChannelB() ) ); SetObjectItem( SdrGrafGamma100Item( FRound( aGrafInfo.GetGamma() * 100.0 ) ) ); - SetObjectItem( SdrGrafTransparenceItem( (USHORT) FRound( aGrafInfo.GetTransparency() / 2.55 ) ) ); + SetObjectItem( SdrGrafTransparenceItem( (sal_uInt16) FRound( aGrafInfo.GetTransparency() / 2.55 ) ) ); SetObjectItem( SdrGrafInvertItem( aGrafInfo.IsInvert() ) ); SetObjectItem( SdrGrafModeItem( aGrafInfo.GetDrawMode() ) ); SetObjectItem( SdrGrafCropItem( aGrafInfo.GetLeftCrop(), aGrafInfo.GetTopCrop(), aGrafInfo.GetRightCrop(), aGrafInfo.GetBottomCrop() ) ); @@ -1091,12 +1231,12 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO ) // ## test only if there are VOCs other than the preview renderer if(!GetViewContact().HasViewObjectContacts(true)) { - const ULONG nSwapMode = pModel->GetSwapGraphicsMode(); + const sal_uIntPtr nSwapMode = pModel->GetSwapGraphicsMode(); if( ( pGraphic->HasUserData() || pGraphicLink ) && ( nSwapMode & SDR_SWAPGRAPHICSMODE_PURGE ) ) { - pRet = NULL; + pRet = GRFMGR_AUTOSWAPSTREAM_LINK; } else if( nSwapMode & SDR_SWAPGRAPHICSMODE_TEMP ) { @@ -1123,7 +1263,7 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO ) { SdrDocumentStreamInfo aStreamInfo; - aStreamInfo.mbDeleteAfterUse = FALSE; + aStreamInfo.mbDeleteAfterUse = sal_False; aStreamInfo.maUserData = pGraphic->GetUserData(); SvStream* pStream = pModel->GetDocumentStream( aStreamInfo ); @@ -1181,7 +1321,7 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO ) } } } - else if( !ImpUpdateGraphicLink() ) + else if( !ImpUpdateGraphicLink( sal_False ) ) { pRet = GRFMGR_AUTOSWAPSTREAM_TEMP; } @@ -1241,7 +1381,7 @@ Reference< XInputStream > SdrGrafObj::getInputStream() { SdrDocumentStreamInfo aStreamInfo; - aStreamInfo.mbDeleteAfterUse = FALSE; + aStreamInfo.mbDeleteAfterUse = sal_False; aStreamInfo.maUserData = pGraphic->GetUserData(); SvStream* pStream = pModel->GetDocumentStream( aStreamInfo ); diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx index 13b37db6f4bb..7c49d50784e9 100644..100755 --- a/svx/source/svdraw/svdogrp.cxx +++ b/svx/source/svdraw/svdogrp.cxx @@ -46,14 +46,14 @@ #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdobj.hxx> #include <svx/svdtrans.hxx> #include <svx/svdetc.hxx> #include <svx/svdattrx.hxx> // NotPersistItems #include <svx/svdoedge.hxx> // #32383# Die Verbinder nach Move nochmal anbroadcasten -#include "svdglob.hxx" // StringCache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Objektname #include <svx/svxids.hrc> #include <svl/whiter.hxx> @@ -101,10 +101,10 @@ SdrObjGroup::SdrObjGroup() pSub=new SdrObjList(NULL,NULL); pSub->SetOwnerObj(this); pSub->SetListKind(SDROBJLIST_GROUPOBJ); - bRefPoint=FALSE; + bRefPoint=sal_False; nDrehWink=0; nShearWink=0; - bClosedObj=FALSE; + bClosedObj=sal_False; } @@ -115,51 +115,51 @@ SdrObjGroup::~SdrObjGroup() void SdrObjGroup::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { - rInfo.bNoContortion=FALSE; + rInfo.bNoContortion=sal_False; SdrObjList* pOL=pSub; - ULONG nObjAnz=pOL->GetObjCount(); - for (ULONG i=0; i<nObjAnz; i++) { + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + for (sal_uIntPtr i=0; i<nObjAnz; i++) { SdrObject* pObj=pOL->GetObj(i); SdrObjTransformInfoRec aInfo; pObj->TakeObjInfo(aInfo); - if (!aInfo.bMoveAllowed ) rInfo.bMoveAllowed =FALSE; - if (!aInfo.bResizeFreeAllowed ) rInfo.bResizeFreeAllowed =FALSE; - if (!aInfo.bResizePropAllowed ) rInfo.bResizePropAllowed =FALSE; - if (!aInfo.bRotateFreeAllowed ) rInfo.bRotateFreeAllowed =FALSE; - if (!aInfo.bRotate90Allowed ) rInfo.bRotate90Allowed =FALSE; - if (!aInfo.bMirrorFreeAllowed ) rInfo.bMirrorFreeAllowed =FALSE; - if (!aInfo.bMirror45Allowed ) rInfo.bMirror45Allowed =FALSE; - if (!aInfo.bMirror90Allowed ) rInfo.bMirror90Allowed =FALSE; - if (!aInfo.bShearAllowed ) rInfo.bShearAllowed =FALSE; - if (!aInfo.bEdgeRadiusAllowed ) rInfo.bEdgeRadiusAllowed =FALSE; - if (!aInfo.bNoOrthoDesired ) rInfo.bNoOrthoDesired =FALSE; - if (aInfo.bNoContortion ) rInfo.bNoContortion =TRUE; - if (!aInfo.bCanConvToPath ) rInfo.bCanConvToPath =FALSE; + if (!aInfo.bMoveAllowed ) rInfo.bMoveAllowed =sal_False; + if (!aInfo.bResizeFreeAllowed ) rInfo.bResizeFreeAllowed =sal_False; + if (!aInfo.bResizePropAllowed ) rInfo.bResizePropAllowed =sal_False; + if (!aInfo.bRotateFreeAllowed ) rInfo.bRotateFreeAllowed =sal_False; + if (!aInfo.bRotate90Allowed ) rInfo.bRotate90Allowed =sal_False; + if (!aInfo.bMirrorFreeAllowed ) rInfo.bMirrorFreeAllowed =sal_False; + if (!aInfo.bMirror45Allowed ) rInfo.bMirror45Allowed =sal_False; + if (!aInfo.bMirror90Allowed ) rInfo.bMirror90Allowed =sal_False; + if (!aInfo.bShearAllowed ) rInfo.bShearAllowed =sal_False; + if (!aInfo.bEdgeRadiusAllowed ) rInfo.bEdgeRadiusAllowed =sal_False; + if (!aInfo.bNoOrthoDesired ) rInfo.bNoOrthoDesired =sal_False; + if (aInfo.bNoContortion ) rInfo.bNoContortion =sal_True; + if (!aInfo.bCanConvToPath ) rInfo.bCanConvToPath =sal_False; if(!aInfo.bCanConvToContour) - rInfo.bCanConvToContour = FALSE; + rInfo.bCanConvToContour = sal_False; - if (!aInfo.bCanConvToPoly ) rInfo.bCanConvToPoly =FALSE; - if (!aInfo.bCanConvToPathLineToArea) rInfo.bCanConvToPathLineToArea=FALSE; - if (!aInfo.bCanConvToPolyLineToArea) rInfo.bCanConvToPolyLineToArea=FALSE; + if (!aInfo.bCanConvToPoly ) rInfo.bCanConvToPoly =sal_False; + if (!aInfo.bCanConvToPathLineToArea) rInfo.bCanConvToPathLineToArea=sal_False; + if (!aInfo.bCanConvToPolyLineToArea) rInfo.bCanConvToPolyLineToArea=sal_False; } if (nObjAnz==0) { - rInfo.bRotateFreeAllowed=FALSE; - rInfo.bRotate90Allowed =FALSE; - rInfo.bMirrorFreeAllowed=FALSE; - rInfo.bMirror45Allowed =FALSE; - rInfo.bMirror90Allowed =FALSE; - rInfo.bTransparenceAllowed = FALSE; - rInfo.bGradientAllowed = FALSE; - rInfo.bShearAllowed =FALSE; - rInfo.bEdgeRadiusAllowed=FALSE; - rInfo.bNoContortion =TRUE; + rInfo.bRotateFreeAllowed=sal_False; + rInfo.bRotate90Allowed =sal_False; + rInfo.bMirrorFreeAllowed=sal_False; + rInfo.bMirror45Allowed =sal_False; + rInfo.bMirror90Allowed =sal_False; + rInfo.bTransparenceAllowed = sal_False; + rInfo.bGradientAllowed = sal_False; + rInfo.bShearAllowed =sal_False; + rInfo.bEdgeRadiusAllowed=sal_False; + rInfo.bNoContortion =sal_True; } if(nObjAnz != 1) { // only allowed if single object selected - rInfo.bTransparenceAllowed = FALSE; - rInfo.bGradientAllowed = FALSE; + rInfo.bTransparenceAllowed = sal_False; + rInfo.bGradientAllowed = sal_False; } } @@ -170,9 +170,9 @@ void SdrObjGroup::SetBoundRectDirty() // not re-creatable view data } -UINT16 SdrObjGroup::GetObjIdentifier() const +sal_uInt16 SdrObjGroup::GetObjIdentifier() const { - return UINT16(OBJ_GRUP); + return sal_uInt16(OBJ_GRUP); } @@ -181,8 +181,8 @@ SdrLayerID SdrObjGroup::GetLayer() const bool b1st = true; SdrLayerID nLay=SdrLayerID(SdrObject::GetLayer()); SdrObjList* pOL=pSub; - ULONG nObjAnz=pOL->GetObjCount(); - for (ULONG i=0; i<nObjAnz; i++) { + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + for (sal_uIntPtr i=0; i<nObjAnz; i++) { SdrLayerID nLay1=pOL->GetObj(i)->GetLayer(); if (b1st) { nLay=nLay1; b1st = false; } else if (nLay1!=nLay) return 0; @@ -195,8 +195,8 @@ void SdrObjGroup::NbcSetLayer(SdrLayerID nLayer) { SdrObject::NbcSetLayer(nLayer); SdrObjList* pOL=pSub; - ULONG nObjAnz=pOL->GetObjCount(); - for (ULONG i=0; i<nObjAnz; i++) { + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + for (sal_uIntPtr i=0; i<nObjAnz; i++) { pOL->GetObj(i)->NbcSetLayer(nLayer); } } @@ -260,7 +260,7 @@ Point SdrObjGroup::GetRefPoint() const void SdrObjGroup::SetRefPoint(const Point& rPnt) { - bRefPoint=TRUE; + bRefPoint=sal_True; aRefPoint=rPnt; } @@ -384,7 +384,7 @@ bool SdrObjGroup::beginSpecialDrag(SdrDragStat& /*rDrag*/) const bool SdrObjGroup::BegCreate(SdrDragStat& /*rStat*/) { - return FALSE; + return sal_False; } @@ -431,8 +431,8 @@ void SdrObjGroup::NbcMove(const Size& rSiz) MovePoint(aRefPoint,rSiz); if (pSub->GetObjCount()!=0) { SdrObjList* pOL=pSub; - ULONG nObjAnz=pOL->GetObjCount(); - for (ULONG i=0; i<nObjAnz; i++) { + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + for (sal_uIntPtr i=0; i<nObjAnz; i++) { SdrObject* pObj=pOL->GetObj(i); pObj->NbcMove(rSiz); } @@ -463,8 +463,8 @@ void SdrObjGroup::NbcResize(const Point& rRef, const Fraction& xFact, const Frac ResizePoint(aRefPoint,rRef,xFact,yFact); if (pSub->GetObjCount()!=0) { SdrObjList* pOL=pSub; - ULONG nObjAnz=pOL->GetObjCount(); - for (ULONG i=0; i<nObjAnz; i++) { + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + for (sal_uIntPtr i=0; i<nObjAnz; i++) { SdrObject* pObj=pOL->GetObj(i); pObj->NbcResize(rRef,xFact,yFact); } @@ -477,48 +477,48 @@ void SdrObjGroup::NbcResize(const Point& rRef, const Fraction& xFact, const Frac void SdrObjGroup::NbcRotate(const Point& rRef, long nWink, double sn, double cs) { - SetGlueReallyAbsolute(TRUE); + SetGlueReallyAbsolute(sal_True); nDrehWink=NormAngle360(nDrehWink+nWink); RotatePoint(aRefPoint,rRef,sn,cs); SdrObjList* pOL=pSub; - ULONG nObjAnz=pOL->GetObjCount(); - for (ULONG i=0; i<nObjAnz; i++) { + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + for (sal_uIntPtr i=0; i<nObjAnz; i++) { SdrObject* pObj=pOL->GetObj(i); pObj->NbcRotate(rRef,nWink,sn,cs); } NbcRotateGluePoints(rRef,nWink,sn,cs); - SetGlueReallyAbsolute(FALSE); + SetGlueReallyAbsolute(sal_False); } void SdrObjGroup::NbcMirror(const Point& rRef1, const Point& rRef2) { - SetGlueReallyAbsolute(TRUE); + SetGlueReallyAbsolute(sal_True); MirrorPoint(aRefPoint,rRef1,rRef2); // fehlende Implementation in SvdEtc !!! SdrObjList* pOL=pSub; - ULONG nObjAnz=pOL->GetObjCount(); - for (ULONG i=0; i<nObjAnz; i++) { + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + for (sal_uIntPtr i=0; i<nObjAnz; i++) { SdrObject* pObj=pOL->GetObj(i); pObj->NbcMirror(rRef1,rRef2); } NbcMirrorGluePoints(rRef1,rRef2); - SetGlueReallyAbsolute(FALSE); + SetGlueReallyAbsolute(sal_False); } void SdrObjGroup::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) { - SetGlueReallyAbsolute(TRUE); + SetGlueReallyAbsolute(sal_True); nShearWink+=nWink; ShearPoint(aRefPoint,rRef,tn); SdrObjList* pOL=pSub; - ULONG nObjAnz=pOL->GetObjCount(); - for (ULONG i=0; i<nObjAnz; i++) { + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + for (sal_uIntPtr i=0; i<nObjAnz; i++) { SdrObject* pObj=pOL->GetObj(i); pObj->NbcShear(rRef,nWink,tn,bVShear); } NbcShearGluePoints(rRef,nWink,tn,bVShear); - SetGlueReallyAbsolute(FALSE); + SetGlueReallyAbsolute(sal_False); } @@ -528,8 +528,8 @@ void SdrObjGroup::NbcSetAnchorPos(const Point& rPnt) Size aSiz(rPnt.X()-aAnchor.X(),rPnt.Y()-aAnchor.Y()); MovePoint(aRefPoint,aSiz); SdrObjList* pOL=pSub; - ULONG nObjAnz=pOL->GetObjCount(); - for (ULONG i=0; i<nObjAnz; i++) { + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + for (sal_uIntPtr i=0; i<nObjAnz; i++) { SdrObject* pObj=pOL->GetObj(i); pObj->NbcSetAnchorPos(rPnt); } @@ -575,8 +575,8 @@ void SdrObjGroup::Move(const Size& rSiz) if (pSub->GetObjCount()!=0) { // #32383# Erst die Verbinder verschieben, dann den Rest SdrObjList* pOL=pSub; - ULONG nObjAnz=pOL->GetObjCount(); - ULONG i; + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + sal_uIntPtr i; for (i=0; i<nObjAnz; i++) { SdrObject* pObj=pOL->GetObj(i); if (pObj->IsEdgeObj()) pObj->Move(rSiz); @@ -621,8 +621,8 @@ void SdrObjGroup::Resize(const Point& rRef, const Fraction& xFact, const Fractio if (pSub->GetObjCount()!=0) { // #32383# Erst die Verbinder verschieben, dann den Rest SdrObjList* pOL=pSub; - ULONG nObjAnz=pOL->GetObjCount(); - ULONG i; + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + sal_uIntPtr i; for (i=0; i<nObjAnz; i++) { SdrObject* pObj=pOL->GetObj(i); if (pObj->IsEdgeObj()) pObj->Resize(rRef,xFact,yFact); @@ -647,14 +647,14 @@ void SdrObjGroup::Resize(const Point& rRef, const Fraction& xFact, const Fractio void SdrObjGroup::Rotate(const Point& rRef, long nWink, double sn, double cs) { if (nWink!=0) { - SetGlueReallyAbsolute(TRUE); + SetGlueReallyAbsolute(sal_True); Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); nDrehWink=NormAngle360(nDrehWink+nWink); RotatePoint(aRefPoint,rRef,sn,cs); // #32383# Erst die Verbinder verschieben, dann den Rest SdrObjList* pOL=pSub; - ULONG nObjAnz=pOL->GetObjCount(); - ULONG i; + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + sal_uIntPtr i; for (i=0; i<nObjAnz; i++) { SdrObject* pObj=pOL->GetObj(i); if (pObj->IsEdgeObj()) pObj->Rotate(rRef,nWink,sn,cs); @@ -664,7 +664,7 @@ void SdrObjGroup::Rotate(const Point& rRef, long nWink, double sn, double cs) if (!pObj->IsEdgeObj()) pObj->Rotate(rRef,nWink,sn,cs); } NbcRotateGluePoints(rRef,nWink,sn,cs); - SetGlueReallyAbsolute(FALSE); + SetGlueReallyAbsolute(sal_False); SetChanged(); BroadcastObjectChange(); SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0); @@ -674,13 +674,13 @@ void SdrObjGroup::Rotate(const Point& rRef, long nWink, double sn, double cs) void SdrObjGroup::Mirror(const Point& rRef1, const Point& rRef2) { - SetGlueReallyAbsolute(TRUE); + SetGlueReallyAbsolute(sal_True); Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); MirrorPoint(aRefPoint,rRef1,rRef2); // fehlende Implementation in SvdEtc !!! // #32383# Erst die Verbinder verschieben, dann den Rest SdrObjList* pOL=pSub; - ULONG nObjAnz=pOL->GetObjCount(); - ULONG i; + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + sal_uIntPtr i; for (i=0; i<nObjAnz; i++) { SdrObject* pObj=pOL->GetObj(i); if (pObj->IsEdgeObj()) pObj->Mirror(rRef1,rRef2); @@ -690,7 +690,7 @@ void SdrObjGroup::Mirror(const Point& rRef1, const Point& rRef2) if (!pObj->IsEdgeObj()) pObj->Mirror(rRef1,rRef2); } NbcMirrorGluePoints(rRef1,rRef2); - SetGlueReallyAbsolute(FALSE); + SetGlueReallyAbsolute(sal_False); SetChanged(); BroadcastObjectChange(); SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0); @@ -700,14 +700,14 @@ void SdrObjGroup::Mirror(const Point& rRef1, const Point& rRef2) void SdrObjGroup::Shear(const Point& rRef, long nWink, double tn, bool bVShear) { if (nWink!=0) { - SetGlueReallyAbsolute(TRUE); + SetGlueReallyAbsolute(sal_True); Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); nShearWink+=nWink; ShearPoint(aRefPoint,rRef,tn); // #32383# Erst die Verbinder verschieben, dann den Rest SdrObjList* pOL=pSub; - ULONG nObjAnz=pOL->GetObjCount(); - ULONG i; + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + sal_uIntPtr i; for (i=0; i<nObjAnz; i++) { SdrObject* pObj=pOL->GetObj(i); if (pObj->IsEdgeObj()) pObj->Shear(rRef,nWink,tn,bVShear); @@ -717,7 +717,7 @@ void SdrObjGroup::Shear(const Point& rRef, long nWink, double tn, bool bVShear) if (!pObj->IsEdgeObj()) pObj->Shear(rRef,nWink,tn,bVShear); } NbcShearGluePoints(rRef,nWink,tn,bVShear); - SetGlueReallyAbsolute(FALSE); + SetGlueReallyAbsolute(sal_False); SetChanged(); BroadcastObjectChange(); SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0); @@ -734,8 +734,8 @@ void SdrObjGroup::SetAnchorPos(const Point& rPnt) MovePoint(aRefPoint,aSiz); // #32383# Erst die Verbinder verschieben, dann den Rest SdrObjList* pOL=pSub; - ULONG nObjAnz=pOL->GetObjCount(); - ULONG i; + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + sal_uIntPtr i; for (i=0; i<nObjAnz; i++) { SdrObject* pObj=pOL->GetObj(i); if (pObj->IsEdgeObj()) pObj->SetAnchorPos(rPnt); @@ -777,12 +777,12 @@ void SdrObjGroup::ReformatText() pSub->ReformatAllTextObjects(); } -SdrObject* SdrObjGroup::DoConvertToPolyObj(BOOL bBezier) const +SdrObject* SdrObjGroup::DoConvertToPolyObj(sal_Bool bBezier) const { SdrObject* pGroup = new SdrObjGroup; pGroup->SetModel(GetModel()); - for(UINT32 a=0;a<pSub->GetObjCount();a++) + for(sal_uInt32 a=0;a<pSub->GetObjCount();a++) { SdrObject* pIterObj = pSub->GetObj(a); SdrObject* pResult = pIterObj->DoConvertToPolyObj(bBezier); diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index e115a43ae907..488e77ac02c1 100644..100755 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -31,7 +31,7 @@ #include <svx/svdomeas.hxx> #include <math.h> -#include "svditext.hxx" // +#include "svx/svditext.hxx" // #include <svx/xpoly.hxx> #include <svx/svdtrans.hxx> #include <svx/svdhdl.hxx> @@ -41,8 +41,8 @@ #include <svx/svdattrx.hxx> #include <svx/svdmodel.hxx> #include <svx/svdview.hxx> -#include "svdglob.hxx" // StringCache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Objektname #include <svl/style.hxx> #include <svl/smplhint.hxx> #include <editeng/eeitem.hxx> @@ -80,8 +80,8 @@ void SdrMeasureObj::TakeRepresentation( XubString& rStr, SdrMeasureFieldKind eMe { rStr.Erase(); Fraction aMeasureScale(1, 1); - BOOL bTextRota90(FALSE); - BOOL bShowUnit(FALSE); + sal_Bool bTextRota90(sal_False); + sal_Bool bShowUnit(sal_False); FieldUnit eMeasureUnit(FUNIT_NONE); FieldUnit eModUIUnit(FUNIT_NONE); @@ -105,7 +105,7 @@ void SdrMeasureObj::TakeRepresentation( XubString& rStr, SdrMeasureFieldKind eMe if(eMeasureUnit == FUNIT_NONE) eMeasureUnit = eModUIUnit; - INT32 nLen(GetLen(aPt2 - aPt1)); + sal_Int32 nLen(GetLen(aPt2 - aPt1)); Fraction aFact(1,1); if(eMeasureUnit != eModUIUnit) @@ -125,7 +125,7 @@ void SdrMeasureObj::TakeRepresentation( XubString& rStr, SdrMeasureFieldKind eMe nLen = BigMulDiv(nLen, aFact.GetNumerator(), aFact.GetDenominator()); } - pModel->TakeMetricStr(nLen, rStr, TRUE, nNumDigits); + pModel->TakeMetricStr(nLen, rStr, sal_True, nNumDigits); if(!aFact.IsValid()) { @@ -216,7 +216,7 @@ sdr::contact::ViewContact* SdrMeasureObj::CreateObjectSpecificViewContact() TYPEINIT1(SdrMeasureObj,SdrTextObj); SdrMeasureObj::SdrMeasureObj(): - bTextDirty(FALSE) + bTextDirty(sal_False) { // #i25616# mbSupportTextIndentingOnLineWidthChange = sal_False; @@ -225,7 +225,7 @@ SdrMeasureObj::SdrMeasureObj(): SdrMeasureObj::SdrMeasureObj(const Point& rPt1, const Point& rPt2): aPt1(rPt1), aPt2(rPt2), - bTextDirty(FALSE) + bTextDirty(sal_False) { // #i25616# mbSupportTextIndentingOnLineWidthChange = sal_False; @@ -237,31 +237,31 @@ SdrMeasureObj::~SdrMeasureObj() void SdrMeasureObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { - rInfo.bSelectAllowed =TRUE; - rInfo.bMoveAllowed =TRUE; - rInfo.bResizeFreeAllowed=TRUE; - rInfo.bResizePropAllowed=TRUE; - rInfo.bRotateFreeAllowed=TRUE; - rInfo.bRotate90Allowed =TRUE; - rInfo.bMirrorFreeAllowed=TRUE; - rInfo.bMirror45Allowed =TRUE; - rInfo.bMirror90Allowed =TRUE; - rInfo.bTransparenceAllowed = FALSE; - rInfo.bGradientAllowed = FALSE; - rInfo.bShearAllowed =TRUE; - rInfo.bEdgeRadiusAllowed=FALSE; - rInfo.bNoOrthoDesired =TRUE; - rInfo.bNoContortion =FALSE; - rInfo.bCanConvToPath =FALSE; - rInfo.bCanConvToPoly =TRUE; - rInfo.bCanConvToPathLineToArea=FALSE; - rInfo.bCanConvToPolyLineToArea=FALSE; + rInfo.bSelectAllowed =sal_True; + rInfo.bMoveAllowed =sal_True; + rInfo.bResizeFreeAllowed=sal_True; + rInfo.bResizePropAllowed=sal_True; + rInfo.bRotateFreeAllowed=sal_True; + rInfo.bRotate90Allowed =sal_True; + rInfo.bMirrorFreeAllowed=sal_True; + rInfo.bMirror45Allowed =sal_True; + rInfo.bMirror90Allowed =sal_True; + rInfo.bTransparenceAllowed = sal_False; + rInfo.bGradientAllowed = sal_False; + rInfo.bShearAllowed =sal_True; + rInfo.bEdgeRadiusAllowed=sal_False; + rInfo.bNoOrthoDesired =sal_True; + rInfo.bNoContortion =sal_False; + rInfo.bCanConvToPath =sal_False; + rInfo.bCanConvToPoly =sal_True; + rInfo.bCanConvToPathLineToArea=sal_False; + rInfo.bCanConvToPolyLineToArea=sal_False; rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary()); } -UINT16 SdrMeasureObj::GetObjIdentifier() const +sal_uInt16 SdrMeasureObj::GetObjIdentifier() const { - return (UINT16)OBJ_MEASURE; + return (sal_uInt16)OBJ_MEASURE; } struct ImpMeasureRec : public SdrDragStatUserData @@ -313,7 +313,7 @@ struct ImpMeasurePoly double nLineCos; double nHlpSin; double nHlpCos; - USHORT nMainlineAnz; + sal_uInt16 nMainlineAnz; SdrMeasureTextHPos eUsedTextHPos; SdrMeasureTextVPos eUsedTextVPos; long nLineWdt2; // Halbe Strichstaerke @@ -426,7 +426,7 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly& OutlinerParaObject* pOutlinerParaObject = SdrTextObj::GetOutlinerParaObject(); if (pOutlinerParaObject!=NULL && pOutlinerParaObject->GetTextObject().GetParagraphCount()==1) { - bBrkLine=TRUE; // Unterbrochene Linie, wenn nur 1 Absatz. + bBrkLine=sal_True; // Unterbrochene Linie, wenn nur 1 Absatz. } } rPol.bBreakedLine=bBrkLine; @@ -462,12 +462,12 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly& rPol.nTextWink=rPol.nLineWink; if (rRec.bTextRota90) rPol.nTextWink+=9000; - rPol.bAutoUpsideDown=FALSE; + rPol.bAutoUpsideDown=sal_False; if (rRec.bTextAutoAngle) { long nTmpWink=NormAngle360(rPol.nTextWink-rRec.nTextAutoAngleView); if (nTmpWink>=18000) { rPol.nTextWink+=18000; - rPol.bAutoUpsideDown=TRUE; + rPol.bAutoUpsideDown=sal_True; } } @@ -582,7 +582,7 @@ basegfx::B2DPolyPolygon SdrMeasureObj::ImpCalcXPoly(const ImpMeasurePoly& rPol) return aRetval; } -bool SdrMeasureObj::CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USHORT nPos, +bool SdrMeasureObj::CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, bool bEdit, Color*& rpTxtColor, Color*& rpFldColor, XubString& rRet) const { @@ -597,7 +597,7 @@ bool SdrMeasureObj::CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USH rpFldColor=NULL; } } - return TRUE; + return sal_True; } else { return SdrTextObj::CalcFieldValue(rField,nPara,nPos,bEdit,rpTxtColor,rpFldColor,rRet); } @@ -629,14 +629,14 @@ void SdrMeasureObj::UndirtyText() const rOutliner.SetText(*pOutlinerParaObject); } - rOutliner.SetUpdateMode(TRUE); + rOutliner.SetUpdateMode(sal_True); rOutliner.UpdateFields(); Size aSiz(rOutliner.CalcTextSize()); rOutliner.Clear(); // 3x casting auf nonconst ((SdrMeasureObj*)this)->aTextSize=aSiz; - ((SdrMeasureObj*)this)->bTextSizeDirty=FALSE; - ((SdrMeasureObj*)this)->bTextDirty=FALSE; + ((SdrMeasureObj*)this)->bTextSizeDirty=sal_False; + ((SdrMeasureObj*)this)->bTextDirty=sal_False; } } @@ -978,7 +978,7 @@ bool SdrMeasureObj::BegCreate(SdrDragStat& rStat) aPt1=rStat.GetStart(); aPt2=rStat.GetNow(); SetTextDirty(); - return TRUE; + return sal_True; } bool SdrMeasureObj::MovCreate(SdrDragStat& rStat) @@ -992,8 +992,8 @@ bool SdrMeasureObj::MovCreate(SdrDragStat& rStat) } SetTextDirty(); SetBoundRectDirty(); - bSnapRectDirty=TRUE; - return TRUE; + bSnapRectDirty=sal_True; + return sal_True; } bool SdrMeasureObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) @@ -1159,7 +1159,7 @@ void SdrMeasureObj::RestGeoData(const SdrObjGeoData& rGeo) SetTextDirty(); } -SdrObject* SdrMeasureObj::DoConvertToPolyObj(BOOL bBezier) const +SdrObject* SdrMeasureObj::DoConvertToPolyObj(sal_Bool bBezier) const { // get XOR Poly as base XPolyPolygon aTmpPolyPolygon(TakeXorPoly()); @@ -1175,8 +1175,8 @@ SdrObject* SdrMeasureObj::DoConvertToPolyObj(BOOL bBezier) const // prepare parameters basegfx::B2DPolyPolygon aPolyPoly; SdrPathObj* pPath; - UINT16 nCount(aTmpPolyPolygon.Count()); - UINT16 nLoopStart(0); + sal_uInt16 nCount(aTmpPolyPolygon.Count()); + sal_uInt16 nLoopStart(0); if(nCount == 3) { @@ -1197,8 +1197,8 @@ SdrObject* SdrMeasureObj::DoConvertToPolyObj(BOOL bBezier) const { // four lines, middle line with gap, so there are two lines used // which have one arrow each - //INT32 nStartWidth = ((const XLineStartWidthItem&)(aSet.Get(XATTR_LINESTARTWIDTH))).GetValue(); - INT32 nEndWidth = ((const XLineEndWidthItem&)(aSet.Get(XATTR_LINEENDWIDTH))).GetValue(); + //sal_Int32 nStartWidth = ((const XLineStartWidthItem&)(aSet.Get(XATTR_LINESTARTWIDTH))).GetValue(); + sal_Int32 nEndWidth = ((const XLineEndWidthItem&)(aSet.Get(XATTR_LINEENDWIDTH))).GetValue(); aSet.Put(XLineEndWidthItem(0L)); aPolyPoly.clear(); @@ -1228,8 +1228,8 @@ SdrObject* SdrMeasureObj::DoConvertToPolyObj(BOOL bBezier) const else if(nCount == 5) { // five lines, first two are the outer ones - //INT32 nStartWidth = ((const XLineStartWidthItem&)(aSet.Get(XATTR_LINESTARTWIDTH))).GetValue(); - INT32 nEndWidth = ((const XLineEndWidthItem&)(aSet.Get(XATTR_LINEENDWIDTH))).GetValue(); + //sal_Int32 nStartWidth = ((const XLineStartWidthItem&)(aSet.Get(XATTR_LINESTARTWIDTH))).GetValue(); + sal_Int32 nEndWidth = ((const XLineEndWidthItem&)(aSet.Get(XATTR_LINEENDWIDTH))).GetValue(); aSet.Put(XLineEndWidthItem(0L)); @@ -1300,7 +1300,7 @@ void SdrMeasureObj::NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject) } void SdrMeasureObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, - Rectangle* pAnchorRect, BOOL bLineWidth ) const + Rectangle* pAnchorRect, sal_Bool bLineWidth ) const { if (bTextDirty) UndirtyText(); SdrTextObj::TakeTextRect( rOutliner, rTextRect, bNoEditText, pAnchorRect, bLineWidth ); @@ -1318,7 +1318,7 @@ void SdrMeasureObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle SdrTextObj::TakeTextEditArea(pPaperMin,pPaperMax,pViewInit,pViewMin); } -USHORT SdrMeasureObj::GetOutlinerViewAnchorMode() const +sal_uInt16 SdrMeasureObj::GetOutlinerViewAnchorMode() const { if (bTextDirty) UndirtyText(); ImpMeasureRec aRec; @@ -1331,7 +1331,6 @@ USHORT SdrMeasureObj::GetOutlinerViewAnchorMode() const SdrMeasureTextHPos eMH=aMPol.eUsedTextHPos; SdrMeasureTextVPos eMV=aMPol.eUsedTextVPos; bool bTextRota90=aRec.bTextRota90; - //bool bTextUpsideDown=aRec.bTextUpsideDown; bool bBelowRefEdge=aRec.bBelowRefEdge; // bTextUpsideDown muss hier noch ausgewertet werden!!!! @@ -1370,7 +1369,7 @@ USHORT SdrMeasureObj::GetOutlinerViewAnchorMode() const else if (eTV==SDRTEXTVERTADJUST_BOTTOM) eRet=ANCHOR_BOTTOM_HCENTER; else eRet=ANCHOR_VCENTER_HCENTER; } - return (USHORT)eRet; + return (sal_uInt16)eRet; } ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx index b408abc834ae..f7da515d7dbf 100644..100755 --- a/svx/source/svdraw/svdomedia.cxx +++ b/svx/source/svdraw/svdomedia.cxx @@ -32,8 +32,8 @@ #include <vcl/svapp.hxx> #include <svx/svdomedia.hxx> -#include "svdglob.hxx" -#include "svdstr.hrc" +#include "svx/svdglob.hxx" +#include "svx/svdstr.hrc" #include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx> #include <avmedia/mediawindow.hxx> @@ -104,9 +104,9 @@ void SdrMediaObj::TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const // ------------------------------------------------------------------------------ -UINT16 SdrMediaObj::GetObjIdentifier() const +sal_uInt16 SdrMediaObj::GetObjIdentifier() const { - return UINT16( OBJ_MEDIA ); + return sal_uInt16( OBJ_MEDIA ); } // ------------------------------------------------------------------------------ diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index fe6368961991..bf5eacc5906a 100644..100755 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -78,8 +78,8 @@ #include <svx/svdpagv.hxx> #include <svx/svdmodel.hxx> -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" // Objektname #include <svx/svdetc.hxx> #include <svx/svdview.hxx> #include "unomlstr.hxx" @@ -394,7 +394,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::activatingUI() xParentFrame->setActiveFrame( xOwnFrame ); OLEObjCache& rObjCache = GetSdrGlobalData().GetOLEObjCache(); - const ULONG nCount = rObjCache.Count(); + const sal_uIntPtr nCount = rObjCache.Count(); for(sal_Int32 i = nCount-1 ; i >= 0;--i) { SdrOle2Obj* pObj = reinterpret_cast<SdrOle2Obj*>(rObjCache.GetObject(i)); @@ -624,7 +624,7 @@ SdrEmbedObjectLink::SdrEmbedObjectLink(SdrOle2Obj* pObject): ::sfx2::SvBaseLink( ::sfx2::LINKUPDATE_ONCALL, SOT_FORMATSTR_ID_SVXB ), pObj(pObject) { - SetSynchron( FALSE ); + SetSynchron( sal_False ); } // ----------------------------------------------------------------------------- @@ -754,7 +754,7 @@ SdrOle2Obj::SdrOle2Obj(bool bFrame_) : m_bTypeAsked(false) ,m_bChart(false) { DBG_CTOR( SdrOle2Obj,NULL); - bInDestruction = FALSE; + bInDestruction = sal_False; Init(); bFrame=bFrame_; } @@ -766,13 +766,13 @@ SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, bool bFrame_) , m_bChart(false) { DBG_CTOR( SdrOle2Obj,NULL); - bInDestruction = FALSE; + bInDestruction = sal_False; Init(); bFrame=bFrame_; if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) ) - SetResizeProtect(TRUE); + SetResizeProtect(sal_True); // #108759# For math objects, set closed state to transparent if( ImplIsMathObj( xObjRef.GetObject() ) ) @@ -787,14 +787,14 @@ SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubStrin , m_bChart(false) { DBG_CTOR( SdrOle2Obj,NULL); - bInDestruction = FALSE; + bInDestruction = sal_False; Init(); mpImpl->aPersistName = rNewObjName; bFrame=bFrame_; if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) ) - SetResizeProtect(TRUE); + SetResizeProtect(sal_True); // #108759# For math objects, set closed state to transparent if( ImplIsMathObj( xObjRef.GetObject() ) ) @@ -810,14 +810,14 @@ SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubStri , m_bChart(false) { DBG_CTOR( SdrOle2Obj,NULL); - bInDestruction = FALSE; + bInDestruction = sal_False; Init(); mpImpl->aPersistName = rNewObjName; bFrame=bFrame_; if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) ) - SetResizeProtect(TRUE); + SetResizeProtect(sal_True); // #108759# For math objects, set closed state to transparent if( ImplIsMathObj( xObjRef.GetObject() ) ) @@ -834,7 +834,7 @@ void SdrOle2Obj::Init() mpImpl->pGraphicObject=NULL; mpImpl->pLightClient = 0; - xObjRef.Lock( TRUE ); + xObjRef.Lock( sal_True ); } // ----------------------------------------------------------------------------- @@ -842,7 +842,7 @@ void SdrOle2Obj::Init() SdrOle2Obj::~SdrOle2Obj() { DBG_DTOR( SdrOle2Obj,NULL); - bInDestruction = TRUE; + bInDestruction = sal_True; if ( mpImpl->mbConnected ) Disconnect(); @@ -1121,7 +1121,7 @@ void SdrOle2Obj::Connect_Impl() { xObjRef.AssignToContainer( &rContainer, mpImpl->aPersistName ); mpImpl->mbConnected = true; - xObjRef.Lock( TRUE ); + xObjRef.Lock( sal_True ); } } @@ -1172,7 +1172,7 @@ void SdrOle2Obj::Connect_Impl() pModel->GetRefDevice()->GetOutDevType() == OUTDEV_PRINTER) { // Kein RefDevice oder RefDevice kein Printer - BOOL bModified = (*ppObjRef)->IsModified(); + sal_Bool bModified = (*ppObjRef)->IsModified(); Printer* pPrinter = (Printer*) pModel->GetRefDevice(); (*ppObjRef)->OnDocumentPrinterChanged( pPrinter ); (*ppObjRef)->SetModified( bModified ); @@ -1440,7 +1440,7 @@ void SdrOle2Obj::SetObjRef( const com::sun::star::uno::Reference < com::sun::sta // MBA: the caller of the method is responsible to control the old object, it will not be closed here // Otherwise WW8 import crashes because it tranfers control to OLENode by this method if ( xObjRef.GetObject().is() ) - xObjRef.Lock( FALSE ); + xObjRef.Lock( sal_False ); // MBA: avoid removal of object in Disconnect! It is definitely a HACK to call SetObjRef(0)! // This call will try to close the objects; so if anybody else wants to keep it, it must be locked by a CloseListener @@ -1457,7 +1457,7 @@ void SdrOle2Obj::SetObjRef( const com::sun::star::uno::Reference < com::sun::sta DELETEZ( pGraphic ); if ( (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) ) - SetResizeProtect(TRUE); + SetResizeProtect(sal_True); // #108759# For math objects, set closed state to transparent if( ImplIsMathObj( rNewObjRef ) ) @@ -1550,28 +1550,28 @@ String SdrOle2Obj::GetPersistName() const void SdrOle2Obj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { - rInfo.bRotateFreeAllowed=FALSE; - rInfo.bRotate90Allowed =FALSE; - rInfo.bMirrorFreeAllowed=FALSE; - rInfo.bMirror45Allowed =FALSE; - rInfo.bMirror90Allowed =FALSE; - rInfo.bTransparenceAllowed = FALSE; - rInfo.bGradientAllowed = FALSE; - rInfo.bShearAllowed =FALSE; - rInfo.bEdgeRadiusAllowed=FALSE; - rInfo.bNoOrthoDesired =FALSE; - rInfo.bCanConvToPath =FALSE; - rInfo.bCanConvToPoly =FALSE; - rInfo.bCanConvToPathLineToArea=FALSE; - rInfo.bCanConvToPolyLineToArea=FALSE; - rInfo.bCanConvToContour = FALSE; + rInfo.bRotateFreeAllowed=sal_False; + rInfo.bRotate90Allowed =sal_False; + rInfo.bMirrorFreeAllowed=sal_False; + rInfo.bMirror45Allowed =sal_False; + rInfo.bMirror90Allowed =sal_False; + rInfo.bTransparenceAllowed = sal_False; + rInfo.bGradientAllowed = sal_False; + rInfo.bShearAllowed =sal_False; + rInfo.bEdgeRadiusAllowed=sal_False; + rInfo.bNoOrthoDesired =sal_False; + rInfo.bCanConvToPath =sal_False; + rInfo.bCanConvToPoly =sal_False; + rInfo.bCanConvToPathLineToArea=sal_False; + rInfo.bCanConvToPolyLineToArea=sal_False; + rInfo.bCanConvToContour = sal_False; } // ----------------------------------------------------------------------------- -UINT16 SdrOle2Obj::GetObjIdentifier() const +sal_uInt16 SdrOle2Obj::GetObjIdentifier() const { - return bFrame ? UINT16(OBJ_FRAME) : UINT16(OBJ_OLE2); + return bFrame ? sal_uInt16(OBJ_FRAME) : sal_uInt16(OBJ_OLE2); } // ----------------------------------------------------------------------------- @@ -1973,23 +1973,23 @@ sal_Bool SdrOle2Obj::Unload( const uno::Reference< embed::XEmbeddedObject >& xOb // ----------------------------------------------------------------------------- -BOOL SdrOle2Obj::Unload() +sal_Bool SdrOle2Obj::Unload() { - BOOL bUnloaded = FALSE; + sal_Bool bUnloaded = sal_False; if( xObjRef.is() ) { //TODO/LATER: no refcounting tricks anymore! //"customers" must register as state change listeners //Nicht notwendig im Doc DTor (MM) - //ULONG nRefCount = (*ppObjRef)->GetRefCount(); + //sal_uIntPtr nRefCount = (*ppObjRef)->GetRefCount(); // prevent Unload if there are external references //if( nRefCount > 2 ) - // return FALSE; + // return sal_False; //DBG_ASSERT( nRefCount == 2, "Wrong RefCount for unload" ); } else - bUnloaded = TRUE; + bUnloaded = sal_True; if ( pModel && xObjRef.is() ) { diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx index 2a65fe99095f..0da2aebfa408 100644..100755 --- a/svx/source/svdraw/svdopage.cxx +++ b/svx/source/svdraw/svdopage.cxx @@ -30,8 +30,8 @@ #include "precompiled_svx.hxx" #include <svx/svdopage.hxx> -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" // Objektname #include <svx/svdtrans.hxx> #include <svx/svdetc.hxx> #include <svx/svdmodel.hxx> @@ -145,27 +145,27 @@ void SdrPageObj::SetBoundRectDirty() // not re-creatable view data } -UINT16 SdrPageObj::GetObjIdentifier() const +sal_uInt16 SdrPageObj::GetObjIdentifier() const { - return UINT16(OBJ_PAGE); + return sal_uInt16(OBJ_PAGE); } void SdrPageObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { - rInfo.bRotateFreeAllowed=FALSE; - rInfo.bRotate90Allowed =FALSE; - rInfo.bMirrorFreeAllowed=FALSE; - rInfo.bMirror45Allowed =FALSE; - rInfo.bMirror90Allowed =FALSE; - rInfo.bTransparenceAllowed = FALSE; - rInfo.bGradientAllowed = FALSE; - rInfo.bShearAllowed =FALSE; - rInfo.bEdgeRadiusAllowed=FALSE; - rInfo.bNoOrthoDesired =FALSE; - rInfo.bCanConvToPath =FALSE; - rInfo.bCanConvToPoly =FALSE; - rInfo.bCanConvToPathLineToArea=FALSE; - rInfo.bCanConvToPolyLineToArea=FALSE; + rInfo.bRotateFreeAllowed=sal_False; + rInfo.bRotate90Allowed =sal_False; + rInfo.bMirrorFreeAllowed=sal_False; + rInfo.bMirror45Allowed =sal_False; + rInfo.bMirror90Allowed =sal_False; + rInfo.bTransparenceAllowed = sal_False; + rInfo.bGradientAllowed = sal_False; + rInfo.bShearAllowed =sal_False; + rInfo.bEdgeRadiusAllowed=sal_False; + rInfo.bNoOrthoDesired =sal_False; + rInfo.bCanConvToPath =sal_False; + rInfo.bCanConvToPoly =sal_False; + rInfo.bCanConvToPathLineToArea=sal_False; + rInfo.bCanConvToPolyLineToArea=sal_False; } void SdrPageObj::operator=(const SdrObject& rObj) diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index c4fc5c95b5bc..3ae99e5dd63d 100644..100755 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -42,8 +42,8 @@ #include <svx/svdpage.hxx> #include <svx/svdhdl.hxx> #include <svx/svdview.hxx> // fuer MovCreate bei Freihandlinien -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" // Objektname #ifdef _MSC_VER #pragma optimize ("",off) @@ -81,7 +81,7 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); } using namespace sdr; -inline USHORT GetPrevPnt(USHORT nPnt, USHORT nPntMax, bool bClosed) +inline sal_uInt16 GetPrevPnt(sal_uInt16 nPnt, sal_uInt16 nPntMax, bool bClosed) { if (nPnt>0) { nPnt--; @@ -92,7 +92,7 @@ inline USHORT GetPrevPnt(USHORT nPnt, USHORT nPntMax, bool bClosed) return nPnt; } -inline USHORT GetNextPnt(USHORT nPnt, USHORT nPntMax, bool bClosed) +inline sal_uInt16 GetNextPnt(sal_uInt16 nPnt, sal_uInt16 nPntMax, bool bClosed) { nPnt++; if (nPnt>nPntMax || (bClosed && nPnt>=nPntMax)) nPnt=0; @@ -104,43 +104,43 @@ struct ImpSdrPathDragData : public SdrDragStatUserData XPolygon aXP; // Ausschnitt aud dem Originalpolygon bool bValid; // FALSE = zu wenig Punkte bool bClosed; // geschlossenes Objekt? - USHORT nPoly; // Nummer des Polygons im PolyPolygon - USHORT nPnt; // Punktnummer innerhalb des obigen Polygons - USHORT nPntAnz; // Punktanzahl des Polygons - USHORT nPntMax; // Maximaler Index + sal_uInt16 nPoly; // Nummer des Polygons im PolyPolygon + sal_uInt16 nPnt; // Punktnummer innerhalb des obigen Polygons + sal_uInt16 nPntAnz; // Punktanzahl des Polygons + sal_uInt16 nPntMax; // Maximaler Index bool bBegPnt; // Gedraggter Punkt ist der Anfangspunkt einer Polyline bool bEndPnt; // Gedraggter Punkt ist der Endpunkt einer Polyline - USHORT nPrevPnt; // Index des vorherigen Punkts - USHORT nNextPnt; // Index des naechsten Punkts + sal_uInt16 nPrevPnt; // Index des vorherigen Punkts + sal_uInt16 nNextPnt; // Index des naechsten Punkts bool bPrevIsBegPnt; // Vorheriger Punkt ist Anfangspunkt einer Polyline bool bNextIsEndPnt; // Folgepunkt ist Endpunkt einer Polyline - USHORT nPrevPrevPnt; // Index des vorvorherigen Punkts - USHORT nNextNextPnt; // Index des uebernaechsten Punkts + sal_uInt16 nPrevPrevPnt; // Index des vorvorherigen Punkts + sal_uInt16 nNextNextPnt; // Index des uebernaechsten Punkts bool bControl; // Punkt ist ein Kontrollpunkt bool bIsPrevControl; // Punkt ist Kontrollpunkt vor einem Stuetzpunkt bool bIsNextControl; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt bool bPrevIsControl; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt bool bNextIsControl; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt - USHORT nPrevPrevPnt0; - USHORT nPrevPnt0; - USHORT nPnt0; - USHORT nNextPnt0; - USHORT nNextNextPnt0; + sal_uInt16 nPrevPrevPnt0; + sal_uInt16 nPrevPnt0; + sal_uInt16 nPnt0; + sal_uInt16 nNextPnt0; + sal_uInt16 nNextNextPnt0; bool bEliminate; // Punkt loeschen? (wird von MovDrag gesetzt) // ## - BOOL mbMultiPointDrag; + sal_Bool mbMultiPointDrag; const XPolyPolygon maOrig; XPolyPolygon maMove; Container maHandles; public: - ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl, BOOL bMuPoDr, const SdrDragStat& rDrag); + ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl, sal_Bool bMuPoDr, const SdrDragStat& rDrag); void ResetPoly(const SdrPathObj& rPO); - BOOL IsMultiPointDrag() const { return mbMultiPointDrag; } + sal_Bool IsMultiPointDrag() const { return mbMultiPointDrag; } }; -ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl, BOOL bMuPoDr, const SdrDragStat& rDrag) +ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl, sal_Bool bMuPoDr, const SdrDragStat& rDrag) : aXP(5), mbMultiPointDrag(bMuPoDr), maOrig(rPO.GetPathPoly()), @@ -164,11 +164,11 @@ ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl } maMove = maOrig; - bValid = TRUE; + bValid = sal_True; } else { - bValid=FALSE; + bValid=sal_False; bClosed=rPO.IsClosed(); // geschlossenes Objekt? nPoly=(sal_uInt16)rHdl.GetPolyNum(); // Nummer des Polygons im PolyPolygon nPnt=(sal_uInt16)rHdl.GetPointNum(); // Punktnummer innerhalb des obigen Polygons @@ -193,10 +193,10 @@ ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl if (!bPrevIsBegPnt) nPrevPrevPnt=GetPrevPnt(nPrevPnt,nPntMax,bClosed); if (!bNextIsEndPnt) nNextNextPnt=GetNextPnt(nNextPnt,nPntMax,bClosed); bControl=rHdl.IsPlusHdl(); // Punkt ist ein Kontrollpunkt - bIsPrevControl=FALSE; // Punkt ist Kontrollpunkt vor einem Stuetzpunkt - bIsNextControl=FALSE; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt - bPrevIsControl=FALSE; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt - bNextIsControl=FALSE; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt + bIsPrevControl=sal_False; // Punkt ist Kontrollpunkt vor einem Stuetzpunkt + bIsNextControl=sal_False; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt + bPrevIsControl=sal_False; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt + bNextIsControl=sal_False; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt if (bControl) { bIsPrevControl=aTmpXP.IsControl(nPrevPnt); bIsNextControl=!bIsPrevControl; @@ -214,9 +214,9 @@ ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl nPnt=2; nNextPnt=3; nNextNextPnt=4; - bEliminate=FALSE; + bEliminate=sal_False; ResetPoly(rPO); - bValid=TRUE; + bValid=sal_True; } } @@ -259,21 +259,20 @@ struct ImpPathCreateUser : public SdrDragStatUserData bool bLine90; bool bRect; bool bMixedCreate; - USHORT nBezierStartPoint; + sal_uInt16 nBezierStartPoint; SdrObjKind eStartKind; SdrObjKind eAktKind; public: ImpPathCreateUser(): nCircRadius(0),nCircStWink(0),nCircRelWink(0), - bBezier(FALSE),bBezHasCtrl0(FALSE),bCurve(FALSE),bCircle(FALSE),bAngleSnap(FALSE),bLine(FALSE),bLine90(FALSE),bRect(FALSE), - bMixedCreate(FALSE),nBezierStartPoint(0),eStartKind(OBJ_NONE),eAktKind(OBJ_NONE) { } + bBezier(sal_False),bBezHasCtrl0(sal_False),bCurve(sal_False),bCircle(sal_False),bAngleSnap(sal_False),bLine(sal_False),bLine90(sal_False),bRect(sal_False), + bMixedCreate(sal_False),nBezierStartPoint(0),eStartKind(OBJ_NONE),eAktKind(OBJ_NONE) { } - void ResetFormFlags() { bBezier=FALSE; bCurve=FALSE; bCircle=FALSE; bLine=FALSE; bRect=FALSE; } + void ResetFormFlags() { bBezier=sal_False; bCurve=sal_False; bCircle=sal_False; bLine=sal_False; bRect=sal_False; } bool IsFormFlag() const { return bBezier || bCurve || bCircle || bLine || bRect; } XPolygon GetFormPoly() const; bool CalcBezier(const Point& rP1, const Point& rP2, const Point& rDir, bool bMouseDown); XPolygon GetBezierPoly() const; - //bool CalcCurve(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView) { return FALSE; } XPolygon GetCurvePoly() const { return XPolygon(); } bool CalcCircle(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView); XPolygon GetCirclePoly() const; @@ -362,7 +361,7 @@ bool ImpPathCreateUser::CalcCircle(const Point& rP1, const Point& rP2, const Poi } } nCircRadius=nRad; - if (nRad==0 || Abs(nCircRelWink)<5) bRet=FALSE; + if (nRad==0 || Abs(nCircRelWink)<5) bRet=sal_False; bCircle=bRet; return bRet; } @@ -371,17 +370,17 @@ XPolygon ImpPathCreateUser::GetCirclePoly() const { if (nCircRelWink>=0) { XPolygon aXP(aCircCenter,nCircRadius,nCircRadius, - USHORT((nCircStWink+5)/10),USHORT((nCircStWink+nCircRelWink+5)/10),FALSE); + sal_uInt16((nCircStWink+5)/10),sal_uInt16((nCircStWink+nCircRelWink+5)/10),sal_False); aXP[0]=aCircStart; aXP.SetFlags(0,XPOLY_SMOOTH); if (!bAngleSnap) aXP[aXP.GetPointCount()-1]=aCircEnd; return aXP; } else { XPolygon aXP(aCircCenter,nCircRadius,nCircRadius, - USHORT(NormAngle360(nCircStWink+nCircRelWink+5)/10),USHORT((nCircStWink+5)/10),FALSE); - USHORT nAnz=aXP.GetPointCount(); - for (USHORT nNum=nAnz/2; nNum>0;) { + sal_uInt16(NormAngle360(nCircStWink+nCircRelWink+5)/10),sal_uInt16((nCircStWink+5)/10),sal_False); + sal_uInt16 nAnz=aXP.GetPointCount(); + for (sal_uInt16 nNum=nAnz/2; nNum>0;) { nNum--; // XPoly Punktreihenfolge umkehren - USHORT n2=nAnz-nNum-1; + sal_uInt16 n2=nAnz-nNum-1; Point aPt(aXP[nNum]); aXP[nNum]=aXP[n2]; aXP[n2]=aPt; @@ -418,8 +417,8 @@ bool ImpPathCreateUser::CalcLine(const Point& rP1, const Point& rP2, const Point { aLineStart=rP1; aLineEnd=rP2; - bLine90=FALSE; - if (rP1==rP2 || (rDir.X()==0 && rDir.Y()==0)) { bLine=FALSE; return FALSE; } + bLine90=sal_False; + if (rP1==rP2 || (rDir.X()==0 && rDir.Y()==0)) { bLine=sal_False; return sal_False; } Point aTmpPt(rP2-rP1); long nDirX=rDir.X(); long nDirY=rDir.Y(); @@ -432,8 +431,8 @@ bool ImpPathCreateUser::CalcLine(const Point& rP1, const Point& rP2, const Point } else { // rechtwinkliger Uebergang aLineEnd+=aP2; } - bLine=TRUE; - return TRUE; + bLine=sal_True; + return sal_True; } XPolygon ImpPathCreateUser::GetLinePoly() const @@ -449,7 +448,7 @@ bool ImpPathCreateUser::CalcRect(const Point& rP1, const Point& rP2, const Point aRectP1=rP1; aRectP2=rP1; aRectP3=rP2; - if (rP1==rP2 || (rDir.X()==0 && rDir.Y()==0)) { bRect=FALSE; return FALSE; } + if (rP1==rP2 || (rDir.X()==0 && rDir.Y()==0)) { bRect=sal_False; return sal_False; } Point aTmpPt(rP2-rP1); long nDirX=rDir.X(); long nDirY=rDir.Y(); @@ -493,8 +492,8 @@ bool ImpPathCreateUser::CalcRect(const Point& rP1, const Point& rP2, const Point aRectP3.Y()+=ytemp; } } - bRect=TRUE; - return TRUE; + bRect=sal_True; + return sal_True; } XPolygon ImpPathCreateUser::GetRectPoly() const @@ -569,12 +568,12 @@ bool ImpPathForDragAndCreate::beginPathDrag( SdrDragStat& rDrag ) const { const SdrHdl* pHdl=rDrag.GetHdl(); if(!pHdl) - return FALSE; + return sal_False; - BOOL bMultiPointDrag(TRUE); + sal_Bool bMultiPointDrag(sal_True); if(aPathPolygon[(sal_uInt16)pHdl->GetPolyNum()].IsControl((sal_uInt16)pHdl->GetPointNum())) - bMultiPointDrag = FALSE; + bMultiPointDrag = sal_False; if(bMultiPointDrag) { @@ -595,7 +594,7 @@ bool ImpPathForDragAndCreate::beginPathDrag( SdrDragStat& rDrag ) const } if(nSelectedPoints <= 1) - bMultiPointDrag = FALSE; + bMultiPointDrag = sal_False; } ((ImpPathForDragAndCreate*)this)->mpSdrPathDragData = new ImpSdrPathDragData(mrSdrPathObject,*pHdl,bMultiPointDrag,rDrag); @@ -633,7 +632,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const const XPolygon& rOrig = mpSdrPathDragData->maOrig[nPolyIndex]; XPolygon& rMove = mpSdrPathDragData->maMove[nPolyIndex]; const sal_uInt16 nPointCount(rOrig.GetPointCount()); - BOOL bClosed(rOrig[0] == rOrig[nPointCount-1]); + sal_Bool bClosed(rOrig[0] == rOrig[nPointCount-1]); // move point itself rMove[nPointIndex] = rOrig[nPointIndex] + aDelta; @@ -671,17 +670,16 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const // Div. Daten lokal Kopieren fuer weniger Code und schnelleren Zugriff bool bClosed =mpSdrPathDragData->bClosed ; // geschlossenes Objekt? - USHORT nPnt =mpSdrPathDragData->nPnt ; // Punktnummer innerhalb des obigen Polygons + sal_uInt16 nPnt =mpSdrPathDragData->nPnt ; // Punktnummer innerhalb des obigen Polygons bool bBegPnt =mpSdrPathDragData->bBegPnt ; // Gedraggter Punkt ist der Anfangspunkt einer Polyline bool bEndPnt =mpSdrPathDragData->bEndPnt ; // Gedraggter Punkt ist der Endpunkt einer Polyline - USHORT nPrevPnt =mpSdrPathDragData->nPrevPnt ; // Index des vorherigen Punkts - USHORT nNextPnt =mpSdrPathDragData->nNextPnt ; // Index des naechsten Punkts + sal_uInt16 nPrevPnt =mpSdrPathDragData->nPrevPnt ; // Index des vorherigen Punkts + sal_uInt16 nNextPnt =mpSdrPathDragData->nNextPnt ; // Index des naechsten Punkts bool bPrevIsBegPnt =mpSdrPathDragData->bPrevIsBegPnt ; // Vorheriger Punkt ist Anfangspunkt einer Polyline bool bNextIsEndPnt =mpSdrPathDragData->bNextIsEndPnt ; // Folgepunkt ist Endpunkt einer Polyline - USHORT nPrevPrevPnt =mpSdrPathDragData->nPrevPrevPnt ; // Index des vorvorherigen Punkts - USHORT nNextNextPnt =mpSdrPathDragData->nNextNextPnt ; // Index des uebernaechsten Punkts + sal_uInt16 nPrevPrevPnt =mpSdrPathDragData->nPrevPrevPnt ; // Index des vorvorherigen Punkts + sal_uInt16 nNextNextPnt =mpSdrPathDragData->nNextNextPnt ; // Index des uebernaechsten Punkts bool bControl =mpSdrPathDragData->bControl ; // Punkt ist ein Kontrollpunkt - //bool bIsPrevControl=mpSdrPathDragData->bIsPrevControl; // Punkt ist Kontrollpunkt vor einem Stuetzpunkt bool bIsNextControl =mpSdrPathDragData->bIsNextControl; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt bool bPrevIsControl =mpSdrPathDragData->bPrevIsControl; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt bool bNextIsControl =mpSdrPathDragData->bNextIsControl; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt @@ -691,7 +689,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const bool bBigOrtho=rDrag.GetView()->IsBigOrtho(); Point aPos(rDrag.GetNow()); // die aktuelle Position Point aPnt(mpSdrPathDragData->aXP[nPnt]); // der gedraggte Punkt - USHORT nPnt1=0xFFFF,nPnt2=0xFFFF; // seine Nachbarpunkte + sal_uInt16 nPnt1=0xFFFF,nPnt2=0xFFFF; // seine Nachbarpunkte Point aNeuPos1,aNeuPos2; // die neuen Alternativen fuer aPos bool bPnt1 = false, bPnt2 = false; // die neuen Alternativen gueltig? if (!bClosed && mpSdrPathDragData->nPntAnz>=2) { // Mind. 2 Pt bei Linien @@ -711,7 +709,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const if (!bHLin || !bVLin) { long ndx=aPos.X()-aPnt1.X(); long ndy=aPos.Y()-aPnt1.Y(); - bPnt1=TRUE; + bPnt1=sal_True; double nXFact=0; if (!bVLin) nXFact=(double)ndx/(double)ndx0; double nYFact=0; if (!bHLin) nYFact=(double)ndy/(double)ndy0; bool bHor=bHLin || (!bVLin && (nXFact>nYFact) ==bBigOrtho); @@ -732,7 +730,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const if (!bHLin || !bVLin) { long ndx=aPos.X()-aPnt2.X(); long ndy=aPos.Y()-aPnt2.Y(); - bPnt2=TRUE; + bPnt2=sal_True; double nXFact=0; if (!bVLin) nXFact=(double)ndx/(double)ndx0; double nYFact=0; if (!bHLin) nYFact=(double)ndy/(double)ndy0; bool bHor=bHLin || (!bVLin && (nXFact>nYFact) ==bBigOrtho); @@ -752,7 +750,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const nX1+=nY1; // Korrekturabstand zum Quadrat nX2+=nY2; // Korrekturabstand zum Quadrat // Die Alternative mit dem geringeren Korrekturbedarf gewinnt - if (nX1<nX2) bPnt2=FALSE; else bPnt1=FALSE; + if (nX1<nX2) bPnt2=sal_False; else bPnt1=sal_False; } if (bPnt1) rDrag.Now()=aNeuPos1; if (bPnt2) rDrag.Now()=aNeuPos2; @@ -801,8 +799,8 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const // Nun symmetrische PlusHandles etc. checken if (bControl) { // Faelle 5,6,7,8 - USHORT nSt=nPnt; // der zugehoerige Stuetzpunkt - USHORT nFix=nPnt; // der gegenueberliegende Kontrollpunkt + sal_uInt16 nSt=nPnt; // der zugehoerige Stuetzpunkt + sal_uInt16 nFix=nPnt; // der gegenueberliegende Kontrollpunkt if (bIsNextControl) { // Wenn der naechste ein Kontrollpunkt ist, muss der vorh. der Stuetzpunkt sein nSt=nPrevPnt; nFix=nPrevPrevPnt; @@ -977,26 +975,26 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag) mrSdrPathObject.GetModel()->TakeWinkStr(Abs(pU->nCircRelWink), aMetr); aStr += aMetr; aStr.AppendAscii(" r="); - mrSdrPathObject.GetModel()->TakeMetricStr(pU->nCircRadius, aMetr, TRUE); + mrSdrPathObject.GetModel()->TakeMetricStr(pU->nCircRadius, aMetr, sal_True); aStr += aMetr; } aStr.AppendAscii("dx="); - mrSdrPathObject.GetModel()->TakeMetricStr(aNow.X(), aMetr, TRUE); + mrSdrPathObject.GetModel()->TakeMetricStr(aNow.X(), aMetr, sal_True); aStr += aMetr; aStr.AppendAscii(" dy="); - mrSdrPathObject.GetModel()->TakeMetricStr(aNow.Y(), aMetr, TRUE); + mrSdrPathObject.GetModel()->TakeMetricStr(aNow.Y(), aMetr, sal_True); aStr += aMetr; if(!IsFreeHand(meObjectKind)) { - INT32 nLen(GetLen(aNow)); + sal_Int32 nLen(GetLen(aNow)); aStr.AppendAscii(" l="); - mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, TRUE); + mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, sal_True); aStr += aMetr; - INT32 nWink(GetAngle(aNow)); + sal_Int32 nWink(GetAngle(aNow)); aStr += sal_Unicode(' '); mrSdrPathObject.GetModel()->TakeWinkStr(nWink, aMetr); aStr += aMetr; @@ -1043,27 +1041,27 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag) } // dx=0.00 dy=0.00 // Beide Seiten Bezier - // dx=0.00 dy=0.00 l=0.00 0.00ø // Anfang oder Ende oder eine Seite Bezier bzw. Hebel - // dx=0.00 dy=0.00 l=0.00 0.00ø / l=0.00 0.00ø // Mittendrin + // dx=0.00 dy=0.00 l=0.00 0.00� // Anfang oder Ende oder eine Seite Bezier bzw. Hebel + // dx=0.00 dy=0.00 l=0.00 0.00� / l=0.00 0.00� // Mittendrin XubString aMetr; Point aBeg(rDrag.GetStart()); Point aNow(rDrag.GetNow()); aStr = String(); aStr.AppendAscii("dx="); - mrSdrPathObject.GetModel()->TakeMetricStr(aNow.X() - aBeg.X(), aMetr, TRUE); + mrSdrPathObject.GetModel()->TakeMetricStr(aNow.X() - aBeg.X(), aMetr, sal_True); aStr += aMetr; aStr.AppendAscii(" dy="); - mrSdrPathObject.GetModel()->TakeMetricStr(aNow.Y() - aBeg.Y(), aMetr, TRUE); + mrSdrPathObject.GetModel()->TakeMetricStr(aNow.Y() - aBeg.Y(), aMetr, sal_True); aStr += aMetr; if(!pDragData->IsMultiPointDrag()) { - UINT16 nPntNum((sal_uInt16)pHdl->GetPointNum()); + sal_uInt16 nPntNum((sal_uInt16)pHdl->GetPointNum()); const XPolygon& rXPoly = aPathPolygon[(sal_uInt16)rDrag.GetHdl()->GetPolyNum()]; - UINT16 nPntAnz((sal_uInt16)rXPoly.GetPointCount()); - BOOL bClose(IsClosed(meObjectKind)); + sal_uInt16 nPntAnz((sal_uInt16)rXPoly.GetPointCount()); + sal_Bool bClose(IsClosed(meObjectKind)); if(bClose) nPntAnz--; @@ -1071,7 +1069,7 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag) if(pHdl->IsPlusHdl()) { // Hebel - UINT16 nRef(nPntNum); + sal_uInt16 nRef(nPntNum); if(rXPoly.IsControl(nPntNum + 1)) nRef--; @@ -1080,31 +1078,31 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag) aNow -= rXPoly[nRef]; - INT32 nLen(GetLen(aNow)); + sal_Int32 nLen(GetLen(aNow)); aStr.AppendAscii(" l="); - mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, TRUE); + mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, sal_True); aStr += aMetr; - INT32 nWink(GetAngle(aNow)); + sal_Int32 nWink(GetAngle(aNow)); aStr += sal_Unicode(' '); mrSdrPathObject.GetModel()->TakeWinkStr(nWink, aMetr); aStr += aMetr; } else if(nPntAnz > 1) { - UINT16 nPntMax(nPntAnz - 1); + sal_uInt16 nPntMax(nPntAnz - 1); Point aPt1,aPt2; - BOOL bIsClosed(IsClosed(meObjectKind)); - BOOL bPt1(nPntNum > 0); - BOOL bPt2(nPntNum < nPntMax); + sal_Bool bIsClosed(IsClosed(meObjectKind)); + sal_Bool bPt1(nPntNum > 0); + sal_Bool bPt2(nPntNum < nPntMax); if(bIsClosed && nPntAnz > 2) { - bPt1 = TRUE; - bPt2 = TRUE; + bPt1 = sal_True; + bPt2 = sal_True; } - UINT16 nPt1,nPt2; + sal_uInt16 nPt1,nPt2; if(nPntNum > 0) nPt1 = nPntNum - 1; @@ -1117,22 +1115,22 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag) nPt2 = 0; if(bPt1 && rXPoly.IsControl(nPt1)) - bPt1 = FALSE; // Keine Anzeige + bPt1 = sal_False; // Keine Anzeige if(bPt2 && rXPoly.IsControl(nPt2)) - bPt2 = FALSE; // von Bezierdaten + bPt2 = sal_False; // von Bezierdaten if(bPt1) { Point aPt(aNow); aPt -= rXPoly[nPt1]; - INT32 nLen(GetLen(aPt)); + sal_Int32 nLen(GetLen(aPt)); aStr.AppendAscii(" l="); - mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, TRUE); + mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, sal_True); aStr += aMetr; - INT32 nWink(GetAngle(aPt)); + sal_Int32 nWink(GetAngle(aPt)); aStr += sal_Unicode(' '); mrSdrPathObject.GetModel()->TakeWinkStr(nWink, aMetr); aStr += aMetr; @@ -1148,12 +1146,12 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag) Point aPt(aNow); aPt -= rXPoly[nPt2]; - INT32 nLen(GetLen(aPt)); + sal_Int32 nLen(GetLen(aPt)); aStr.AppendAscii("l="); - mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, TRUE); + mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, sal_True); aStr += aMetr; - INT32 nWink(GetAngle(aPt)); + sal_Int32 nWink(GetAngle(aPt)); aStr += sal_Unicode(' '); mrSdrPathObject.GetModel()->TakeWinkStr(nWink, aMetr); aStr += aMetr; @@ -1190,18 +1188,17 @@ basegfx::B2DPolyPolygon ImpPathForDragAndCreate::getSpecialDragPoly(const SdrDra } // Div. Daten lokal Kopieren fuer weniger Code und schnelleren Zugriff bool bClosed =mpSdrPathDragData->bClosed ; // geschlossenes Objekt? - USHORT nPntAnz =mpSdrPathDragData->nPntAnz ; // Punktanzahl - USHORT nPnt =mpSdrPathDragData->nPnt ; // Punktnummer innerhalb des Polygons + sal_uInt16 nPntAnz =mpSdrPathDragData->nPntAnz ; // Punktanzahl + sal_uInt16 nPnt =mpSdrPathDragData->nPnt ; // Punktnummer innerhalb des Polygons bool bBegPnt =mpSdrPathDragData->bBegPnt ; // Gedraggter Punkt ist der Anfangspunkt einer Polyline bool bEndPnt =mpSdrPathDragData->bEndPnt ; // Gedraggter Punkt ist der Endpunkt einer Polyline - USHORT nPrevPnt =mpSdrPathDragData->nPrevPnt ; // Index des vorherigen Punkts - USHORT nNextPnt =mpSdrPathDragData->nNextPnt ; // Index des naechsten Punkts + sal_uInt16 nPrevPnt =mpSdrPathDragData->nPrevPnt ; // Index des vorherigen Punkts + sal_uInt16 nNextPnt =mpSdrPathDragData->nNextPnt ; // Index des naechsten Punkts bool bPrevIsBegPnt =mpSdrPathDragData->bPrevIsBegPnt ; // Vorheriger Punkt ist Anfangspunkt einer Polyline bool bNextIsEndPnt =mpSdrPathDragData->bNextIsEndPnt ; // Folgepunkt ist Endpunkt einer Polyline - USHORT nPrevPrevPnt =mpSdrPathDragData->nPrevPrevPnt ; // Index des vorvorherigen Punkts - USHORT nNextNextPnt =mpSdrPathDragData->nNextNextPnt ; // Index des uebernaechsten Punkts + sal_uInt16 nPrevPrevPnt =mpSdrPathDragData->nPrevPrevPnt ; // Index des vorvorherigen Punkts + sal_uInt16 nNextNextPnt =mpSdrPathDragData->nNextNextPnt ; // Index des uebernaechsten Punkts bool bControl =mpSdrPathDragData->bControl ; // Punkt ist ein Kontrollpunkt - //bool bIsPrevControl=mpSdrPathDragData->bIsPrevControl; // Punkt ist Kontrollpunkt vor einem Stuetzpunkt bool bIsNextControl =mpSdrPathDragData->bIsNextControl; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt bool bPrevIsControl =mpSdrPathDragData->bPrevIsControl; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt bool bNextIsControl =mpSdrPathDragData->bNextIsControl; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt @@ -1265,7 +1262,7 @@ basegfx::B2DPolyPolygon ImpPathForDragAndCreate::getSpecialDragPoly(const SdrDra } if (bClosed) { // "Birnenproblem": 2 Linien, 1 Kurve, alles Smooth, Punkt zw. beiden Linien wird gedraggt if (aXPoly.GetPointCount()>nPntAnz && aXPoly.IsControl(1)) { - USHORT a=aXPoly.GetPointCount(); + sal_uInt16 a=aXPoly.GetPointCount(); aXPoly[a-2]=aXPoly[2]; aXPoly.SetFlags(a-2,aXPoly.GetFlags(2)); aXPoly[a-1]=aXPoly[3]; aXPoly.SetFlags(a-1,aXPoly.GetFlags(3)); aXPoly.Remove(0,3); @@ -1288,7 +1285,7 @@ bool ImpPathForDragAndCreate::BegCreate(SdrDragStat& rStat) rStat.SetNoSnap(bFreeHand); rStat.SetOrtho8Possible(); aPathPolygon.Clear(); - mbCreating=TRUE; + mbCreating=sal_True; bool bMakeStartPoint = true; SdrView* pView=rStat.GetView(); if (pView!=NULL && pView->IsUseIncompatiblePathCreateInterface() && @@ -1314,8 +1311,8 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat) XPolygon& rXPoly=aPathPolygon[aPathPolygon.Count()-1]; if (pView!=NULL && pView->IsCreateMode()) { // ggf. auf anderes CreateTool umschalten - UINT16 nIdent; - UINT32 nInvent; + sal_uInt16 nIdent; + sal_uInt32 nInvent; pView->TakeCurrentObj(nIdent,nInvent); if (nInvent==SdrInventor && pU->eAktKind!=(SdrObjKind)nIdent) { SdrObjKind eNewKind=(SdrObjKind)nIdent; @@ -1327,7 +1324,7 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat) case OBJ_FREELINE: case OBJ_FREEFILL: case OBJ_SPLNLINE: case OBJ_SPLNFILL: { pU->eAktKind=eNewKind; - pU->bMixedCreate=TRUE; + pU->bMixedCreate=sal_True; pU->nBezierStartPoint=rXPoly.GetPointCount(); if (pU->nBezierStartPoint>0) pU->nBezierStartPoint--; } break; @@ -1335,7 +1332,7 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat) } // switch } } - USHORT nActPoint=rXPoly.GetPointCount(); + sal_uInt16 nActPoint=rXPoly.GetPointCount(); if (aPathPolygon.Count()>1 && rStat.IsMouseDown() && nActPoint<2) { rXPoly[0]=rStat.GetPos0(); rXPoly[1]=rStat.GetNow(); @@ -1371,7 +1368,7 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat) Point aPt1(rStat.Now()); long dx=aPt0.X()-aPt1.X(); if (dx<0) dx=-dx; long dy=aPt0.Y()-aPt1.Y(); if (dy<0) dy=-dy; - if (dx<nMinDist && dy<nMinDist) return FALSE; + if (dx<nMinDist && dy<nMinDist) return sal_False; // folgendes ist aus EndCreate kopiert (nur kleine Modifikationen) // und sollte dann mal in eine Methode zusammengefasst werden: @@ -1421,7 +1418,7 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) SdrView* pView=rStat.GetView(); bool bIncomp=pView!=NULL && pView->IsUseIncompatiblePathCreateInterface(); XPolygon& rXPoly=aPathPolygon[aPathPolygon.Count()-1]; - USHORT nActPoint=rXPoly.GetPointCount()-1; + sal_uInt16 nActPoint=rXPoly.GetPointCount()-1; Point aAktMerk(rXPoly[nActPoint]); rXPoly[nActPoint]=rStat.Now(); if (!pU->bMixedCreate && pU->eStartKind==OBJ_LINE) { @@ -1439,7 +1436,7 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) if (rStat.GetPointAnz()>=2) eCmd=SDRCREATE_FORCEEND; bRet=eCmd==SDRCREATE_FORCEEND; if (bRet) { - mbCreating=FALSE; + mbCreating=sal_False; delete pU; rStat.SetUser(NULL); } @@ -1463,15 +1460,15 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) } else { if (nActPoint==1 && IsBezier(pU->eAktKind) && !pU->bBezHasCtrl0) { pU->aBezControl0=rStat.GetNow();; - pU->bBezHasCtrl0=TRUE; + pU->bBezHasCtrl0=sal_True; nActPoint--; } if (pU->IsFormFlag()) { - USHORT nPtAnz0=rXPoly.GetPointCount(); + sal_uInt16 nPtAnz0=rXPoly.GetPointCount(); rXPoly.Remove(nActPoint-1,2); // die letzten beiden Punkte entfernen und durch die Form ersetzen rXPoly.Insert(XPOLY_APPEND,pU->GetFormPoly()); - USHORT nPtAnz1=rXPoly.GetPointCount(); - for (USHORT i=nPtAnz0+1; i<nPtAnz1-1; i++) { // Damit BckAction richtig funktioniert + sal_uInt16 nPtAnz1=rXPoly.GetPointCount(); + for (sal_uInt16 i=nPtAnz0+1; i<nPtAnz1-1; i++) { // Damit BckAction richtig funktioniert if (!rXPoly.IsControl(i)) rStat.NextPoint(); } nActPoint=rXPoly.GetPointCount()-1; @@ -1482,7 +1479,7 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) } if (eCmd==SDRCREATE_NEXTOBJECT) { if (rXPoly.GetPointCount()>=2) { - pU->bBezHasCtrl0=FALSE; + pU->bBezHasCtrl0=sal_False; // nur einzelnes Polygon kann offen sein, deshalb schliessen rXPoly[nActPoint]=rXPoly[0]; XPolygon aXP; @@ -1492,12 +1489,12 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) } } - USHORT nPolyAnz=aPathPolygon.Count(); + sal_uInt16 nPolyAnz=aPathPolygon.Count(); if (nPolyAnz!=0) { // den letzten Punkt ggf. wieder loeschen if (eCmd==SDRCREATE_FORCEEND) { XPolygon& rXP=aPathPolygon[nPolyAnz-1]; - USHORT nPtAnz=rXP.GetPointCount(); + sal_uInt16 nPtAnz=rXP.GetPointCount(); if (nPtAnz>=2) { if (!rXP.IsControl(nPtAnz-2)) { if (rXP[nPtAnz-1]==rXP[nPtAnz-2]) { @@ -1510,10 +1507,10 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) } } } - for (USHORT nPolyNum=nPolyAnz; nPolyNum>0;) { + for (sal_uInt16 nPolyNum=nPolyAnz; nPolyNum>0;) { nPolyNum--; XPolygon& rXP=aPathPolygon[nPolyNum]; - USHORT nPtAnz=rXP.GetPointCount(); + sal_uInt16 nPtAnz=rXP.GetPointCount(); // Polygone mit zu wenig Punkten werden geloescht if (nPolyNum<nPolyAnz-1 || eCmd==SDRCREATE_FORCEEND) { if (nPtAnz<2) aPathPolygon.Remove(nPolyNum); @@ -1523,7 +1520,7 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) pU->ResetFormFlags(); bRet=eCmd==SDRCREATE_FORCEEND; if (bRet) { - mbCreating=FALSE; + mbCreating=sal_False; delete pU; rStat.SetUser(NULL); } @@ -1535,7 +1532,7 @@ bool ImpPathForDragAndCreate::BckCreate(SdrDragStat& rStat) ImpPathCreateUser* pU=(ImpPathCreateUser*)rStat.GetUser(); if (aPathPolygon.Count()>0) { XPolygon& rXPoly=aPathPolygon[aPathPolygon.Count()-1]; - USHORT nActPoint=rXPoly.GetPointCount(); + sal_uInt16 nActPoint=rXPoly.GetPointCount(); if (nActPoint>0) { nActPoint--; // Das letzte Stueck einer Bezierkurve wird erstmal zu 'ner Linie @@ -1559,7 +1556,7 @@ bool ImpPathForDragAndCreate::BckCreate(SdrDragStat& rStat) } if (aPathPolygon.Count()>0) { XPolygon& rLocalXPoly=aPathPolygon[aPathPolygon.Count()-1]; - USHORT nLocalActPoint=rLocalXPoly.GetPointCount(); + sal_uInt16 nLocalActPoint=rLocalXPoly.GetPointCount(); if (nLocalActPoint>0) { nLocalActPoint--; rLocalXPoly[nLocalActPoint]=rStat.Now(); @@ -1574,7 +1571,7 @@ void ImpPathForDragAndCreate::BrkCreate(SdrDragStat& rStat) { ImpPathCreateUser* pU=(ImpPathCreateUser*)rStat.GetUser(); aPathPolygon.Clear(); - mbCreating=FALSE; + mbCreating=sal_False; delete pU; rStat.SetUser(NULL); } @@ -1845,7 +1842,7 @@ void SdrPathObj::ImpSetClosed(sal_Bool bClose) default: break; } - bClosedObj = TRUE; + bClosedObj = sal_True; } else { @@ -1858,7 +1855,7 @@ void SdrPathObj::ImpSetClosed(sal_Bool bClose) default: break; } - bClosedObj = FALSE; + bClosedObj = sal_False; } ImpForceKind(); @@ -1866,20 +1863,20 @@ void SdrPathObj::ImpSetClosed(sal_Bool bClose) void SdrPathObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { - rInfo.bNoContortion=FALSE; + rInfo.bNoContortion=sal_False; bool bCanConv = !HasText() || ImpCanConvTextToCurve(); bool bIsPath = IsBezier() || IsSpline(); - rInfo.bEdgeRadiusAllowed = FALSE; + rInfo.bEdgeRadiusAllowed = sal_False; rInfo.bCanConvToPath = bCanConv && !bIsPath; rInfo.bCanConvToPoly = bCanConv && bIsPath; rInfo.bCanConvToContour = !IsFontwork() && (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary()); } -UINT16 SdrPathObj::GetObjIdentifier() const +sal_uInt16 SdrPathObj::GetObjIdentifier() const { - return USHORT(meKind); + return sal_uInt16(meKind); } void SdrPathObj::operator=(const SdrObject& rObj) @@ -2061,16 +2058,16 @@ void SdrPathObj::AddToHdlList(SdrHdlList& rHdlList) const { // keep old stuff to be able to keep old SdrHdl stuff, too const XPolyPolygon aOldPathPolygon(GetPathPoly()); - USHORT nPolyCnt=aOldPathPolygon.Count(); + sal_uInt16 nPolyCnt=aOldPathPolygon.Count(); bool bClosed=IsClosed(); - USHORT nIdx=0; + sal_uInt16 nIdx=0; - for (USHORT i=0; i<nPolyCnt; i++) { + for (sal_uInt16 i=0; i<nPolyCnt; i++) { const XPolygon& rXPoly=aOldPathPolygon.GetObject(i); - USHORT nPntCnt=rXPoly.GetPointCount(); + sal_uInt16 nPntCnt=rXPoly.GetPointCount(); if (bClosed && nPntCnt>1) nPntCnt--; - for (USHORT j=0; j<nPntCnt; j++) { + for (sal_uInt16 j=0; j<nPntCnt; j++) { if (rXPoly.GetFlags(j)!=XPOLY_CONTROL) { const Point& rPnt=rXPoly[j]; SdrHdl* pHdl=new SdrHdl(rPnt,HDL_POLY); @@ -2154,7 +2151,7 @@ SdrHdl* SdrPathObj::GetPlusHdl(const SdrHdl& rHdl, sal_uInt32 nPlusNum) const } pHdl->SetSourceHdlNum(rHdl.GetSourceHdlNum()); - pHdl->SetPlusHdl(TRUE); + pHdl->SetPlusHdl(sal_True); } } } @@ -2480,7 +2477,7 @@ Point SdrPathObj::GetSnapPoint(sal_uInt32 nSnapPnt) const sal_uInt32 nPoly,nPnt; if(!PolyPolygonEditor::GetRelativePolyPoint(GetPathPoly(), nSnapPnt, nPoly, nPnt)) { - DBG_ASSERT(FALSE,"SdrPathObj::GetSnapPoint: Punkt nSnapPnt nicht vorhanden!"); + DBG_ASSERT(sal_False,"SdrPathObj::GetSnapPoint: Punkt nSnapPnt nicht vorhanden!"); } const basegfx::B2DPoint aB2DPoint(GetPathPoly().getB2DPolygon(nPoly).getB2DPoint(nPnt)); @@ -2740,7 +2737,7 @@ SdrObject* SdrPathObj::RipPoint(sal_uInt32 nHdlNum, sal_uInt32& rNewPt0Index) return pNewObj; } -SdrObject* SdrPathObj::DoConvertToPolyObj(BOOL bBezier) const +SdrObject* SdrPathObj::DoConvertToPolyObj(sal_Bool bBezier) const { // #i89784# check for FontWork with activated HideContour const drawinglayer::attribute::SdrTextAttribute aText( diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx index a16d6782793c..7766e45df772 100644..100755 --- a/svx/source/svdraw/svdorect.cxx +++ b/svx/source/svdraw/svdorect.cxx @@ -46,8 +46,8 @@ #include <svx/svdview.hxx> // das #include <svx/svdundo.hxx> // Macro-Beispiel #include <svx/svdopath.hxx> -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" // Objektname #include <svx/xflclit.hxx> #include <svx/xlnclit.hxx> #include <svx/xlnwtit.hxx> @@ -80,14 +80,14 @@ TYPEINIT1(SdrRectObj,SdrTextObj); SdrRectObj::SdrRectObj() : mpXPoly(0L) { - bClosedObj=TRUE; + bClosedObj=sal_True; } SdrRectObj::SdrRectObj(const Rectangle& rRect) : SdrTextObj(rRect), mpXPoly(NULL) { - bClosedObj=TRUE; + bClosedObj=sal_True; } SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind) @@ -97,7 +97,7 @@ SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind) DBG_ASSERT(eTextKind==OBJ_TEXT || eTextKind==OBJ_TEXTEXT || eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT, "SdrRectObj::SdrRectObj(SdrObjKind) ist nur fuer Textrahmen gedacht"); - bClosedObj=TRUE; + bClosedObj=sal_True; } SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rRect) @@ -107,17 +107,17 @@ SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rRect) DBG_ASSERT(eTextKind==OBJ_TEXT || eTextKind==OBJ_TEXTEXT || eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT, "SdrRectObj::SdrRectObj(SdrObjKind,...) ist nur fuer Textrahmen gedacht"); - bClosedObj=TRUE; + bClosedObj=sal_True; } -SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, USHORT eFormat) +SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat) : SdrTextObj(eNewTextKind,rNewRect,rInput,rBaseURL,eFormat), mpXPoly(NULL) { DBG_ASSERT(eTextKind==OBJ_TEXT || eTextKind==OBJ_TEXTEXT || eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT, "SdrRectObj::SdrRectObj(SdrObjKind,...) ist nur fuer Textrahmen gedacht"); - bClosedObj=TRUE; + bClosedObj=sal_True; } SdrRectObj::~SdrRectObj() @@ -186,22 +186,22 @@ void SdrRectObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { bool bNoTextFrame=!IsTextFrame(); rInfo.bResizeFreeAllowed=bNoTextFrame || aGeo.nDrehWink%9000==0; - rInfo.bResizePropAllowed=TRUE; - rInfo.bRotateFreeAllowed=TRUE; - rInfo.bRotate90Allowed =TRUE; + rInfo.bResizePropAllowed=sal_True; + rInfo.bRotateFreeAllowed=sal_True; + rInfo.bRotate90Allowed =sal_True; rInfo.bMirrorFreeAllowed=bNoTextFrame; rInfo.bMirror45Allowed =bNoTextFrame; rInfo.bMirror90Allowed =bNoTextFrame; // allow transparence - rInfo.bTransparenceAllowed = TRUE; + rInfo.bTransparenceAllowed = sal_True; // gradient depends on fillstyle XFillStyle eFillStyle = ((XFillStyleItem&)(GetObjectItem(XATTR_FILLSTYLE))).GetValue(); rInfo.bGradientAllowed = (eFillStyle == XFILL_GRADIENT); rInfo.bShearAllowed =bNoTextFrame; - rInfo.bEdgeRadiusAllowed=TRUE; + rInfo.bEdgeRadiusAllowed=sal_True; bool bCanConv=!HasText() || ImpCanConvTextToCurve(); if (bCanConv && !bNoTextFrame && !HasText()) { @@ -212,10 +212,10 @@ void SdrRectObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary()); } -UINT16 SdrRectObj::GetObjIdentifier() const +sal_uInt16 SdrRectObj::GetObjIdentifier() const { - if (IsTextFrame()) return UINT16(eTextKind); - else return UINT16(OBJ_RECT); + if (IsTextFrame()) return sal_uInt16(eTextKind); + else return sal_uInt16(OBJ_RECT); } void SdrRectObj::TakeUnrotatedSnapRect(Rectangle& rRect) const @@ -244,7 +244,7 @@ void SdrRectObj::TakeObjNameSingul(XubString& rName) const } else { - USHORT nResId=STR_ObjNameSingulRECT; + sal_uInt16 nResId=STR_ObjNameSingulRECT; if (aGeo.nShearWink!=0) { nResId+=4; // Parallelogramm oder Raute // Raute ist nicht, weil Shear die vertikalen Kanten verlaengert! @@ -270,7 +270,7 @@ void SdrRectObj::TakeObjNamePlural(XubString& rName) const { if (IsTextFrame()) SdrTextObj::TakeObjNamePlural(rName); else { - USHORT nResId=STR_ObjNamePluralRECT; + sal_uInt16 nResId=STR_ObjNamePluralRECT; if (aGeo.nShearWink!=0) { nResId+=4; // Parallelogramm oder Raute } else { @@ -532,9 +532,9 @@ XubString SdrRectObj::GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const return SdrTextObj::GetMacroPopupComment(rRec); } -SdrGluePoint SdrRectObj::GetVertexGluePoint(USHORT nPosNum) const +SdrGluePoint SdrRectObj::GetVertexGluePoint(sal_uInt16 nPosNum) const { - INT32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue(); + sal_Int32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue(); // #i25616# if(!LineIsOutsideGeometry()) @@ -554,13 +554,13 @@ SdrGluePoint SdrRectObj::GetVertexGluePoint(USHORT nPosNum) const if (aGeo.nDrehWink!=0) RotatePoint(aPt,aRect.TopLeft(),aGeo.nSin,aGeo.nCos); aPt-=GetSnapRect().Center(); SdrGluePoint aGP(aPt); - aGP.SetPercent(FALSE); + aGP.SetPercent(sal_False); return aGP; } -SdrGluePoint SdrRectObj::GetCornerGluePoint(USHORT nPosNum) const +SdrGluePoint SdrRectObj::GetCornerGluePoint(sal_uInt16 nPosNum) const { - INT32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue(); + sal_Int32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue(); // #i25616# if(!LineIsOutsideGeometry()) @@ -580,11 +580,11 @@ SdrGluePoint SdrRectObj::GetCornerGluePoint(USHORT nPosNum) const if (aGeo.nDrehWink!=0) RotatePoint(aPt,aRect.TopLeft(),aGeo.nSin,aGeo.nCos); aPt-=GetSnapRect().Center(); SdrGluePoint aGP(aPt); - aGP.SetPercent(FALSE); + aGP.SetPercent(sal_False); return aGP; } -SdrObject* SdrRectObj::DoConvertToPolyObj(BOOL bBezier) const +SdrObject* SdrRectObj::DoConvertToPolyObj(sal_Bool bBezier) const { XPolygon aXP(ImpCalcXPoly(aRect,GetEckenradius())); { // #40608# Nur Uebergangsweise bis zum neuen TakeContour() diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 7203674f2778..0ea30bc54ad4 100644..100755 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -30,15 +30,15 @@ #include "precompiled_svx.hxx" #include <svx/svdotext.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdpagv.hxx> // fuer Abfrage im Paint, ob das #include <svx/svdview.hxx> // Objekt gerade editiert wird #include <svx/svdpage.hxx> // und fuer AnimationHandler (Laufschrift) #include <svx/svdetc.hxx> #include <svx/svdoutl.hxx> #include <svx/svdmodel.hxx> // OutlinerDefaults -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" // Objektname #include <editeng/writingmodeitem.hxx> #include <svx/sdtfchim.hxx> #include <svtools/colorcfg.hxx> @@ -117,15 +117,15 @@ SdrTextObj::SdrTextObj() pFormTextBoundRect(NULL), eTextKind(OBJ_TEXT) { - bTextSizeDirty=FALSE; - bTextFrame=FALSE; - bNoShear=FALSE; - bNoRotate=FALSE; - bNoMirror=FALSE; - bDisableAutoWidthOnDragging=FALSE; + bTextSizeDirty=sal_False; + bTextFrame=sal_False; + bNoShear=sal_False; + bNoRotate=sal_False; + bNoMirror=sal_False; + bDisableAutoWidthOnDragging=sal_False; // #101684# - mbInEditMode = FALSE; + mbInEditMode = sal_False; // #111096# mbTextHidden = sal_False; @@ -148,16 +148,16 @@ SdrTextObj::SdrTextObj(const Rectangle& rNewRect) pEdtOutl(NULL), pFormTextBoundRect(NULL) { - bTextSizeDirty=FALSE; - bTextFrame=FALSE; - bNoShear=FALSE; - bNoRotate=FALSE; - bNoMirror=FALSE; - bDisableAutoWidthOnDragging=FALSE; + bTextSizeDirty=sal_False; + bTextFrame=sal_False; + bNoShear=sal_False; + bNoRotate=sal_False; + bNoMirror=sal_False; + bDisableAutoWidthOnDragging=sal_False; ImpJustifyRect(aRect); // #101684# - mbInEditMode = FALSE; + mbInEditMode = sal_False; // #111096# mbTextHidden = sal_False; @@ -180,15 +180,15 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind) pFormTextBoundRect(NULL), eTextKind(eNewTextKind) { - bTextSizeDirty=FALSE; - bTextFrame=TRUE; - bNoShear=TRUE; - bNoRotate=FALSE; - bNoMirror=TRUE; - bDisableAutoWidthOnDragging=FALSE; + bTextSizeDirty=sal_False; + bTextFrame=sal_True; + bNoShear=sal_True; + bNoRotate=sal_False; + bNoMirror=sal_True; + bDisableAutoWidthOnDragging=sal_False; // #101684# - mbInEditMode = FALSE; + mbInEditMode = sal_False; // #111096# mbTextHidden = sal_False; @@ -212,16 +212,16 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect) pFormTextBoundRect(NULL), eTextKind(eNewTextKind) { - bTextSizeDirty=FALSE; - bTextFrame=TRUE; - bNoShear=TRUE; - bNoRotate=FALSE; - bNoMirror=TRUE; - bDisableAutoWidthOnDragging=FALSE; + bTextSizeDirty=sal_False; + bTextFrame=sal_True; + bNoShear=sal_True; + bNoRotate=sal_False; + bNoMirror=sal_True; + bDisableAutoWidthOnDragging=sal_False; ImpJustifyRect(aRect); // #101684# - mbInEditMode = FALSE; + mbInEditMode = sal_False; // #111096# mbTextHidden = sal_False; @@ -237,7 +237,7 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect) mbSupportTextIndentingOnLineWidthChange = sal_True; } -SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, USHORT eFormat) +SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat) : SdrAttrObj(), aRect(rNewRect), mpText(NULL), @@ -245,18 +245,18 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStr pFormTextBoundRect(NULL), eTextKind(eNewTextKind) { - bTextSizeDirty=FALSE; - bTextFrame=TRUE; - bNoShear=TRUE; - bNoRotate=FALSE; - bNoMirror=TRUE; - bDisableAutoWidthOnDragging=FALSE; + bTextSizeDirty=sal_False; + bTextFrame=sal_True; + bNoShear=sal_True; + bNoRotate=sal_False; + bNoMirror=sal_True; + bDisableAutoWidthOnDragging=sal_False; ImpJustifyRect(aRect); NbcSetText(rInput, rBaseURL, eFormat); // #101684# - mbInEditMode = FALSE; + mbInEditMode = sal_False; // #111096# mbTextHidden = sal_False; @@ -300,7 +300,7 @@ void SdrTextObj::FitFrameToTextSize() { SdrOutliner& rOutliner=ImpGetDrawOutliner(); rOutliner.SetPaperSize(Size(aRect.Right()-aRect.Left(),aRect.Bottom()-aRect.Top())); - rOutliner.SetUpdateMode(TRUE); + rOutliner.SetUpdateMode(sal_True); rOutliner.SetText(*pText->GetOutlinerParaObject()); Rectangle aTextRect; Size aNewSize(rOutliner.CalcTextSize()); @@ -322,7 +322,7 @@ void SdrTextObj::NbcSetText(const XubString& rStr) SdrOutliner& rOutliner=ImpGetDrawOutliner(); rOutliner.SetStyleSheet( 0, GetStyleSheet()); //OutputDevice* pRef1=rOutliner.GetRefDevice(); - rOutliner.SetUpdateMode(TRUE); + rOutliner.SetUpdateMode(sal_True); rOutliner.SetText(rStr,rOutliner.GetParagraph( 0 )); OutlinerParaObject* pNewText=rOutliner.CreateParaObject(); Size aSiz(rOutliner.CalcTextSize()); @@ -330,7 +330,7 @@ void SdrTextObj::NbcSetText(const XubString& rStr) rOutliner.Clear(); NbcSetOutlinerParaObject(pNewText); aTextSize=aSiz; - bTextSizeDirty=FALSE; + bTextSizeDirty=sal_False; } void SdrTextObj::SetText(const XubString& rStr) @@ -346,21 +346,21 @@ void SdrTextObj::SetText(const XubString& rStr) //} } -void SdrTextObj::NbcSetText(SvStream& rInput, const String& rBaseURL, USHORT eFormat) +void SdrTextObj::NbcSetText(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat) { SdrOutliner& rOutliner=ImpGetDrawOutliner(); rOutliner.SetStyleSheet( 0, GetStyleSheet()); rOutliner.Read(rInput,rBaseURL,eFormat); OutlinerParaObject* pNewText=rOutliner.CreateParaObject(); - rOutliner.SetUpdateMode(TRUE); + rOutliner.SetUpdateMode(sal_True); Size aSiz(rOutliner.CalcTextSize()); rOutliner.Clear(); NbcSetOutlinerParaObject(pNewText); aTextSize=aSiz; - bTextSizeDirty=FALSE; + bTextSizeDirty=sal_False; } -void SdrTextObj::SetText(SvStream& rInput, const String& rBaseURL, USHORT eFormat) +void SdrTextObj::SetText(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat) { Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); // #110094#-14 SendRepaintBroadcast(); @@ -380,13 +380,13 @@ const Size& SdrTextObj::GetTextSize() const { SdrOutliner& rOutliner=ImpGetDrawOutliner(); rOutliner.SetText(*pText->GetOutlinerParaObject()); - rOutliner.SetUpdateMode(TRUE); + rOutliner.SetUpdateMode(sal_True); aSiz=rOutliner.CalcTextSize(); rOutliner.Clear(); } // 2x casting auf nonconst ((SdrTextObj*)this)->aTextSize=aSiz; - ((SdrTextObj*)this)->bTextSizeDirty=FALSE; + ((SdrTextObj*)this)->bTextSizeDirty=sal_False; } return aTextSize; } @@ -394,10 +394,10 @@ const Size& SdrTextObj::GetTextSize() const bool SdrTextObj::IsAutoGrowHeight() const { if(!bTextFrame) - return FALSE; // AutoGrow nur bei TextFrames + return sal_False; // AutoGrow nur bei TextFrames const SfxItemSet& rSet = GetObjectItemSet(); - BOOL bRet = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue(); + sal_Bool bRet = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue(); if(bRet) { @@ -409,7 +409,7 @@ bool SdrTextObj::IsAutoGrowHeight() const if(eDirection == SDRTEXTANI_UP || eDirection == SDRTEXTANI_DOWN) { - bRet = FALSE; + bRet = sal_False; } } } @@ -419,13 +419,13 @@ bool SdrTextObj::IsAutoGrowHeight() const bool SdrTextObj::IsAutoGrowWidth() const { if(!bTextFrame) - return FALSE; // AutoGrow nur bei TextFrames + return sal_False; // AutoGrow nur bei TextFrames const SfxItemSet& rSet = GetObjectItemSet(); - BOOL bRet = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWWIDTH))).GetValue(); + sal_Bool bRet = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWWIDTH))).GetValue(); // #101684# - BOOL bInEditMOde = IsInEditMode(); + sal_Bool bInEditMOde = IsInEditMode(); if(!bInEditMOde && bRet) { @@ -437,7 +437,7 @@ bool SdrTextObj::IsAutoGrowWidth() const if(eDirection == SDRTEXTANI_LEFT || eDirection == SDRTEXTANI_RIGHT) { - bRet = FALSE; + bRet = sal_False; } } } @@ -457,7 +457,7 @@ SdrTextHorzAdjust SdrTextObj::GetTextHorizontalAdjust(const SfxItemSet& rSet) co SdrTextHorzAdjust eRet = ((SdrTextHorzAdjustItem&)(rSet.Get(SDRATTR_TEXT_HORZADJUST))).GetValue(); // #101684# - BOOL bInEditMode = IsInEditMode(); + sal_Bool bInEditMode = IsInEditMode(); if(!bInEditMode && eRet == SDRTEXTHORZADJUST_BLOCK) { @@ -489,7 +489,7 @@ SdrTextVertAdjust SdrTextObj::GetTextVerticalAdjust(const SfxItemSet& rSet) cons // #103516# Take care for vertical text animation here SdrTextVertAdjust eRet = ((SdrTextVertAdjustItem&)(rSet.Get(SDRATTR_TEXT_VERTADJUST))).GetValue(); - BOOL bInEditMode = IsInEditMode(); + sal_Bool bInEditMode = IsInEditMode(); // #103516# Take care for vertical text animation here if(!bInEditMode && eRet == SDRTEXTVERTADJUST_BLOCK) @@ -531,21 +531,21 @@ void SdrTextObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { bool bNoTextFrame=!IsTextFrame(); rInfo.bResizeFreeAllowed=bNoTextFrame || aGeo.nDrehWink%9000==0; - rInfo.bResizePropAllowed=TRUE; - rInfo.bRotateFreeAllowed=TRUE; - rInfo.bRotate90Allowed =TRUE; + rInfo.bResizePropAllowed=sal_True; + rInfo.bRotateFreeAllowed=sal_True; + rInfo.bRotate90Allowed =sal_True; rInfo.bMirrorFreeAllowed=bNoTextFrame; rInfo.bMirror45Allowed =bNoTextFrame; rInfo.bMirror90Allowed =bNoTextFrame; // allow transparence - rInfo.bTransparenceAllowed = TRUE; + rInfo.bTransparenceAllowed = sal_True; // gradient depends on fillstyle XFillStyle eFillStyle = ((XFillStyleItem&)(GetObjectItem(XATTR_FILLSTYLE))).GetValue(); rInfo.bGradientAllowed = (eFillStyle == XFILL_GRADIENT); rInfo.bShearAllowed =bNoTextFrame; - rInfo.bEdgeRadiusAllowed=TRUE; + rInfo.bEdgeRadiusAllowed=sal_True; bool bCanConv=ImpCanConvTextToCurve(); rInfo.bCanConvToPath =bCanConv; rInfo.bCanConvToPoly =bCanConv; @@ -554,9 +554,9 @@ void SdrTextObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary()); } -UINT16 SdrTextObj::GetObjIdentifier() const +sal_uInt16 SdrTextObj::GetObjIdentifier() const { - return USHORT(eTextKind); + return sal_uInt16(eTextKind); } bool SdrTextObj::HasTextImpl( SdrOutliner* pOutliner ) @@ -565,7 +565,7 @@ bool SdrTextObj::HasTextImpl( SdrOutliner* pOutliner ) if(pOutliner) { Paragraph* p1stPara=pOutliner->GetParagraph( 0 ); - ULONG nParaAnz=pOutliner->GetParagraphCount(); + sal_uIntPtr nParaAnz=pOutliner->GetParagraphCount(); if(p1stPara==NULL) nParaAnz=0; @@ -664,8 +664,8 @@ bool SdrTextObj::NbcSetMinTextFrameHeight(long nHgt) // bDisableAutoHeightOnDragging if vertical. if(IsVerticalWriting() && bDisableAutoWidthOnDragging) { - bDisableAutoWidthOnDragging = FALSE; - SetObjectItem(SdrTextAutoGrowHeightItem(FALSE)); + bDisableAutoWidthOnDragging = sal_False; + SetObjectItem(SdrTextAutoGrowHeightItem(sal_False)); } return true; @@ -703,8 +703,8 @@ bool SdrTextObj::NbcSetMinTextFrameWidth(long nWdt) // when not vertical. if(!IsVerticalWriting() && bDisableAutoWidthOnDragging) { - bDisableAutoWidthOnDragging = FALSE; - SetObjectItem(SdrTextAutoGrowWidthItem(FALSE)); + bDisableAutoWidthOnDragging = sal_False; + SetObjectItem(SdrTextAutoGrowWidthItem(sal_False)); } return true; @@ -732,7 +732,7 @@ bool SdrTextObj::NbcSetFitToSize(SdrFitToSizeType eFit) return false; } -void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, BOOL bLineWidth ) const +void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, sal_Bool bLineWidth ) const { basegfx::B2DPolyPolygon aXorPolyPolygon(TakeXorPoly()); basegfx::B2DPolyPolygon* pContourPolyPolygon = 0L; @@ -767,7 +767,7 @@ void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAncho { // #86258# force shadow off SdrObject* pCopy = Clone(); - pCopy->SetMergedItem(SdrShadowItem(FALSE)); + pCopy->SetMergedItem(SdrShadowItem(sal_False)); *pContourPolyPolygon = pCopy->TakeContour(); SdrObject::Free( pCopy ); } @@ -831,7 +831,7 @@ void SdrTextObj::TakeTextAnchorRect(Rectangle& rAnchorRect) const } void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, - Rectangle* pAnchorRect, BOOL bLineWidth ) const + Rectangle* pAnchorRect, sal_Bool bLineWidth ) const { Rectangle aAnkRect; // Rect innerhalb dem geankert wird TakeTextAnchorRect(aAnkRect); @@ -844,7 +844,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo bool bContourFrame=IsContourTextFrame(); bool bFrame=IsTextFrame(); - ULONG nStat0=rOutliner.GetControlWord(); + sal_uIntPtr nStat0=rOutliner.GetControlWord(); Size aNullSize; if (!bContourFrame) { @@ -863,7 +863,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo long nHgt=nAnkHgt; // #101684# - BOOL bInEditMode = IsInEditMode(); + sal_Bool bInEditMode = IsInEditMode(); if (!bInEditMode && (eAniKind==SDRTEXTANI_SCROLL || eAniKind==SDRTEXTANI_ALTERNATE || eAniKind==SDRTEXTANI_SLIDE)) { @@ -898,7 +898,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo if (pPara) { - BOOL bHitTest = FALSE; + sal_Bool bHitTest = sal_False; if( pModel ) bHitTest = &pModel->GetHitTestOutliner() == &rOutliner; @@ -912,7 +912,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo rOutliner.SetFixedCellHeight(((const SdrTextFixedCellHeightItem&)GetMergedItem(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue()); } - rOutliner.SetUpdateMode(TRUE); + rOutliner.SetUpdateMode(sal_True); rOutliner.SetText(*pPara); } } @@ -924,7 +924,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo if (pEdtOutl && !bNoEditText && pPara) delete pPara; - rOutliner.SetUpdateMode(TRUE); + rOutliner.SetUpdateMode(sal_True); rOutliner.SetControlWord(nStat0); if( pText ) @@ -1004,7 +1004,7 @@ OutlinerParaObject* SdrTextObj::GetEditOutlinerParaObject() const void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextSize, const Size& rShapeSize, Fraction& rFitXKorreg) const { OutputDevice* pOut = rOutliner.GetRefDevice(); - BOOL bNoStretching(FALSE); + sal_Bool bNoStretching(sal_False); if(pOut && pOut->GetOutDevType() == OUTDEV_PRINTER) { @@ -1016,7 +1016,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS pMtf = NULL; if(pMtf) - pMtf->Pause(TRUE); + pMtf->Pause(sal_True); Font aFontMerk(pOut->GetFont()); Font aTmpFont( OutputDevice::GetDefaultFont( DEFAULTFONT_SERIF, LANGUAGE_SYSTEM, DEFAULTFONT_FLAGS_ONLYONE ) ); @@ -1030,7 +1030,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS pOut->SetFont(aFontMerk); if(pMtf) - pMtf->Pause(FALSE); + pMtf->Pause(sal_False); bNoStretching = (aSize1 == aSize2); @@ -1039,7 +1039,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS // Und das finden wir nicht so schoen. if(aSize2.Height() >= aSize1.Height() * 2) { - bNoStretching = TRUE; + bNoStretching = sal_True; } #endif } @@ -1062,7 +1062,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS long nY=(nWantHgt*100) /nIsHgt; // Y-Stretching berechnen bool bChkX = true; if (bNoStretching) { // #35762# evtl. nur proportional moeglich - if (nX>nY) { nX=nY; bChkX=FALSE; } + if (nX>nY) { nX=nY; bChkX=sal_False; } else { nY=nX; } } @@ -1089,7 +1089,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS bNoMoreLoop = true; } - rOutliner.SetGlobalCharStretching((USHORT)nX,(USHORT)nY); + rOutliner.SetGlobalCharStretching((sal_uInt16)nX,(sal_uInt16)nY); nLoopCount++; Size aSiz(rOutliner.CalcTextSize()); long nXDiff=aSiz.Width()-nWantWdt; @@ -1276,7 +1276,7 @@ basegfx::B2DPolyPolygon SdrTextObj::TakeContour() const Rectangle aAnchor2; Rectangle aR; - TakeTextRect(rOutliner,aR,FALSE,&aAnchor2); + TakeTextRect(rOutliner,aR,sal_False,&aAnchor2); rOutliner.Clear(); bool bFitToSize(IsFitToSize()); if (bFitToSize) aR=aAnchor2; @@ -1323,7 +1323,7 @@ Point SdrTextObj::GetSnapPoint(sal_uInt32 i) const void SdrTextObj::ImpCheckMasterCachable() { - bNotMasterCachable=FALSE; + bNotMasterCachable=sal_False; OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject(); @@ -1349,14 +1349,14 @@ void SdrTextObj::ImpCheckMasterCachable() // #101029#: Extracted from ImpGetDrawOutliner() void SdrTextObj::ImpInitDrawOutliner( SdrOutliner& rOutl ) const { - rOutl.SetUpdateMode(FALSE); - USHORT nOutlinerMode = OUTLINERMODE_OUTLINEOBJECT; + rOutl.SetUpdateMode(sal_False); + sal_uInt16 nOutlinerMode = OUTLINERMODE_OUTLINEOBJECT; if ( !IsOutlText() ) nOutlinerMode = OUTLINERMODE_TEXTOBJECT; rOutl.Init( nOutlinerMode ); rOutl.SetGlobalCharStretching(100,100); - ULONG nStat=rOutl.GetControlWord(); + sal_uIntPtr nStat=rOutl.GetControlWord(); nStat&=~(EE_CNTRL_STRETCHING|EE_CNTRL_AUTOPAGESIZE); rOutl.SetControlWord(nStat); Size aNullSize; @@ -1397,13 +1397,13 @@ void SdrTextObj::ImpSetupDrawOutlinerForPaint( bool bContourFrame, // FitToSize erstmal nicht mit ContourFrame if (IsFitToSize() || IsAutoFit()) { - ULONG nStat=rOutliner.GetControlWord(); + sal_uIntPtr nStat=rOutliner.GetControlWord(); nStat|=EE_CNTRL_STRETCHING|EE_CNTRL_AUTOPAGESIZE; rOutliner.SetControlWord(nStat); } } rOutliner.SetFixedCellHeight(((const SdrTextFixedCellHeightItem&)GetMergedItem(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue()); - TakeTextRect(rOutliner, rTextRect, FALSE, &rAnchorRect); + TakeTextRect(rOutliner, rTextRect, sal_False, &rAnchorRect); rPaintRect = rTextRect; if (!bContourFrame) @@ -1492,8 +1492,6 @@ void SdrTextObj::UpdateOutlinerFormatting( SdrOutliner& rOutl, Rectangle& rPaint bool bContourFrame=IsContourTextFrame(); - ImpSetupDrawOutlinerForPaint( bContourFrame, rOutl, aTextRect, aAnchorRect, rPaintRect, aFitXKorreg ); - if( GetModel() ) { MapMode aMapMode(GetModel()->GetScaleUnit(), Point(0,0), @@ -1501,6 +1499,8 @@ void SdrTextObj::UpdateOutlinerFormatting( SdrOutliner& rOutl, Rectangle& rPaint GetModel()->GetScaleFraction()); rOutl.SetRefMapMode(aMapMode); } + + ImpSetupDrawOutlinerForPaint( bContourFrame, rOutl, aTextRect, aAnchorRect, rPaintRect, aFitXKorreg ); } //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -1640,7 +1640,7 @@ void SdrTextObj::ForceOutlinerParaObject() SdrText* pText = getActiveText(); if( pText && (pText->GetOutlinerParaObject() == 0) ) { - USHORT nOutlMode = OUTLINERMODE_TEXTOBJECT; + sal_uInt16 nOutlMode = OUTLINERMODE_TEXTOBJECT; if( IsTextFrame() && eTextKind == OBJ_OUTLINETEXT ) nOutlMode = OUTLINERMODE_OUTLINEOBJECT; @@ -1872,7 +1872,7 @@ void SdrTextObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const b GeoStat aGeoStat; aGeoStat.nShearWink = FRound((atan(fShearX) / F_PI180) * 100.0); aGeoStat.RecalcTan(); - Shear(Point(), aGeoStat.nShearWink, aGeoStat.nTan, FALSE); + Shear(Point(), aGeoStat.nShearWink, aGeoStat.nTan, sal_False); } // rotation? @@ -2151,20 +2151,20 @@ void SdrTextObj::SetObjectItemNoBroadcast(const SfxPoolItem& rItem) // Konzept des TextObjekts: // ~~~~~~~~~~~~~~~~~~~~~~~~ // Attribute/Varianten: -// - BOOL Textrahmen / beschriftetes Zeichenobjekt -// - BOOL FontWork (wenn nicht Textrahmen und nicht ContourTextFrame) -// - BOOL ContourTextFrame (wenn nicht Textrahmen und nicht Fontwork) +// - sal_Bool Textrahmen / beschriftetes Zeichenobjekt +// - sal_Bool FontWork (wenn nicht Textrahmen und nicht ContourTextFrame) +// - sal_Bool ContourTextFrame (wenn nicht Textrahmen und nicht Fontwork) // - long Drehwinkel (wenn nicht FontWork) // - long Textrahmenabstaende (wenn nicht FontWork) -// - BOOL FitToSize (wenn nicht FontWork) -// - BOOL AutoGrowingWidth/Height (wenn nicht FitToSize und nicht FontWork) +// - sal_Bool FitToSize (wenn nicht FontWork) +// - sal_Bool AutoGrowingWidth/Height (wenn nicht FitToSize und nicht FontWork) // - long Min/MaxFrameWidth/Height (wenn AutoGrowingWidth/Height) // - enum Horizontale Textverankerung Links,Mitte,Rechts,Block,Stretch(ni) // - enum Vertikale Textverankerung Oben,Mitte,Unten,Block,Stretch(ni) // - enum Laufschrift (wenn nicht FontWork) // -// Jedes abgeleitete Objekt ist entweder ein Textrahmen (bTextFrame=TRUE) -// oder ein beschriftetes Zeichenobjekt (bTextFrame=FALSE). +// Jedes abgeleitete Objekt ist entweder ein Textrahmen (bTextFrame=sal_True) +// oder ein beschriftetes Zeichenobjekt (bTextFrame=sal_False). // // Defaultverankerung von Textrahmen: // SDRTEXTHORZADJUST_BLOCK, SDRTEXTVERTADJUST_TOP @@ -2192,8 +2192,8 @@ void SdrTextObj::SetObjectItemNoBroadcast(const SfxPoolItem& rItem) // ContourTextFrame: // - long Drehwinkel // - long Textrahmenabstaende spaeter vielleicht -// - BOOL FitToSize spaeter vielleicht -// - BOOL AutoGrowingWidth/Height viel spaeter vielleicht +// - sal_Bool FitToSize spaeter vielleicht +// - sal_Bool AutoGrowingWidth/Height viel spaeter vielleicht // - long Min/MaxFrameWidth/Height viel spaeter vielleicht // - enum Horizontale Textverankerung spaeter vielleicht, erstmal Links, Absatz zentr. // - enum Vertikale Textverankerung spaeter vielleicht, erstmal oben diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index edb8efa970ef..8344db8522aa 100644..100755 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -54,7 +54,7 @@ #include <drawinglayer/primitive2d/wrongspellprimitive2d.hxx> #include <drawinglayer/primitive2d/graphicprimitive2d.hxx> #include <drawinglayer/primitive2d/textlayoutdevice.hxx> -#include <unoapi.hxx> +#include <svx/unoapi.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> #include <editeng/outlobj.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index d02123212ea7..4e4a6b6a54a1 100644..100755 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -65,7 +65,7 @@ #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> #include <editeng/editstat.hxx> -#include <unoapi.hxx> +#include <svx/unoapi.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> #include <svx/sdr/attribute/sdrformtextoutlineattribute.hxx> @@ -569,7 +569,7 @@ namespace } } - // consume from portion // no += here, xub_StrLen is USHORT and the compiler will gererate a warning here + // consume from portion // no += here, xub_StrLen is sal_uInt16 and the compiler will gererate a warning here nUsedTextLength = nUsedTextLength + nNextGlyphLen; // consume from polygon diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx index 18122aa57547..64c15c1e6908 100644..100755 --- a/svx/source/svdraw/svdotxat.cxx +++ b/svx/source/svdraw/svdotxat.cxx @@ -31,7 +31,7 @@ #include <svl/style.hxx> #include <svx/svdotext.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdmodel.hxx> // fuer GetMaxObjSize und GetStyleSheetPool #include <svx/svdoutl.hxx> #include <svx/svdorect.hxx> // fuer SetDirty bei NbcAdjustTextFrameWidthAndHeight @@ -122,7 +122,7 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt, bool bW if (aSiz.Height()<2) aSiz.Height()=2; // Mindestgroesse 2 // #101684# - BOOL bInEditMode = IsInEditMode(); + sal_Bool bInEditMode = IsInEditMode(); if(!bInEditMode) { @@ -143,7 +143,7 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt, bool bW } else { Outliner& rOutliner=ImpGetDrawOutliner(); rOutliner.SetPaperSize(aSiz); - rOutliner.SetUpdateMode(TRUE); + rOutliner.SetUpdateMode(sal_True); // !!! hier sollte ich wohl auch noch mal die Optimierung mit // bPortionInfoChecked usw einbauen OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject(); @@ -172,8 +172,8 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt, bool bW if (nHgt<1) nHgt=1; // nVDist kann auch negativ sein long nWdtGrow=nWdt-(rR.Right()-rR.Left()); long nHgtGrow=nHgt-(rR.Bottom()-rR.Top()); - if (nWdtGrow==0) bWdtGrow=FALSE; - if (nHgtGrow==0) bHgtGrow=FALSE; + if (nWdtGrow==0) bWdtGrow=sal_False; + if (nHgtGrow==0) bHgtGrow=sal_False; if (bWdtGrow || bHgtGrow) { if (bWdtGrow) { SdrTextHorzAdjust eHAdj=GetTextHorizontalAdjust(); @@ -203,11 +203,11 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt, bool bW aD2-=aD1; rR.Move(aD2.X(),aD2.Y()); } - return TRUE; + return sal_True; } } } - return FALSE; + return sal_False; } bool SdrTextObj::NbcAdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt) @@ -262,22 +262,22 @@ void SdrTextObj::ImpSetTextStyleSheetListeners() const EditTextObject& rTextObj=pOutlinerParaObject->GetTextObject(); XubString aStyleName; SfxStyleFamily eStyleFam; - USHORT nParaAnz=rTextObj.GetParagraphCount(); + sal_uInt16 nParaAnz=rTextObj.GetParagraphCount(); - for(UINT16 nParaNum(0); nParaNum < nParaAnz; nParaNum++) + for(sal_uInt16 nParaNum(0); nParaNum < nParaAnz; nParaNum++) { rTextObj.GetStyleSheet(nParaNum, aStyleName, eStyleFam); if(aStyleName.Len()) { - XubString aFam = UniString::CreateFromInt32((UINT16)eStyleFam); + XubString aFam = UniString::CreateFromInt32((sal_uInt16)eStyleFam); aFam.Expand(5); aStyleName += sal_Unicode('|'); aStyleName += aFam; - BOOL bFnd(FALSE); - UINT32 nNum(aStyles.Count()); + sal_Bool bFnd(sal_False); + sal_uInt32 nNum(aStyles.Count()); while(!bFnd && nNum > 0) { @@ -295,7 +295,7 @@ void SdrTextObj::ImpSetTextStyleSheetListeners() } // nun die Strings im Container durch StyleSheet* ersetzten - ULONG nNum=aStyles.Count(); + sal_uIntPtr nNum=aStyles.Count(); while (nNum>0) { nNum--; XubString* pName=(XubString*)aStyles.GetObject(nNum); @@ -306,8 +306,8 @@ void SdrTextObj::ImpSetTextStyleSheetListeners() aFam.Erase(0,1); aFam.EraseTrailingChars(); - // UNICODE: USHORT nFam=USHORT(aFam); - UINT16 nFam = (UINT16)aFam.ToInt32(); + // UNICODE: sal_uInt16 nFam=sal_uInt16(aFam); + sal_uInt16 nFam = (sal_uInt16)aFam.ToInt32(); SfxStyleFamily eFam=(SfxStyleFamily)nFam; SfxStyleSheetBase* pStyleBase=pStylePool->Find(*pName,eFam); @@ -323,7 +323,7 @@ void SdrTextObj::ImpSetTextStyleSheetListeners() nNum=GetBroadcasterCount(); while (nNum>0) { nNum--; - SfxBroadcaster* pBroadcast=GetBroadcasterJOE((USHORT)nNum); + SfxBroadcaster* pBroadcast=GetBroadcasterJOE((sal_uInt16)nNum); SfxStyleSheet* pStyle=PTR_CAST(SfxStyleSheet,pBroadcast); if (pStyle!=NULL && pStyle!=GetStyleSheet()) { // Sonderbehandlung fuer den StyleSheet des Objekts if (aStyles.GetPos(pStyle)==CONTAINER_ENTRY_NOTFOUND) { @@ -337,7 +337,7 @@ void SdrTextObj::ImpSetTextStyleSheetListeners() nNum--; SfxStyleSheet* pStyle=(SfxStyleSheet*)aStyles.GetObject(nNum); // StartListening soll selbst nachsehen, ob hier nicht evtl. schon gehorcht wird - StartListening(*pStyle,TRUE); + StartListening(*pStyle,sal_True); } } } @@ -383,13 +383,13 @@ void SdrTextObj::NbcResizeTextAttributes(const Fraction& xFact, const Fraction& if (nAbsHgt>0xFFFF) nAbsHgt=0xFFFF; // und nun attributieren - SetObjectItem(SvxCharScaleWidthItem( (USHORT) nRelWdt, EE_CHAR_FONTWIDTH)); - SetObjectItem(SvxFontHeightItem(nAbsHgt,(USHORT)nRelHgt, EE_CHAR_FONTHEIGHT)); + SetObjectItem(SvxCharScaleWidthItem( (sal_uInt16) nRelWdt, EE_CHAR_FONTWIDTH)); + SetObjectItem(SvxFontHeightItem(nAbsHgt,(sal_uInt16)nRelHgt, EE_CHAR_FONTHEIGHT)); // Zeichen- und Absatzattribute innerhalb des OutlinerParaObjects Outliner& rOutliner=ImpGetDrawOutliner(); rOutliner.SetPaperSize(Size(LONG_MAX,LONG_MAX)); rOutliner.SetText(*pOutlinerParaObject); - rOutliner.DoStretchChars((USHORT)nX,(USHORT)nY); + rOutliner.DoStretchChars((sal_uInt16)nX,(sal_uInt16)nY); OutlinerParaObject* pNewPara=rOutliner.CreateParaObject(); NbcSetOutlinerParaObject(pNewPara); rOutliner.Clear(); @@ -452,7 +452,7 @@ bool SdrTextObj::HasText() const if( pOPO ) { const EditTextObject& rETO = pOPO->GetTextObject(); - USHORT nParaCount = rETO.GetParagraphCount(); + sal_uInt16 nParaCount = rETO.GetParagraphCount(); if( nParaCount > 0 ) bHasText = (nParaCount > 1) || (rETO.GetText( 0 ).Len() != 0); diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx index 3d69ce2627f3..97ce80a3309d 100644..100755 --- a/svx/source/svdraw/svdotxdr.cxx +++ b/svx/source/svdraw/svdotxdr.cxx @@ -34,8 +34,8 @@ #include <svx/svddrag.hxx> #include <svx/svdview.hxx> #include <svx/svdorect.hxx> // fuer SetXPolyDirty in MovCreate bei SolidDragging -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" // Objektname #include <svx/svdoashp.hxx> #include <tools/bigint.hxx> #include <basegfx/polygon/b2dpolygon.hxx> @@ -223,7 +223,7 @@ bool SdrTextObj::MovCreate(SdrDragStat& rStat) rStat.SetActionRect(aRect1); aRect=aRect1; // fuer ObjName SetBoundRectDirty(); - bSnapRectDirty=TRUE; + bSnapRectDirty=sal_True; if (HAS_BASE(SdrRectObj,this)) { ((SdrRectObj*)this)->SetXPolyDirty(); } diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx index f1e43c61d5d7..a7ddf9573af7 100644..100755 --- a/svx/source/svdraw/svdotxed.cxx +++ b/svx/source/svdraw/svdotxed.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" #include <svx/svdotext.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdmodel.hxx> // fuer GetMaxObjSize #include <svx/svdoutl.hxx> #include <editeng/outliner.hxx> @@ -66,9 +66,9 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl) pEdtOutl=&rOutl; // #101684# - mbInEditMode = TRUE; + mbInEditMode = sal_True; - USHORT nOutlinerMode = OUTLINERMODE_OUTLINEOBJECT; + sal_uInt16 nOutlinerMode = OUTLINERMODE_OUTLINEOBJECT; if ( !IsOutlText() ) nOutlinerMode = OUTLINERMODE_TEXTOBJECT; rOutl.Init( nOutlinerMode ); @@ -79,7 +79,7 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl) ImpSetTextEditParams(); if (!bContourFrame) { - ULONG nStat=rOutl.GetControlWord(); + sal_uIntPtr nStat=rOutl.GetControlWord(); nStat|=EE_CNTRL_AUTOPAGESIZE; if (bFitToSize || IsAutoFit()) nStat|=EE_CNTRL_STRETCHING; @@ -119,8 +119,8 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl) { Rectangle aAnchorRect; Rectangle aTextRect; - TakeTextRect(rOutl, aTextRect, FALSE, - &aAnchorRect/* #97097# give TRUE here, not FALSE */); + TakeTextRect(rOutl, aTextRect, sal_False, + &aAnchorRect/* #97097# give sal_True here, not sal_False */); Fraction aFitXKorreg(1,1); ImpSetCharStretching(rOutl,aTextRect.GetSize(),aAnchorRect.GetSize(),aFitXKorreg); } @@ -134,7 +134,7 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl) // #78476# also repaint when animated text is put to edit mode // to not make appear the text double // #111096# should now repaint automatically. - // BOOL bIsAnimated(pPlusData && pPlusData->pAnimator); + // sal_Bool bIsAnimated(pPlusData && pPlusData->pAnimator); if(aGeo.nDrehWink || IsFontwork() /*|| bIsAnimated*/) { @@ -196,7 +196,7 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* p SdrTextAniDirection eAniDirection=GetTextAniDirection(); // #101684# - BOOL bInEditMode = IsInEditMode(); + sal_Bool bInEditMode = IsInEditMode(); if (!bInEditMode && (eAniKind==SDRTEXTANI_SCROLL || eAniKind==SDRTEXTANI_ALTERNATE || eAniKind==SDRTEXTANI_SLIDE)) { @@ -280,26 +280,26 @@ void SdrTextObj::EndTextEdit(SdrOutliner& rOutl) // need to end edit mode early since SetOutlinerParaObject already // uses GetCurrentBoundRect() which needs to take the text into account // to work correct - mbInEditMode = FALSE; + mbInEditMode = sal_False; SetOutlinerParaObject(pNewText); } pEdtOutl = NULL; rOutl.Clear(); - UINT32 nStat = rOutl.GetControlWord(); + sal_uInt32 nStat = rOutl.GetControlWord(); nStat &= ~EE_CNTRL_AUTOPAGESIZE; rOutl.SetControlWord(nStat); // #101684# - mbInEditMode = FALSE; + mbInEditMode = sal_False; } -USHORT SdrTextObj::GetOutlinerViewAnchorMode() const +sal_uInt16 SdrTextObj::GetOutlinerViewAnchorMode() const { SdrTextHorzAdjust eH=GetTextHorizontalAdjust(); SdrTextVertAdjust eV=GetTextVerticalAdjust(); EVAnchorMode eRet=ANCHOR_TOP_LEFT; - if (IsContourTextFrame()) return (USHORT)eRet; + if (IsContourTextFrame()) return (sal_uInt16)eRet; if (eH==SDRTEXTHORZADJUST_LEFT) { if (eV==SDRTEXTVERTADJUST_TOP) { eRet=ANCHOR_TOP_LEFT; @@ -325,14 +325,14 @@ USHORT SdrTextObj::GetOutlinerViewAnchorMode() const eRet=ANCHOR_VCENTER_HCENTER; } } - return (USHORT)eRet; + return (sal_uInt16)eRet; } void SdrTextObj::ImpSetTextEditParams() const { if (pEdtOutl!=NULL) { bool bUpdMerk=pEdtOutl->GetUpdateMode(); - if (bUpdMerk) pEdtOutl->SetUpdateMode(FALSE); + if (bUpdMerk) pEdtOutl->SetUpdateMode(sal_False); Size aPaperMin; Size aPaperMax; Rectangle aEditArea; @@ -341,16 +341,16 @@ void SdrTextObj::ImpSetTextEditParams() const //bool bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES); bool bContourFrame=IsContourTextFrame(); //EVAnchorMode eAM=(EVAnchorMode)GetOutlinerViewAnchorMode(); - //ULONG nViewAnz=pEdtOutl->GetViewCount(); + //sal_uIntPtr nViewAnz=pEdtOutl->GetViewCount(); pEdtOutl->SetMinAutoPaperSize(aPaperMin); pEdtOutl->SetMaxAutoPaperSize(aPaperMax); pEdtOutl->SetPaperSize(Size()); if (bContourFrame) { Rectangle aAnchorRect; TakeTextAnchorRect(aAnchorRect); - ImpSetContourPolygon(*pEdtOutl,aAnchorRect, TRUE); + ImpSetContourPolygon(*pEdtOutl,aAnchorRect, sal_True); } - if (bUpdMerk) pEdtOutl->SetUpdateMode(TRUE); + if (bUpdMerk) pEdtOutl->SetUpdateMode(sal_True); } } diff --git a/svx/source/svdraw/svdotxfl.cxx b/svx/source/svdraw/svdotxfl.cxx index c8a29df98668..4053313d75c0 100644..100755 --- a/svx/source/svdraw/svdotxfl.cxx +++ b/svx/source/svdraw/svdotxfl.cxx @@ -34,7 +34,7 @@ #include <svx/svdotext.hxx> #include <svx/svdfield.hxx> -static BOOL bInit = FALSE; +static sal_Bool bInit = sal_False; // Do not remove this, it is still used in src536a! void SdrRegisterFieldClasses() @@ -45,16 +45,16 @@ void SdrRegisterFieldClasses() SvxFieldItem::GetClassManager().SV_CLASS_REGISTER(SvxHeaderField); SvxFieldItem::GetClassManager().SV_CLASS_REGISTER(SvxFooterField); SvxFieldItem::GetClassManager().SV_CLASS_REGISTER(SvxDateTimeField); - bInit = TRUE; + bInit = sal_True; } } ///////////////////////////////////////////////////////////////////////////////////////////////// */ -bool SdrTextObj::CalcFieldValue(const SvxFieldItem& /*rField*/, USHORT /*nPara*/, USHORT /*nPos*/, +bool SdrTextObj::CalcFieldValue(const SvxFieldItem& /*rField*/, sal_uInt16 /*nPara*/, sal_uInt16 /*nPos*/, bool /*bEdit*/, Color*& /*rpTxtColor*/, Color*& /*rpFldColor*/, XubString& /*rRet*/) const { - return FALSE; + return sal_False; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index 6382ee5ca35a..ac9476f8f428 100644..100755 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -35,7 +35,7 @@ #include <ucbhelper/contentbroker.hxx> #include <unotools/datetime.hxx> #include <svx/svdotext.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdmodel.hxx> #include <editeng/editdata.hxx> #include <sfx2/lnkbase.hxx> @@ -79,7 +79,7 @@ public: virtual void DataChanged( const String& rMimeType, const ::com::sun::star::uno::Any & rValue ); - BOOL Connect() { return 0 != SvBaseLink::GetRealObject(); } + sal_Bool Connect() { return 0 != SvBaseLink::GetRealObject(); } }; ImpSdrObjTextLink::~ImpSdrObjTextLink() @@ -199,8 +199,8 @@ void SdrTextObj::SetTextLink(const String& rFileName, const String& rFilterName, void SdrTextObj::ReleaseTextLink() { ImpLinkAbmeldung(); - USHORT nAnz=GetUserDataCount(); - for (USHORT nNum=nAnz; nNum>0;) { + sal_uInt16 nAnz=GetUserDataCount(); + for (sal_uInt16 nNum=nAnz; nNum>0;) { nNum--; SdrObjUserData* pData=GetUserData(nNum); if (pData->GetInventor()==SdrInventor && pData->GetId()==SDRUSERDATA_OBJTEXTLINK) { @@ -218,11 +218,11 @@ bool SdrTextObj::ReloadLinkedText( bool bForceLoad) { ::ucbhelper::ContentBroker* pBroker = ::ucbhelper::ContentBroker::get(); DateTime aFileDT; - BOOL bExists = FALSE, bLoad = FALSE; + sal_Bool bExists = sal_False, bLoad = sal_False; if( pBroker ) { - bExists = TRUE; + bExists = sal_True; try { @@ -238,14 +238,14 @@ bool SdrTextObj::ReloadLinkedText( bool bForceLoad) } catch( ... ) { - bExists = FALSE; + bExists = sal_False; } } if( bExists ) { if( bForceLoad ) - bLoad = TRUE; + bLoad = sal_True; else bLoad = ( aFileDT > pData->aFileDate0 ); @@ -264,7 +264,7 @@ bool SdrTextObj::ReloadLinkedText( bool bForceLoad) bool SdrTextObj::LoadText(const String& rFileName, const String& /*rFilterName*/, rtl_TextEncoding eCharSet) { INetURLObject aFileURL( rFileName ); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( aFileURL.GetProtocol() == INET_PROT_NOT_VALID ) { @@ -289,14 +289,14 @@ bool SdrTextObj::LoadText(const String& rFileName, const String& /*rFilterName*/ cRTF[4] = 0; pIStm->Read(cRTF, 5); - BOOL bRTF = cRTF[0] == '{' && cRTF[1] == '\\' && cRTF[2] == 'r' && cRTF[3] == 't' && cRTF[4] == 'f'; + sal_Bool bRTF = cRTF[0] == '{' && cRTF[1] == '\\' && cRTF[2] == 'r' && cRTF[3] == 't' && cRTF[4] == 'f'; pIStm->Seek(0); if( !pIStm->GetError() ) { - SetText( *pIStm, aFileURL.GetMainURL( INetURLObject::NO_DECODE ), sal::static_int_cast< USHORT >( bRTF ? EE_FORMAT_RTF : EE_FORMAT_TEXT ) ); - bRet = TRUE; + SetText( *pIStm, aFileURL.GetMainURL( INetURLObject::NO_DECODE ), sal::static_int_cast< sal_uInt16 >( bRTF ? EE_FORMAT_RTF : EE_FORMAT_TEXT ) ); + bRet = sal_True; } delete pIStm; @@ -308,8 +308,8 @@ bool SdrTextObj::LoadText(const String& rFileName, const String& /*rFilterName*/ ImpSdrObjTextLinkUserData* SdrTextObj::GetLinkUserData() const { ImpSdrObjTextLinkUserData* pData=NULL; - USHORT nAnz=GetUserDataCount(); - for (USHORT nNum=nAnz; nNum>0 && pData==NULL;) { + sal_uInt16 nAnz=GetUserDataCount(); + for (sal_uInt16 nNum=nAnz; nNum>0 && pData==NULL;) { nNum--; pData=(ImpSdrObjTextLinkUserData*)GetUserData(nNum); if (pData->GetInventor()!=SdrInventor || pData->GetId()!=SDRUSERDATA_OBJTEXTLINK) { diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx index 7e1a7e67926c..ace2b4cf5814 100644..100755 --- a/svx/source/svdraw/svdotxtr.cxx +++ b/svx/source/svdraw/svdotxtr.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" #include <svx/svdotext.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdtrans.hxx> #include <svx/svdogrp.hxx> #include <svx/svdopath.hxx> @@ -42,7 +42,7 @@ #include <svx/sdr/properties/properties.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <svl/itemset.hxx> -#include <svditer.hxx> +#include <svx/svditer.hxx> #include <drawinglayer/processor2d/textaspolygonextractor2d.hxx> #include <svx/sdr/contact/viewcontact.hxx> #include <svx/xflclit.hxx> @@ -231,7 +231,7 @@ void SdrTextObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract void SdrTextObj::NbcRotate(const Point& rRef, long nWink, double sn, double cs) { - SetGlueReallyAbsolute(TRUE); + SetGlueReallyAbsolute(sal_True); long dx=aRect.Right()-aRect.Left(); long dy=aRect.Bottom()-aRect.Top(); Point aP(aRect.TopLeft()); @@ -250,18 +250,18 @@ void SdrTextObj::NbcRotate(const Point& rRef, long nWink, double sn, double cs) } SetRectsDirty(); NbcRotateGluePoints(rRef,nWink,sn,cs); - SetGlueReallyAbsolute(FALSE); + SetGlueReallyAbsolute(sal_False); } void SdrTextObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) { - SetGlueReallyAbsolute(TRUE); + SetGlueReallyAbsolute(sal_True); // #75889# when this is a SdrPathObj aRect maybe not initialized Polygon aPol(Rect2Poly(aRect.IsEmpty() ? GetSnapRect() : aRect, aGeo)); - USHORT nPointCount=aPol.GetSize(); - for (USHORT i=0; i<nPointCount; i++) { + sal_uInt16 nPointCount=aPol.GetSize(); + for (sal_uInt16 i=0; i<nPointCount; i++) { ShearPoint(aPol[i],rRef,tn,bVShear); } Poly2Rect(aPol,aRect,aGeo); @@ -272,12 +272,12 @@ void SdrTextObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear ImpCheckShear(); SetRectsDirty(); NbcShearGluePoints(rRef,nWink,tn,bVShear); - SetGlueReallyAbsolute(FALSE); + SetGlueReallyAbsolute(sal_False); } void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2) { - SetGlueReallyAbsolute(TRUE); + SetGlueReallyAbsolute(sal_True); bool bNoShearMerk=aGeo.nShearWink==0; bool bRota90Merk = false; if (bNoShearMerk && @@ -286,8 +286,8 @@ void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2) bRota90Merk=aGeo.nDrehWink % 9000 ==0; } Polygon aPol(Rect2Poly(aRect,aGeo)); - USHORT i; - USHORT nPntAnz=aPol.GetSize(); + sal_uInt16 i; + sal_uInt16 nPntAnz=aPol.GetSize(); for (i=0; i<nPntAnz; i++) { MirrorPoint(aPol[i],rRef1,rRef2); } @@ -325,7 +325,7 @@ void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2) ImpCheckShear(); SetRectsDirty(); NbcMirrorGluePoints(rRef1,rRef2); - SetGlueReallyAbsolute(FALSE); + SetGlueReallyAbsolute(sal_False); } ////////////////////////////////////////////////////////////////////////////// @@ -346,7 +346,7 @@ SdrObject* SdrTextObj::ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const if(xSequence.hasElements()) { // create an extractor with neutral ViewInformation - const drawinglayer::geometry::ViewInformation2D aViewInformation2D(0); + const drawinglayer::geometry::ViewInformation2D aViewInformation2D; drawinglayer::processor2d::TextAsPolygonExtractor2D aExtractor(aViewInformation2D); // extract text as polygons @@ -453,7 +453,7 @@ SdrObject* SdrTextObj::ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const ////////////////////////////////////////////////////////////////////////////// -SdrObject* SdrTextObj::DoConvertToPolyObj(BOOL bBezier) const +SdrObject* SdrTextObj::DoConvertToPolyObj(sal_Bool bBezier) const { return ImpConvertContainedTextToSdrPathObjs(!bBezier); } diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index c9f8fbd05cdd..7110c98a8f0e 100644..100755 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -48,17 +48,17 @@ #include <svx/svdouno.hxx> #include <svx/svdpagv.hxx> #include <svx/svdmodel.hxx> -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" // Objektname #include <svx/svdetc.hxx> #include <svx/svdview.hxx> #include <svx/svdorect.hxx> -#include "svdviter.hxx" +#include "svx/svdviter.hxx" #include <rtl/ref.hxx> #include <set> #include <memory> #include <svx/sdrpagewindow.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <tools/diagnose_ex.h> #include <svx/svdograf.hxx> @@ -165,11 +165,11 @@ namespace TYPEINIT1(SdrUnoObj, SdrRectObj); -SdrUnoObj::SdrUnoObj(const String& rModelName, BOOL _bOwnUnoControlModel) +SdrUnoObj::SdrUnoObj(const String& rModelName, sal_Bool _bOwnUnoControlModel) : m_pImpl( new SdrUnoObjDataHolder ), bOwnUnoControlModel( _bOwnUnoControlModel ) { - bIsUnoObj = TRUE; + bIsUnoObj = sal_True; m_pImpl->pEventListener = new SdrControlEventListenerImpl(this); @@ -180,11 +180,11 @@ SdrUnoObj::SdrUnoObj(const String& rModelName, BOOL _bOwnUnoControlModel) SdrUnoObj::SdrUnoObj(const String& rModelName, const uno::Reference< lang::XMultiServiceFactory >& rxSFac, - BOOL _bOwnUnoControlModel) + sal_Bool _bOwnUnoControlModel) : m_pImpl( new SdrUnoObjDataHolder ), bOwnUnoControlModel( _bOwnUnoControlModel ) { - bIsUnoObj = TRUE; + bIsUnoObj = sal_True; m_pImpl->pEventListener = new SdrControlEventListenerImpl(this); @@ -228,26 +228,26 @@ void SdrUnoObj::SetPage(SdrPage* pNewPage) void SdrUnoObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { - rInfo.bRotateFreeAllowed = FALSE; - rInfo.bRotate90Allowed = FALSE; - rInfo.bMirrorFreeAllowed = FALSE; - rInfo.bMirror45Allowed = FALSE; - rInfo.bMirror90Allowed = FALSE; - rInfo.bTransparenceAllowed = FALSE; - rInfo.bGradientAllowed = FALSE; - rInfo.bShearAllowed = FALSE; - rInfo.bEdgeRadiusAllowed = FALSE; - rInfo.bNoOrthoDesired = FALSE; - rInfo.bCanConvToPath = FALSE; - rInfo.bCanConvToPoly = FALSE; - rInfo.bCanConvToPathLineToArea = FALSE; - rInfo.bCanConvToPolyLineToArea = FALSE; - rInfo.bCanConvToContour = FALSE; + rInfo.bRotateFreeAllowed = sal_False; + rInfo.bRotate90Allowed = sal_False; + rInfo.bMirrorFreeAllowed = sal_False; + rInfo.bMirror45Allowed = sal_False; + rInfo.bMirror90Allowed = sal_False; + rInfo.bTransparenceAllowed = sal_False; + rInfo.bGradientAllowed = sal_False; + rInfo.bShearAllowed = sal_False; + rInfo.bEdgeRadiusAllowed = sal_False; + rInfo.bNoOrthoDesired = sal_False; + rInfo.bCanConvToPath = sal_False; + rInfo.bCanConvToPoly = sal_False; + rInfo.bCanConvToPathLineToArea = sal_False; + rInfo.bCanConvToPolyLineToArea = sal_False; + rInfo.bCanConvToContour = sal_False; } -UINT16 SdrUnoObj::GetObjIdentifier() const +sal_uInt16 SdrUnoObj::GetObjIdentifier() const { - return UINT16(OBJ_UNO); + return sal_uInt16(OBJ_UNO); } void SdrUnoObj::SetContextWritingMode( const sal_Int16 _nContextWritingMode ) diff --git a/svx/source/svdraw/svdoutl.cxx b/svx/source/svdraw/svdoutl.cxx index 0f830f0999c3..df99bfecdb9e 100644..100755 --- a/svx/source/svdraw/svdoutl.cxx +++ b/svx/source/svdraw/svdoutl.cxx @@ -42,7 +42,7 @@ DBG_NAME(SdrOutliner) |* Ctor |* \************************************************************************/ -SdrOutliner::SdrOutliner( SfxItemPool* pItemPool, USHORT nMode ) +SdrOutliner::SdrOutliner( SfxItemPool* pItemPool, sal_uInt16 nMode ) : Outliner( pItemPool, nMode ), //mpPaintInfoRec( NULL ) mpVisualizedPage(0) @@ -71,15 +71,15 @@ void SdrOutliner::SetTextObj( const SdrTextObj* pObj ) { if( pObj && pObj != mpTextObj.get() ) { - SetUpdateMode(FALSE); - USHORT nOutlinerMode2 = OUTLINERMODE_OUTLINEOBJECT; + SetUpdateMode(sal_False); + sal_uInt16 nOutlinerMode2 = OUTLINERMODE_OUTLINEOBJECT; if ( !pObj->IsOutlText() ) nOutlinerMode2 = OUTLINERMODE_TEXTOBJECT; Init( nOutlinerMode2 ); SetGlobalCharStretching(100,100); - ULONG nStat = GetControlWord(); + sal_uIntPtr nStat = GetControlWord(); nStat &= ~( EE_CNTRL_STRETCHING | EE_CNTRL_AUTOPAGESIZE ); SetControlWord(nStat); @@ -109,14 +109,14 @@ void SdrOutliner::SetTextObjNoInit( const SdrTextObj* pObj ) |* |* \************************************************************************/ -XubString SdrOutliner::CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USHORT nPos, +XubString SdrOutliner::CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor) { bool bOk = false; XubString aRet; if(mpTextObj.is()) - bOk = static_cast< SdrTextObj* >( mpTextObj.get())->CalcFieldValue(rField, nPara, nPos, FALSE, rpTxtColor, rpFldColor, aRet); + bOk = static_cast< SdrTextObj* >( mpTextObj.get())->CalcFieldValue(rField, nPara, nPos, sal_False, rpTxtColor, rpFldColor, aRet); if (!bOk) aRet = Outliner::CalcFieldValue(rField, nPara, nPos, rpTxtColor, rpFldColor); diff --git a/svx/source/svdraw/svdoutlinercache.cxx b/svx/source/svdraw/svdoutlinercache.cxx index 8f152d5ff7fb..bf41c4f8042d 100644..100755 --- a/svx/source/svdraw/svdoutlinercache.cxx +++ b/svx/source/svdraw/svdoutlinercache.cxx @@ -34,7 +34,7 @@ #include <svx/svdoutl.hxx> #include <svx/svdmodel.hxx> -extern SdrOutliner* SdrMakeOutliner( USHORT nOutlinerMode, SdrModel* pModel ); +extern SdrOutliner* SdrMakeOutliner( sal_uInt16 nOutlinerMode, SdrModel* pModel ); SdrOutlinerCache::SdrOutlinerCache( SdrModel* pModel ) : mpModel( pModel ), @@ -86,7 +86,7 @@ void SdrOutlinerCache::disposeOutliner( SdrOutliner* pOutliner ) { if( pOutliner ) { - USHORT nOutlMode = pOutliner->GetOutlinerMode(); + sal_uInt16 nOutlMode = pOutliner->GetOutlinerMode(); if( (OUTLINERMODE_OUTLINEOBJECT == nOutlMode) && (NULL == mpModeOutline) ) { diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx index 57d930fa79a0..844316e08245 100644..100755 --- a/svx/source/svdraw/svdovirt.cxx +++ b/svx/source/svdraw/svdovirt.cxx @@ -61,7 +61,7 @@ TYPEINIT1(SdrVirtObj,SdrObject); SdrVirtObj::SdrVirtObj(SdrObject& rNewObj): rRefObj(rNewObj) { - bVirtObj=TRUE; // Ja, ich bin ein virtuelles Objekt + bVirtObj=sal_True; // Ja, ich bin ein virtuelles Objekt rRefObj.AddReference(*this); bClosedObj=rRefObj.IsClosedObj(); } @@ -70,7 +70,7 @@ SdrVirtObj::SdrVirtObj(SdrObject& rNewObj, const Point& rAnchorPos): rRefObj(rNewObj) { aAnchor=rAnchorPos; - bVirtObj=TRUE; // Ja, ich bin ein virtuelles Objekt + bVirtObj=sal_True; // Ja, ich bin ein virtuelles Objekt rRefObj.AddReference(*this); bClosedObj=rRefObj.IsClosedObj(); } @@ -120,12 +120,12 @@ void SdrVirtObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const rRefObj.TakeObjInfo(rInfo); } -UINT32 SdrVirtObj::GetObjInventor() const +sal_uInt32 SdrVirtObj::GetObjInventor() const { return rRefObj.GetObjInventor(); } -UINT16 SdrVirtObj::GetObjIdentifier() const +sal_uInt16 SdrVirtObj::GetObjIdentifier() const { return rRefObj.GetObjIdentifier(); } @@ -198,7 +198,7 @@ void SdrVirtObj::TakeObjNamePlural(XubString& rName) const void operator +=(PolyPolygon& rPoly, const Point& rOfs) { if (rOfs.X()!=0 || rOfs.Y()!=0) { - USHORT i,j; + sal_uInt16 i,j; for (j=0; j<rPoly.Count(); j++) { Polygon aP1(rPoly.GetObject(j)); for (i=0; i<aP1.GetSize(); i++) { diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index d7bcaa2727b5..9857360ba62c 100644..100755 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -50,7 +50,7 @@ #include <svx/svdograf.hxx> // fuer SwapInAll() #include <svx/svdoedge.hxx> // Zum kopieren der Konnektoren #include <svx/svdoole2.hxx> // Sonderbehandlung OLE beim SdrExchangeFormat -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdmodel.hxx> #include <svx/svdlayer.hxx> #include <svx/svdotext.hxx> @@ -112,8 +112,8 @@ SdrObjList::SdrObjList(SdrModel* pNewModel, SdrPage* pNewPage, SdrObjList* pNewU pModel=pNewModel; pPage=pNewPage; pUpList=pNewUpList; - bObjOrdNumsDirty=FALSE; - bRectsDirty=FALSE; + bObjOrdNumsDirty=sal_False; + bRectsDirty=sal_False; pOwnerObj=NULL; eListKind=SDROBJLIST_UNKNOWN; } @@ -128,8 +128,8 @@ SdrObjList::SdrObjList(const SdrObjList& rSrcList): pModel=NULL; pPage=NULL; pUpList=NULL; - bObjOrdNumsDirty=FALSE; - bRectsDirty=FALSE; + bObjOrdNumsDirty=sal_False; + bRectsDirty=sal_False; pOwnerObj=NULL; eListKind=SDROBJLIST_UNKNOWN; *this=rSrcList; @@ -158,12 +158,12 @@ void SdrObjList::operator=(const SdrObjList& rSrcList) void SdrObjList::CopyObjects(const SdrObjList& rSrcList) { Clear(); - bObjOrdNumsDirty=FALSE; - bRectsDirty =FALSE; - ULONG nCloneErrCnt=0; - ULONG nAnz=rSrcList.GetObjCount(); + bObjOrdNumsDirty=sal_False; + bRectsDirty =sal_False; + sal_uIntPtr nCloneErrCnt=0; + sal_uIntPtr nAnz=rSrcList.GetObjCount(); SdrInsertReason aReason(SDRREASON_COPY); - ULONG no; + sal_uIntPtr no; for (no=0; no<nAnz; no++) { SdrObject* pSO=rSrcList.GetObj(no); @@ -193,8 +193,8 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList) const SdrObject* pSrcOb=rSrcList.GetObj(no); SdrEdgeObj* pSrcEdge=PTR_CAST(SdrEdgeObj,pSrcOb); if (pSrcEdge!=NULL) { - SdrObject* pSrcNode1=pSrcEdge->GetConnectedNode(TRUE); - SdrObject* pSrcNode2=pSrcEdge->GetConnectedNode(FALSE); + SdrObject* pSrcNode1=pSrcEdge->GetConnectedNode(sal_True); + SdrObject* pSrcNode2=pSrcEdge->GetConnectedNode(sal_False); if (pSrcNode1!=NULL && pSrcNode1->GetObjList()!=pSrcEdge->GetObjList()) pSrcNode1=NULL; // Listenuebergreifend if (pSrcNode2!=NULL && pSrcNode2->GetObjList()!=pSrcEdge->GetObjList()) pSrcNode2=NULL; // ist (noch) nicht if (pSrcNode1!=NULL || pSrcNode2!=NULL) { @@ -202,19 +202,19 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList) SdrEdgeObj* pDstEdge=PTR_CAST(SdrEdgeObj,pEdgeObjTmp); if (pDstEdge!=NULL) { if (pSrcNode1!=NULL) { - ULONG nDstNode1=pSrcNode1->GetOrdNum(); + sal_uIntPtr nDstNode1=pSrcNode1->GetOrdNum(); SdrObject* pDstNode1=GetObj(nDstNode1); if (pDstNode1!=NULL) { // Sonst grober Fehler! - pDstEdge->ConnectToNode(TRUE,pDstNode1); + pDstEdge->ConnectToNode(sal_True,pDstNode1); } else { OSL_FAIL("SdrObjList::operator=(): pDstNode1==NULL!"); } } if (pSrcNode2!=NULL) { - ULONG nDstNode2=pSrcNode2->GetOrdNum(); + sal_uIntPtr nDstNode2=pSrcNode2->GetOrdNum(); SdrObject* pDstNode2=GetObj(nDstNode2); if (pDstNode2!=NULL) { // Node war sonst wohl nicht markiert - pDstEdge->ConnectToNode(FALSE,pDstNode2); + pDstEdge->ConnectToNode(sal_False,pDstNode2); } else { OSL_FAIL("SdrObjList::operator=(): pDstNode2==NULL!"); } @@ -291,8 +291,8 @@ void SdrObjList::SetPage(SdrPage* pNewPage) { if (pPage!=pNewPage) { pPage=pNewPage; - ULONG nAnz=GetObjCount(); - for (ULONG no=0; no<nAnz; no++) { + sal_uIntPtr nAnz=GetObjCount(); + for (sal_uIntPtr no=0; no<nAnz; no++) { SdrObject* pObj=GetObj(no); pObj->SetPage(pPage); } @@ -308,8 +308,8 @@ void SdrObjList::SetModel(SdrModel* pNewModel) { if (pModel!=pNewModel) { pModel=pNewModel; - ULONG nAnz=GetObjCount(); - for (ULONG i=0; i<nAnz; i++) { + sal_uIntPtr nAnz=GetObjCount(); + for (sal_uIntPtr i=0; i<nAnz; i++) { SdrObject* pObj=GetObj(i); pObj->SetModel(pModel); } @@ -318,20 +318,20 @@ void SdrObjList::SetModel(SdrModel* pNewModel) void SdrObjList::RecalcObjOrdNums() { - ULONG nAnz=GetObjCount(); - for (ULONG no=0; no<nAnz; no++) { + sal_uIntPtr nAnz=GetObjCount(); + for (sal_uIntPtr no=0; no<nAnz; no++) { SdrObject* pObj=GetObj(no); pObj->SetOrdNum(no); } - bObjOrdNumsDirty=FALSE; + bObjOrdNumsDirty=sal_False; } void SdrObjList::RecalcRects() { aOutRect=Rectangle(); aSnapRect=aOutRect; - ULONG nAnz=GetObjCount(); - ULONG i; + sal_uIntPtr nAnz=GetObjCount(); + sal_uIntPtr i; for (i=0; i<nAnz; i++) { SdrObject* pObj=GetObj(i); if (i==0) { @@ -346,7 +346,7 @@ void SdrObjList::RecalcRects() void SdrObjList::SetRectsDirty() { - bRectsDirty=TRUE; + bRectsDirty=sal_True; if (pUpList!=NULL) pUpList->SetRectsDirty(); } @@ -360,16 +360,16 @@ void SdrObjList::impChildInserted(SdrObject& rChild) const } } -void SdrObjList::NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason* /*pReason*/) +void SdrObjList::NbcInsertObject(SdrObject* pObj, sal_uIntPtr nPos, const SdrInsertReason* /*pReason*/) { DBG_ASSERT(pObj!=NULL,"SdrObjList::NbcInsertObject(NULL)"); if (pObj!=NULL) { DBG_ASSERT(!pObj->IsInserted(),"ZObjekt hat bereits Inserted-Status"); - ULONG nAnz=GetObjCount(); + sal_uIntPtr nAnz=GetObjCount(); if (nPos>nAnz) nPos=nAnz; InsertObjectIntoContainer(*pObj,nPos); - if (nPos<nAnz) bObjOrdNumsDirty=TRUE; + if (nPos<nAnz) bObjOrdNumsDirty=sal_True; pObj->SetOrdNum(nPos); pObj->SetObjList(this); pObj->SetPage(pPage); @@ -382,11 +382,11 @@ void SdrObjList::NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertRea aOutRect.Union(pObj->GetCurrentBoundRect()); aSnapRect.Union(pObj->GetSnapRect()); } - pObj->SetInserted(TRUE); // Ruft u.a. den UserCall + pObj->SetInserted(sal_True); // Ruft u.a. den UserCall } } -void SdrObjList::InsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason* pReason) +void SdrObjList::InsertObject(SdrObject* pObj, sal_uIntPtr nPos, const SdrInsertReason* pReason) { DBG_ASSERT(pObj!=NULL,"SdrObjList::InsertObject(NULL)"); @@ -429,7 +429,7 @@ void SdrObjList::InsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason } } -SdrObject* SdrObjList::NbcRemoveObject(ULONG nObjNum) +SdrObject* SdrObjList::NbcRemoveObject(sal_uIntPtr nObjNum) { if (nObjNum >= maList.size()) { @@ -437,7 +437,7 @@ SdrObject* SdrObjList::NbcRemoveObject(ULONG nObjNum) return NULL; } - ULONG nAnz=GetObjCount(); + sal_uIntPtr nAnz=GetObjCount(); SdrObject* pObj=maList[nObjNum]; RemoveObjectFromContainer(nObjNum); @@ -447,12 +447,12 @@ SdrObject* SdrObjList::NbcRemoveObject(ULONG nObjNum) DBG_ASSERT(pObj!=NULL,"Object zum Removen nicht gefunden"); if (pObj!=NULL) { DBG_ASSERT(pObj->IsInserted(),"ZObjekt hat keinen Inserted-Status"); - pObj->SetInserted(FALSE); // Ruft u.a. den UserCall + pObj->SetInserted(sal_False); // Ruft u.a. den UserCall pObj->SetObjList(NULL); pObj->SetPage(NULL); if (!bObjOrdNumsDirty) { // Optimierung fuer den Fall, dass das letzte Obj rausgenommen wird - if (nObjNum!=ULONG(nAnz-1)) { - bObjOrdNumsDirty=TRUE; + if (nObjNum!=sal_uIntPtr(nAnz-1)) { + bObjOrdNumsDirty=sal_True; } } SetRectsDirty(); @@ -460,7 +460,7 @@ SdrObject* SdrObjList::NbcRemoveObject(ULONG nObjNum) return pObj; } -SdrObject* SdrObjList::RemoveObject(ULONG nObjNum) +SdrObject* SdrObjList::RemoveObject(sal_uIntPtr nObjNum) { if (nObjNum >= maList.size()) { @@ -468,7 +468,7 @@ SdrObject* SdrObjList::RemoveObject(ULONG nObjNum) return NULL; } - ULONG nAnz=GetObjCount(); + sal_uIntPtr nAnz=GetObjCount(); SdrObject* pObj=maList[nObjNum]; RemoveObjectFromContainer(nObjNum); @@ -488,12 +488,12 @@ SdrObject* SdrObjList::RemoveObject(ULONG nObjNum) } pModel->SetChanged(); } - pObj->SetInserted(FALSE); // Ruft u.a. den UserCall + pObj->SetInserted(sal_False); // Ruft u.a. den UserCall pObj->SetObjList(NULL); pObj->SetPage(NULL); if (!bObjOrdNumsDirty) { // Optimierung fuer den Fall, dass das letzte Obj rausgenommen wird - if (nObjNum!=ULONG(nAnz-1)) { - bObjOrdNumsDirty=TRUE; + if (nObjNum!=sal_uIntPtr(nAnz-1)) { + bObjOrdNumsDirty=sal_True; } } SetRectsDirty(); @@ -508,7 +508,7 @@ SdrObject* SdrObjList::RemoveObject(ULONG nObjNum) return pObj; } -SdrObject* SdrObjList::NbcReplaceObject(SdrObject* pNewObj, ULONG nObjNum) +SdrObject* SdrObjList::NbcReplaceObject(SdrObject* pNewObj, sal_uIntPtr nObjNum) { if (nObjNum >= maList.size() || pNewObj == NULL) { @@ -521,7 +521,7 @@ SdrObject* SdrObjList::NbcReplaceObject(SdrObject* pNewObj, ULONG nObjNum) DBG_ASSERT(pObj!=NULL,"SdrObjList::ReplaceObject: Object zum Removen nicht gefunden"); if (pObj!=NULL) { DBG_ASSERT(pObj->IsInserted(),"SdrObjList::ReplaceObject: ZObjekt hat keinen Inserted-Status"); - pObj->SetInserted(FALSE); + pObj->SetInserted(sal_False); pObj->SetObjList(NULL); pObj->SetPage(NULL); ReplaceObjectInContainer(*pNewObj,nObjNum); @@ -537,13 +537,13 @@ SdrObject* SdrObjList::NbcReplaceObject(SdrObject* pNewObj, ULONG nObjNum) // evtl. existing parent visualisations impChildInserted(*pNewObj); - pNewObj->SetInserted(TRUE); + pNewObj->SetInserted(sal_True); SetRectsDirty(); } return pObj; } -SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, ULONG nObjNum) +SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, sal_uIntPtr nObjNum) { if (nObjNum >= maList.size()) { @@ -568,7 +568,7 @@ SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, ULONG nObjNum) pModel->Broadcast(aHint); } } - pObj->SetInserted(FALSE); + pObj->SetInserted(sal_False); pObj->SetObjList(NULL); pObj->SetPage(NULL); ReplaceObjectInContainer(*pNewObj,nObjNum); @@ -584,7 +584,7 @@ SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, ULONG nObjNum) // evtl. existing parent visualisations impChildInserted(*pNewObj); - pNewObj->SetInserted(TRUE); + pNewObj->SetInserted(sal_True); if (pModel!=NULL) { // Hier muss ein anderer Broadcast her! if (pNewObj->GetPage()!=NULL) { @@ -599,7 +599,7 @@ SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, ULONG nObjNum) return pObj; } -SdrObject* SdrObjList::NbcSetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum) +SdrObject* SdrObjList::NbcSetObjectOrdNum(sal_uIntPtr nOldObjNum, sal_uIntPtr nNewObjNum) { if (nOldObjNum >= maList.size() || nNewObjNum >= maList.size()) { @@ -622,12 +622,12 @@ SdrObject* SdrObjList::NbcSetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum) pObj->ActionChanged(); pObj->SetOrdNum(nNewObjNum); - bObjOrdNumsDirty=TRUE; + bObjOrdNumsDirty=sal_True; } return pObj; } -SdrObject* SdrObjList::SetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum) +SdrObject* SdrObjList::SetObjectOrdNum(sal_uIntPtr nOldObjNum, sal_uIntPtr nNewObjNum) { if (nOldObjNum >= maList.size() || nNewObjNum >= maList.size()) { @@ -649,7 +649,7 @@ SdrObject* SdrObjList::SetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum) pObj->ActionChanged(); pObj->SetOrdNum(nNewObjNum); - bObjOrdNumsDirty=TRUE; + bObjOrdNumsDirty=sal_True; if (pModel!=NULL) { // Hier muss ein anderer Broadcast her! @@ -664,7 +664,7 @@ const Rectangle& SdrObjList::GetAllObjSnapRect() const { if (bRectsDirty) { ((SdrObjList*)this)->RecalcRects(); - ((SdrObjList*)this)->bRectsDirty=FALSE; + ((SdrObjList*)this)->bRectsDirty=sal_False; } return aSnapRect; } @@ -679,15 +679,15 @@ const Rectangle& SdrObjList::GetAllObjBoundRect() const if (bRectsDirty || aOutRect.IsEmpty()) { ((SdrObjList*)this)->RecalcRects(); - ((SdrObjList*)this)->bRectsDirty=FALSE; + ((SdrObjList*)this)->bRectsDirty=sal_False; } return aOutRect; } void SdrObjList::NbcReformatAllTextObjects() { - ULONG nAnz=GetObjCount(); - ULONG nNum=0; + sal_uIntPtr nAnz=GetObjCount(); + sal_uIntPtr nNum=0; Printer* pPrinter = NULL; @@ -752,7 +752,7 @@ void SdrObjList::BurnInStyleSheetAttributes() } } -ULONG SdrObjList::GetObjCount() const +sal_uIntPtr SdrObjList::GetObjCount() const { return maList.size(); } @@ -760,7 +760,7 @@ ULONG SdrObjList::GetObjCount() const -SdrObject* SdrObjList::GetObj(ULONG nNum) const +SdrObject* SdrObjList::GetObj(sal_uIntPtr nNum) const { if (nNum >= maList.size()) { @@ -781,11 +781,11 @@ bool SdrObjList::IsReadOnly() const return bRet; } -ULONG SdrObjList::CountAllObjects() const +sal_uIntPtr SdrObjList::CountAllObjects() const { - ULONG nCnt=GetObjCount(); - ULONG nAnz=nCnt; - for (USHORT nNum=0; nNum<nAnz; nNum++) { + sal_uIntPtr nCnt=GetObjCount(); + sal_uIntPtr nAnz=nCnt; + for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) { SdrObjList* pSubOL=GetObj(nNum)->GetSubList(); if (pSubOL!=NULL) { nCnt+=pSubOL->CountAllObjects(); @@ -796,8 +796,8 @@ ULONG SdrObjList::CountAllObjects() const void SdrObjList::ForceSwapInObjects() const { - ULONG nObjAnz=GetObjCount(); - for (ULONG nObjNum=nObjAnz; nObjNum>0;) { + sal_uIntPtr nObjAnz=GetObjCount(); + for (sal_uIntPtr nObjNum=nObjAnz; nObjNum>0;) { SdrObject* pObj=GetObj(--nObjNum); SdrGrafObj* pGrafObj=PTR_CAST(SdrGrafObj,pObj); if (pGrafObj!=NULL) { @@ -812,8 +812,8 @@ void SdrObjList::ForceSwapInObjects() const void SdrObjList::ForceSwapOutObjects() const { - ULONG nObjAnz=GetObjCount(); - for (ULONG nObjNum=nObjAnz; nObjNum>0;) { + sal_uIntPtr nObjAnz=GetObjCount(); + for (sal_uIntPtr nObjNum=nObjAnz; nObjNum>0;) { SdrObject* pObj=GetObj(--nObjNum); SdrGrafObj* pGrafObj=PTR_CAST(SdrGrafObj,pObj); if (pGrafObj!=NULL) { @@ -834,7 +834,7 @@ void SdrObjList::FlattenGroups() UnGroupObj(i); } -void SdrObjList::UnGroupObj( ULONG nObjNum ) +void SdrObjList::UnGroupObj( sal_uIntPtr nObjNum ) { // if the given object is no group, this method is a noop SdrObject* pUngroupObj = GetObj( nObjNum ); @@ -1052,7 +1052,7 @@ void SdrObjList::InsertObjectIntoContainer ( maList.push_back(&rObject); else maList.insert(maList.begin()+nInsertPosition, &rObject); - bObjOrdNumsDirty=TRUE; + bObjOrdNumsDirty=sal_True; } @@ -1089,7 +1089,7 @@ void SdrObjList::ReplaceObjectInContainer ( } maList[nObjectPosition] = &rNewObject; - bObjOrdNumsDirty=TRUE; + bObjOrdNumsDirty=sal_True; } @@ -1118,7 +1118,7 @@ void SdrObjList::RemoveObjectFromContainer ( } maList.erase(maList.begin()+nObjectPosition); - bObjOrdNumsDirty=TRUE; + bObjOrdNumsDirty=sal_True; } @@ -1128,8 +1128,8 @@ void SdrObjList::RemoveObjectFromContainer ( void SdrPageGridFrameList::Clear() { - USHORT nAnz=GetCount(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=GetCount(); + for (sal_uInt16 i=0; i<nAnz; i++) { delete GetObject(i); } aList.Clear(); @@ -1532,7 +1532,7 @@ Size SdrPage::GetSize() const return Size(nWdt,nHgt); } -INT32 SdrPage::GetWdt() const +sal_Int32 SdrPage::GetWdt() const { return nWdt; } @@ -1557,12 +1557,12 @@ Orientation SdrPage::GetOrientation() const return eRet; } -INT32 SdrPage::GetHgt() const +sal_Int32 SdrPage::GetHgt() const { return nHgt; } -void SdrPage::SetBorder(INT32 nLft, INT32 nUpp, INT32 nRgt, INT32 nLwr) +void SdrPage::SetBorder(sal_Int32 nLft, sal_Int32 nUpp, sal_Int32 nRgt, sal_Int32 nLwr) { bool bChanged(false); @@ -1596,7 +1596,7 @@ void SdrPage::SetBorder(INT32 nLft, INT32 nUpp, INT32 nRgt, INT32 nLwr) } } -void SdrPage::SetLftBorder(INT32 nBorder) +void SdrPage::SetLftBorder(sal_Int32 nBorder) { if(nBordLft != nBorder) { @@ -1605,7 +1605,7 @@ void SdrPage::SetLftBorder(INT32 nBorder) } } -void SdrPage::SetUppBorder(INT32 nBorder) +void SdrPage::SetUppBorder(sal_Int32 nBorder) { if(nBordUpp != nBorder) { @@ -1614,7 +1614,7 @@ void SdrPage::SetUppBorder(INT32 nBorder) } } -void SdrPage::SetRgtBorder(INT32 nBorder) +void SdrPage::SetRgtBorder(sal_Int32 nBorder) { if(nBordRgt != nBorder) { @@ -1623,7 +1623,7 @@ void SdrPage::SetRgtBorder(INT32 nBorder) } } -void SdrPage::SetLwrBorder(INT32 nBorder) +void SdrPage::SetLwrBorder(sal_Int32 nBorder) { if(nBordLwr != nBorder) { @@ -1632,22 +1632,22 @@ void SdrPage::SetLwrBorder(INT32 nBorder) } } -INT32 SdrPage::GetLftBorder() const +sal_Int32 SdrPage::GetLftBorder() const { return nBordLft; } -INT32 SdrPage::GetUppBorder() const +sal_Int32 SdrPage::GetUppBorder() const { return nBordUpp; } -INT32 SdrPage::GetRgtBorder() const +sal_Int32 SdrPage::GetRgtBorder() const { return nBordRgt; } -INT32 SdrPage::GetLwrBorder() const +sal_Int32 SdrPage::GetLwrBorder() const { return nBordLwr; } @@ -1707,17 +1707,17 @@ void SdrPage::SetPageNum(sal_uInt16 nNew) } } -USHORT SdrPage::GetPageNum() const +sal_uInt16 SdrPage::GetPageNum() const { if (!mbInserted) return 0; if (mbMaster) { if (pModel && pModel->IsMPgNumsDirty()) - ((SdrModel*)pModel)->RecalcPageNums(TRUE); + ((SdrModel*)pModel)->RecalcPageNums(sal_True); } else { if (pModel && pModel->IsPagNumsDirty()) - ((SdrModel*)pModel)->RecalcPageNums(FALSE); + ((SdrModel*)pModel)->RecalcPageNums(sal_False); } return nPageNum; } @@ -1857,11 +1857,11 @@ SfxStyleSheet* SdrPage::GetTextStyleSheetForObject( SdrObject* pObj ) const return pObj->GetStyleSheet(); } -bool SdrPage::HasTransparentObjects( BOOL bCheckForAlphaChannel ) const +bool SdrPage::HasTransparentObjects( bool bCheckForAlphaChannel ) const { bool bRet = false; - for( ULONG n = 0, nCount = GetObjCount(); ( n < nCount ) && !bRet; n++ ) + for( sal_uIntPtr n = 0, nCount = GetObjCount(); ( n < nCount ) && !bRet; n++ ) if( GetObj( n )->IsTransparent( bCheckForAlphaChannel ) ) bRet = true; diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index deeadb458b0f..c87a32f7d4d5 100644..100755 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -48,7 +48,7 @@ #include <svx/svdouno.hxx> #include <svx/svdpage.hxx> #include <svx/svdview.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdogrp.hxx> #include <svx/svdtypes.hxx> @@ -67,7 +67,7 @@ using namespace ::rtl; using namespace ::com::sun::star; #include <svx/sdrpagewindow.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> TYPEINIT1(SdrPageView, SfxListener); DBG_NAME(SdrPageView); @@ -332,8 +332,8 @@ void SdrPageView::PaintOutlinerView(OutputDevice* pOut, const Rectangle& rRect) //const SdrObject* pTextObjTmp=GetView().GetTextEditObject(); //const SdrTextObj* pText=PTR_CAST(SdrTextObj,pTextObjTmp); //bool bTextFrame=pText!=NULL && pText->IsTextFrame(); - ULONG nViewAnz=GetView().pTextEditOutliner->GetViewCount(); - for (ULONG i=0; i<nViewAnz; i++) { + sal_uIntPtr nViewAnz=GetView().pTextEditOutliner->GetViewCount(); + for (sal_uIntPtr i=0; i<nViewAnz; i++) { OutlinerView* pOLV=GetView().pTextEditOutliner->GetView(i); if (pOLV->GetWindow()==pOut) { GetView().ImpPaintOutlinerView(*pOLV, rRect); @@ -359,6 +359,21 @@ void SdrPageView::PrePaint() } } +void SdrPageView::PostPaint() +{ + const sal_uInt32 nCount(PageWindowCount()); + + for(sal_uInt32 a(0); a < nCount; a++) + { + SdrPageWindow* pCandidate = GetPageWindow(a); + + if(pCandidate) + { + pCandidate->PostPaint(); + } + } +} + void SdrPageView::CompleteRedraw(SdrPaintWindow& rPaintWindow, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector) const { if(GetPage()) @@ -483,7 +498,7 @@ void SdrPageView::SetDesignMode( bool _bDesignMode ) const //////////////////////////////////////////////////////////////////////////////////////////////////// #ifdef OS2 -#define RGBCOLOR(r,g,b) ((ULONG)(((BYTE)(b) | ((USHORT)(g)<<8)) | (((ULONG)(BYTE)(r))<<16))) +#define RGBCOLOR(r,g,b) ((sal_uIntPtr)(((sal_uInt8)(b) | ((sal_uInt16)(g)<<8)) | (((sal_uIntPtr)(sal_uInt8)(r))<<16))) #endif void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, Color aColor) @@ -581,10 +596,6 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C rOut.SetLineColor( aColor ); bool bMap0=rOut.IsMapModeEnabled(); -#ifdef WIN // SetPixel-Profiling fuer Windows - COLORREF aWinColRef=PALETTERGB(aColor.GetRed()>>8,aColor.GetGreen()>>8,aColor.GetBlue()>>8); - HDC aWinhDC=Sysdepen::GethDC(rOut); -#endif long nWrX=0;//aWriterPageOffset.X(); long nWrY=0;//aWriterPageOffset.Y(); @@ -594,11 +605,11 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C long y1=GetPage()->GetUppBorder()+1+nWrX; long y2=GetPage()->GetHgt()-GetPage()->GetLwrBorder()-1+nWrY; const SdrPageGridFrameList* pFrames=GetPage()->GetGridFrameList(this,NULL); - //USHORT nBufSiz=1024; // 4k Buffer = max. 512 Punkte + //sal_uInt16 nBufSiz=1024; // 4k Buffer = max. 512 Punkte // #90353# long* pBuf = NULL; - USHORT nGridPaintAnz=1; + sal_uInt16 nGridPaintAnz=1; if (pFrames!=NULL) nGridPaintAnz=pFrames->GetCount(); - for (USHORT nGridPaintNum=0; nGridPaintNum<nGridPaintAnz; nGridPaintNum++) { + for (sal_uInt16 nGridPaintNum=0; nGridPaintNum<nGridPaintAnz; nGridPaintNum++) { if (pFrames!=NULL) { const SdrPageGridFrame& rGF=(*pFrames)[nGridPaintNum]; nWrX=rGF.GetPaperRect().Left(); @@ -639,13 +650,13 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C { if( bHoriLines ) { - ULONG nGridFlags = ( bHoriSolid ? GRID_HORZLINES : GRID_DOTS ); - UINT16 nSteps = sal_uInt16(nx1 / nx2); - UINT32 nRestPerStepMul1000 = nSteps ? ( ((nx1 * 1000L)/ nSteps) - (nx2 * 1000L) ) : 0; - UINT32 nStepOffset = 0; - UINT16 nPointOffset = 0; + sal_uIntPtr nGridFlags = ( bHoriSolid ? GRID_HORZLINES : GRID_DOTS ); + sal_uInt16 nSteps = sal_uInt16(nx1 / nx2); + sal_uInt32 nRestPerStepMul1000 = nSteps ? ( ((nx1 * 1000L)/ nSteps) - (nx2 * 1000L) ) : 0; + sal_uInt32 nStepOffset = 0; + sal_uInt16 nPointOffset = 0; - for(UINT16 a=0;a<nSteps;a++) + for(sal_uInt16 a=0;a<nSteps;a++) { // Zeichnen rOut.DrawGrid( @@ -664,13 +675,13 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C if( bVertLines ) { - ULONG nGridFlags = ( bVertSolid ? GRID_VERTLINES : GRID_DOTS ); - UINT16 nSteps = sal_uInt16(ny1 / ny2); - UINT32 nRestPerStepMul1000 = nSteps ? ( ((ny1 * 1000L)/ nSteps) - (ny2 * 1000L) ) : 0; - UINT32 nStepOffset = 0; - UINT16 nPointOffset = 0; + sal_uIntPtr nGridFlags = ( bVertSolid ? GRID_VERTLINES : GRID_DOTS ); + sal_uInt16 nSteps = sal_uInt16(ny1 / ny2); + sal_uInt32 nRestPerStepMul1000 = nSteps ? ( ((ny1 * 1000L)/ nSteps) - (ny2 * 1000L) ) : 0; + sal_uInt32 nStepOffset = 0; + sal_uInt16 nPointOffset = 0; - for(UINT16 a=0;a<nSteps;a++) + for(sal_uInt16 a=0;a<nSteps;a++) { // Zeichnen rOut.DrawGrid( @@ -796,7 +807,7 @@ sal_Bool SdrPageView::IsObjMarkable(SdrObject* pObj) const { // Der Layer muss sichtbar und darf nicht gesperrt sein SdrLayerID nL = pObj->GetLayer(); - return (aLayerVisi.IsSet(BYTE(nL)) && !aLayerLock.IsSet(BYTE(nL))); + return (aLayerVisi.IsSet(sal_uInt8(nL)) && !aLayerLock.IsSet(sal_uInt8(nL))); } } @@ -813,7 +824,7 @@ void SdrPageView::SetPageOrigin(const Point& rOrg) } } -void SdrPageView::ImpInvalidateHelpLineArea(USHORT nNum) const +void SdrPageView::ImpInvalidateHelpLineArea(sal_uInt16 nNum) const { if (GetView().IsHlplVisible() && nNum<aHelpLines.GetCount()) { const SdrHelpLine& rHL=aHelpLines[nNum]; @@ -843,7 +854,7 @@ void SdrPageView::SetHelpLines(const SdrHelpLineList& rHLL) InvalidateAllWin(); } -void SdrPageView::SetHelpLine(USHORT nNum, const SdrHelpLine& rNewHelpLine) +void SdrPageView::SetHelpLine(sal_uInt16 nNum, const SdrHelpLine& rNewHelpLine) { if (nNum<aHelpLines.GetCount() && aHelpLines[nNum]!=rNewHelpLine) { bool bNeedRedraw = true; @@ -860,7 +871,7 @@ void SdrPageView::SetHelpLine(USHORT nNum, const SdrHelpLine& rNewHelpLine) } } -void SdrPageView::DeleteHelpLine(USHORT nNum) +void SdrPageView::DeleteHelpLine(sal_uInt16 nNum) { if (nNum<aHelpLines.GetCount()) { ImpInvalidateHelpLineArea(nNum); @@ -868,7 +879,7 @@ void SdrPageView::DeleteHelpLine(USHORT nNum) } } -void SdrPageView::InsertHelpLine(const SdrHelpLine& rHL, USHORT nNum) +void SdrPageView::InsertHelpLine(const SdrHelpLine& rHL, sal_uInt16 nNum) { if (nNum>aHelpLines.GetCount()) nNum=aHelpLines.GetCount(); aHelpLines.Insert(rHL,nNum); @@ -951,7 +962,7 @@ void SdrPageView::LeaveOneGroup() { if(GetAktGroup()) { - BOOL bGlueInvalidate = (GetView().ImpIsGlueVisible()); + sal_Bool bGlueInvalidate = (GetView().ImpIsGlueVisible()); if(bGlueInvalidate) GetView().GlueInvalidate(); @@ -989,7 +1000,7 @@ void SdrPageView::LeaveAllGroup() { if(GetAktGroup()) { - BOOL bGlueInvalidate = (GetView().ImpIsGlueVisible()); + sal_Bool bGlueInvalidate = (GetView().ImpIsGlueVisible()); if(bGlueInvalidate) GetView().GlueInvalidate(); @@ -1023,9 +1034,9 @@ void SdrPageView::LeaveAllGroup() } } -USHORT SdrPageView::GetEnteredLevel() const +sal_uInt16 SdrPageView::GetEnteredLevel() const { - USHORT nAnz=0; + sal_uInt16 nAnz=0; SdrObject* pGrp=GetAktGroup(); while (pGrp!=NULL) { nAnz++; @@ -1052,7 +1063,7 @@ XubString SdrPageView::GetActualGroupName() const XubString SdrPageView::GetActualPathName(sal_Unicode cSep) const { XubString aStr; - BOOL bNamFnd(FALSE); + sal_Bool bNamFnd(sal_False); SdrObject* pGrp = GetAktGroup(); while(pGrp) @@ -1062,7 +1073,7 @@ XubString SdrPageView::GetActualPathName(sal_Unicode cSep) const if(!aStr1.Len()) aStr1 += sal_Unicode('?'); else - bNamFnd = TRUE; + bNamFnd = sal_True; aStr += aStr1; pGrp = pGrp->GetUpGroup(); diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 9213a2502cb3..3350a33d23c9 100644..100755 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -31,7 +31,7 @@ #include <com/sun/star/awt/XWindow.hpp> #include <svx/svdpntv.hxx> #include <vcl/msgbox.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svtools/grfmgr.hxx> #include <svx/svdmodel.hxx> @@ -55,7 +55,7 @@ #include <svx/svdograf.hxx> #include <svx/svdattrx.hxx> #include "svdibrow.hxx" -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdouno.hxx> #include <svx/sdr/overlay/overlayobjectlist.hxx> #include <svx/sdr/overlay/overlayrollingrectangle.hxx> @@ -223,23 +223,23 @@ void SdrPaintView::ImpClearVars() #ifdef DBG_UTIL pItemBrowser=NULL; #endif - bPageVisible=TRUE; - bPageBorderVisible=TRUE; - bBordVisible=TRUE; - bGridVisible=TRUE; - bGridFront =FALSE; - bHlplVisible=TRUE; - bHlplFront =TRUE; - bGlueVisible=FALSE; - bGlueVisible2=FALSE; - bGlueVisible3=FALSE; - bGlueVisible4=FALSE; - bSwapAsynchron=FALSE; - bPrintPreview=FALSE; - mbPreviewRenderer=FALSE; + bPageVisible=sal_True; + bPageBorderVisible=sal_True; + bBordVisible=sal_True; + bGridVisible=sal_True; + bGridFront =sal_False; + bHlplVisible=sal_True; + bHlplFront =sal_True; + bGlueVisible=sal_False; + bGlueVisible2=sal_False; + bGlueVisible3=sal_False; + bGlueVisible4=sal_False; + bSwapAsynchron=sal_False; + bPrintPreview=sal_False; + mbPreviewRenderer=sal_False; eAnimationMode = SDR_ANIMATION_ANIMATE; - bAnimationPause = FALSE; + bAnimationPause = sal_False; nHitTolPix=2; nMinMovPix=3; @@ -247,16 +247,16 @@ void SdrPaintView::ImpClearVars() nMinMovLog=0; pActualOutDev=NULL; pDragWin=NULL; - bRestoreColors=TRUE; + bRestoreColors=sal_True; pDefaultStyleSheet=NULL; - bSomeObjChgdFlag=FALSE; + bSomeObjChgdFlag=sal_False; nGraphicManagerDrawMode = GRFMGR_DRAW_STANDARD; aComeBackTimer.SetTimeout(1); aComeBackTimer.SetTimeoutHdl(LINK(this,SdrPaintView,ImpComeBackHdl)); String aNam; // System::GetUserName() just return an empty string if (pMod) - SetDefaultStyleSheet(pMod->GetDefaultStyleSheet(), TRUE); + SetDefaultStyleSheet(pMod->GetDefaultStyleSheet(), sal_True); aNam.ToUpperAscii(); @@ -286,7 +286,7 @@ SdrPaintView::SdrPaintView(SdrModel* pModel1, OutputDevice* pOut) } // Flag zur Visualisierung von Gruppen - bVisualizeEnteredGroup = TRUE; + bVisualizeEnteredGroup = sal_True; maColorConfig.AddListener(this); onChangeColorConfig(); @@ -331,14 +331,14 @@ void SdrPaintView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) return; } - BOOL bObjChg=!bSomeObjChgdFlag; // TRUE= auswerten fuer ComeBack-Timer + sal_Bool bObjChg=!bSomeObjChgdFlag; // sal_True= auswerten fuer ComeBack-Timer if (bObjChg) { SdrHint* pSdrHint=PTR_CAST(SdrHint,&rHint); if (pSdrHint!=NULL) { SdrHintKind eKind=pSdrHint->GetKind(); if (eKind==HINT_OBJCHG || eKind==HINT_OBJINSERTED || eKind==HINT_OBJREMOVED) { if (bObjChg) { - bSomeObjChgdFlag=TRUE; + bSomeObjChgdFlag=sal_True; aComeBackTimer.Start(); } } @@ -368,7 +368,7 @@ void SdrPaintView::ConfigurationChanged( ::utl::ConfigurationBroadcaster* , sal_ IMPL_LINK_INLINE_START(SdrPaintView,ImpComeBackHdl,Timer*,EMPTYARG) { if (bSomeObjChgdFlag) { - bSomeObjChgdFlag=FALSE; + bSomeObjChgdFlag=sal_False; ModelHasChanged(); } return 0; @@ -408,7 +408,7 @@ void SdrPaintView::ModelHasChanged() //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SdrPaintView::IsAction() const +sal_Bool SdrPaintView::IsAction() const { return IsEncirclement(); } @@ -462,9 +462,9 @@ SdrPageView* SdrPaintView::GetTextEditPageView() const //////////////////////////////////////////////////////////////////////////////////////////////////// -USHORT SdrPaintView::ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) const +sal_uInt16 SdrPaintView::ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) const { - if (nMinMov>=0) return USHORT(nMinMov); + if (nMinMov>=0) return sal_uInt16(nMinMov); if (pOut==NULL) { pOut = GetFirstOutputDevice(); @@ -476,9 +476,9 @@ USHORT SdrPaintView::ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) } } -USHORT SdrPaintView::ImpGetHitTolLogic(short nHitTol, const OutputDevice* pOut) const +sal_uInt16 SdrPaintView::ImpGetHitTolLogic(short nHitTol, const OutputDevice* pOut) const { - if (nHitTol>=0) return USHORT(nHitTol); + if (nHitTol>=0) return sal_uInt16(nHitTol); if (pOut==NULL) { pOut = GetFirstOutputDevice(); @@ -493,8 +493,8 @@ USHORT SdrPaintView::ImpGetHitTolLogic(short nHitTol, const OutputDevice* pOut) void SdrPaintView::TheresNewMapMode() { if (pActualOutDev!=NULL) { - nHitTolLog=(USHORT)((OutputDevice*)pActualOutDev)->PixelToLogic(Size(nHitTolPix,0)).Width(); - nMinMovLog=(USHORT)((OutputDevice*)pActualOutDev)->PixelToLogic(Size(nMinMovPix,0)).Width(); + nHitTolLog=(sal_uInt16)((OutputDevice*)pActualOutDev)->PixelToLogic(Size(nHitTolPix,0)).Width(); + nMinMovLog=(sal_uInt16)((OutputDevice*)pActualOutDev)->PixelToLogic(Size(nMinMovPix,0)).Width(); } } @@ -644,7 +644,7 @@ void SdrPaintView::DeleteWindowFromPaintView(OutputDevice* pOldWin) #endif } -void SdrPaintView::SetLayerVisible(const XubString& rName, BOOL bShow) +void SdrPaintView::SetLayerVisible(const XubString& rName, sal_Bool bShow) { if(mpPageView) { @@ -664,7 +664,7 @@ bool SdrPaintView::IsLayerVisible(const XubString& rName) const return false; } -void SdrPaintView::SetAllLayersVisible(BOOL bShow) +void SdrPaintView::SetAllLayersVisible(sal_Bool bShow) { if(mpPageView) { @@ -674,7 +674,7 @@ void SdrPaintView::SetAllLayersVisible(BOOL bShow) InvalidateAllWin(); } -void SdrPaintView::SetLayerLocked(const XubString& rName, BOOL bLock) +void SdrPaintView::SetLayerLocked(const XubString& rName, sal_Bool bLock) { if(mpPageView) { @@ -692,7 +692,7 @@ bool SdrPaintView::IsLayerLocked(const XubString& rName) const return false; } -void SdrPaintView::SetAllLayersLocked(BOOL bLock) +void SdrPaintView::SetAllLayersLocked(sal_Bool bLock) { if(mpPageView) { @@ -700,7 +700,7 @@ void SdrPaintView::SetAllLayersLocked(BOOL bLock) } } -void SdrPaintView::SetLayerPrintable(const XubString& rName, BOOL bPrn) +void SdrPaintView::SetLayerPrintable(const XubString& rName, sal_Bool bPrn) { if(mpPageView) { @@ -718,7 +718,7 @@ bool SdrPaintView::IsLayerPrintable(const XubString& rName) const return false; } -void SdrPaintView::SetAllLayersPrintable(BOOL bPrn) +void SdrPaintView::SetAllLayersPrintable(sal_Bool bPrn) { if(mpPageView) { @@ -734,6 +734,14 @@ void SdrPaintView::PrePaint() } } +void SdrPaintView::PostPaint() +{ + if(mpPageView) + { + mpPageView->PostPaint(); + } +} + //////////////////////////////////////////////////////////////////////////////////////////////////// // #define SVX_REPAINT_TIMER_TEST @@ -1063,9 +1071,9 @@ void SdrPaintView::ImpFormLayerDrawing(SdrPaintWindow& rPaintWindow) const //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SdrPaintView::KeyInput(const KeyEvent& /*rKEvt*/, Window* /*pWin*/) +sal_Bool SdrPaintView::KeyInput(const KeyEvent& /*rKEvt*/, Window* /*pWin*/) { - return FALSE; + return sal_False; } void SdrPaintView::GlueInvalidate() const @@ -1083,8 +1091,8 @@ void SdrPaintView::GlueInvalidate() const if(mpPageView) { const SdrObjList* pOL=mpPageView->GetObjList(); - ULONG nObjAnz=pOL->GetObjCount(); - for (ULONG nObjNum=0; nObjNum<nObjAnz; nObjNum++) { + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + for (sal_uIntPtr nObjNum=0; nObjNum<nObjAnz; nObjNum++) { const SdrObject* pObj=pOL->GetObj(nObjNum); const SdrGluePointList* pGPL=pObj->GetGluePointList(); if (pGPL!=NULL && pGPL->GetCount()!=0) { @@ -1111,7 +1119,7 @@ void SdrPaintView::InvalidateAllWin() } } -void SdrPaintView::InvalidateAllWin(const Rectangle& rRect, BOOL bPlus1Pix) +void SdrPaintView::InvalidateAllWin(const Rectangle& rRect, sal_Bool bPlus1Pix) { const sal_uInt32 nWindowCount(PaintWindowCount()); @@ -1186,12 +1194,12 @@ bool SdrPaintView::IsGroupEntered() const return false; } -void SdrPaintView::SetNotPersistDefaultAttr(const SfxItemSet& rAttr, BOOL /*bReplaceAll*/) +void SdrPaintView::SetNotPersistDefaultAttr(const SfxItemSet& rAttr, sal_Bool /*bReplaceAll*/) { // bReplaceAll hat hier keinerlei Wirkung - BOOL bMeasure=ISA(SdrView) && ((SdrView*)this)->IsMeasureTool(); + sal_Bool bMeasure=ISA(SdrView) && ((SdrView*)this)->IsMeasureTool(); const SfxPoolItem *pPoolItem=NULL; - if (rAttr.GetItemState(SDRATTR_LAYERID,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_LAYERID,sal_True,&pPoolItem)==SFX_ITEM_SET) { SdrLayerID nLayerId=((const SdrLayerIdItem*)pPoolItem)->GetValue(); const SdrLayer* pLayer=pMod->GetLayerAdmin().GetLayerPerID(nLayerId); if (pLayer!=NULL) { @@ -1199,35 +1207,35 @@ void SdrPaintView::SetNotPersistDefaultAttr(const SfxItemSet& rAttr, BOOL /*bRep else aAktLayer=pLayer->GetName(); } } - if (rAttr.GetItemState(SDRATTR_LAYERNAME,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_LAYERNAME,sal_True,&pPoolItem)==SFX_ITEM_SET) { if (bMeasure) aMeasureLayer=((const SdrLayerNameItem*)pPoolItem)->GetValue(); else aAktLayer=((const SdrLayerNameItem*)pPoolItem)->GetValue(); } } -void SdrPaintView::MergeNotPersistDefaultAttr(SfxItemSet& rAttr, BOOL /*bOnlyHardAttr*/) const +void SdrPaintView::MergeNotPersistDefaultAttr(SfxItemSet& rAttr, sal_Bool /*bOnlyHardAttr*/) const { // bOnlyHardAttr hat hier keinerlei Wirkung - BOOL bMeasure=ISA(SdrView) && ((SdrView*)this)->IsMeasureTool(); + sal_Bool bMeasure=ISA(SdrView) && ((SdrView*)this)->IsMeasureTool(); const XubString& aNam=bMeasure?aMeasureLayer:aAktLayer; rAttr.Put(SdrLayerNameItem(aNam)); - SdrLayerID nLayer=pMod->GetLayerAdmin().GetLayerID(aNam,TRUE); + SdrLayerID nLayer=pMod->GetLayerAdmin().GetLayerID(aNam,sal_True); if (nLayer!=SDRLAYER_NOTFOUND) { rAttr.Put(SdrLayerIdItem(nLayer)); } } -void SdrPaintView::SetDefaultAttr(const SfxItemSet& rAttr, BOOL bReplaceAll) +void SdrPaintView::SetDefaultAttr(const SfxItemSet& rAttr, sal_Bool bReplaceAll) { #ifdef DBG_UTIL { - BOOL bHasEEFeatureItems=FALSE; + sal_Bool bHasEEFeatureItems=sal_False; SfxItemIter aIter(rAttr); const SfxPoolItem* pItem=aIter.FirstItem(); while (!bHasEEFeatureItems && pItem!=NULL) { if (!IsInvalidItem(pItem)) { - USHORT nW=pItem->Which(); - if (nW>=EE_FEATURE_START && nW<=EE_FEATURE_END) bHasEEFeatureItems=TRUE; + sal_uInt16 nW=pItem->Which(); + if (nW>=EE_FEATURE_START && nW<=EE_FEATURE_END) bHasEEFeatureItems=sal_True; } pItem=aIter.NextItem(); } @@ -1241,14 +1249,14 @@ void SdrPaintView::SetDefaultAttr(const SfxItemSet& rAttr, BOOL bReplaceAll) } #endif if (bReplaceAll) aDefaultAttr.Set(rAttr); - else aDefaultAttr.Put(rAttr,FALSE); // FALSE= InvalidItems nicht als Default, sondern als "Loecher" betrachten + else aDefaultAttr.Put(rAttr,sal_False); // FALSE= InvalidItems nicht als Default, sondern als "Loecher" betrachten SetNotPersistDefaultAttr(rAttr,bReplaceAll); #ifdef DBG_UTIL if (pItemBrowser!=NULL) pItemBrowser->SetDirty(); #endif } -void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr) +void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr) { if (pDefaultStyleSheet) EndListening(*pDefaultStyleSheet); @@ -1258,9 +1266,9 @@ void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRe if (pStyleSheet!=NULL && !bDontRemoveHardAttr) { SfxWhichIter aIter(pStyleSheet->GetItemSet()); - USHORT nWhich=aIter.FirstWhich(); + sal_uInt16 nWhich=aIter.FirstWhich(); while (nWhich!=0) { - if (pStyleSheet->GetItemSet().GetItemState(nWhich,TRUE)==SFX_ITEM_SET) { + if (pStyleSheet->GetItemSet().GetItemState(nWhich,sal_True)==SFX_ITEM_SET) { aDefaultAttr.ClearItem(nWhich); } nWhich=aIter.NextWhich(); @@ -1272,49 +1280,49 @@ void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRe } /* new interface src537 */ -BOOL SdrPaintView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) const +sal_Bool SdrPaintView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const { if(bOnlyHardAttr || !pDefaultStyleSheet) { - rTargetSet.Put(aDefaultAttr, FALSE); + rTargetSet.Put(aDefaultAttr, sal_False); } else { // sonst DefStyleSheet dazumergen - rTargetSet.Put(pDefaultStyleSheet->GetItemSet(), FALSE); - rTargetSet.Put(aDefaultAttr, FALSE); + rTargetSet.Put(pDefaultStyleSheet->GetItemSet(), sal_False); + rTargetSet.Put(aDefaultAttr, sal_False); } MergeNotPersistDefaultAttr(rTargetSet, bOnlyHardAttr); - return TRUE; + return sal_True; } -BOOL SdrPaintView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll) +sal_Bool SdrPaintView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll) { SetDefaultAttr(rSet,bReplaceAll); - return TRUE; + return sal_True; } -SfxStyleSheet* SdrPaintView::GetStyleSheet() const // SfxStyleSheet* SdrPaintView::GetStyleSheet(BOOL& rOk) const +SfxStyleSheet* SdrPaintView::GetStyleSheet() const // SfxStyleSheet* SdrPaintView::GetStyleSheet(sal_Bool& rOk) const { - //rOk=TRUE; + //rOk=sal_True; return GetDefaultStyleSheet(); } -BOOL SdrPaintView::SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr) +sal_Bool SdrPaintView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr) { SetDefaultStyleSheet(pStyleSheet,bDontRemoveHardAttr); - return TRUE; + return sal_True; } //////////////////////////////////////////////////////////////////////////////////////////////////// #ifdef DBG_UTIL -void SdrPaintView::ShowItemBrowser(BOOL bShow) +void SdrPaintView::ShowItemBrowser(sal_Bool bShow) { if (bShow) { if (pItemBrowser==NULL) { pItemBrowser=new SdrItemBrowser(*(SdrView*)this); - pItemBrowser->SetFloatingMode(TRUE); + pItemBrowser->SetFloatingMode(sal_True); } pItemBrowser->Show(); pItemBrowser->GrabFocus(); @@ -1336,12 +1344,12 @@ void SdrPaintView::MakeVisible(const Rectangle& rRect, Window& rWin) if( aActualSize.Height() > 0 && aActualSize.Width() > 0 ) { Size aNewSize(rRect.GetSize()); - BOOL bNewScale=FALSE; - BOOL bNeedMoreX=aNewSize.Width()>aActualSize.Width(); - BOOL bNeedMoreY=aNewSize.Height()>aActualSize.Height(); + sal_Bool bNewScale=sal_False; + sal_Bool bNeedMoreX=aNewSize.Width()>aActualSize.Width(); + sal_Bool bNeedMoreY=aNewSize.Height()>aActualSize.Height(); if (bNeedMoreX || bNeedMoreY) { - bNewScale=TRUE; + bNewScale=sal_True; // Neuen MapMode (Size+Org) setzen und dabei alles invalidieren Fraction aXFact(aNewSize.Width(),aActualSize.Width()); Fraction aYFact(aNewSize.Height(),aActualSize.Height()); @@ -1381,7 +1389,7 @@ void SdrPaintView::DoConnect(SdrOle2Obj* /*pOleObj*/) { } -void SdrPaintView::SetAnimationEnabled( BOOL bEnable ) +void SdrPaintView::SetAnimationEnabled( sal_Bool bEnable ) { SetAnimationMode( bEnable ? SDR_ANIMATION_ANIMATE : SDR_ANIMATION_DISABLE ); } diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx index 2fb33c0c04a7..ae98ae8f8cf3 100644..100755 --- a/svx/source/svdraw/svdpoev.cxx +++ b/svx/source/svdraw/svdpoev.cxx @@ -35,8 +35,8 @@ #include <svx/svdpage.hxx> #include <svx/svdopath.hxx> #include <svx/svdundo.hxx> -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache #include <svx/svdtrans.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> @@ -52,8 +52,8 @@ void SdrPolyEditView::ImpResetPolyPossibilityFlags() { eMarkedPointsSmooth=SDRPATHSMOOTH_DONTCARE; eMarkedSegmentsKind=SDRPATHSEGMENT_DONTCARE; - bSetMarkedPointsSmoothPossible=FALSE; - bSetMarkedSegmentsKindPossible=FALSE; + bSetMarkedPointsSmoothPossible=sal_False; + bSetMarkedSegmentsKindPossible=sal_False; } void SdrPolyEditView::ImpClearVars() @@ -74,7 +74,7 @@ SdrPolyEditView::~SdrPolyEditView() void SdrPolyEditView::ImpCheckPolyPossibilities() { ImpResetPolyPossibilityFlags(); - const ULONG nMarkAnz(GetMarkedObjectCount()); + const sal_uIntPtr nMarkAnz(GetMarkedObjectCount()); if(nMarkAnz && !ImpIsFrameHandles()) { @@ -85,7 +85,7 @@ void SdrPolyEditView::ImpCheckPolyPossibilities() bool bSegmFuz(false); basegfx::B2VectorContinuity eSmooth = basegfx::CONTINUITY_NONE; - for(ULONG nMarkNum(0L); nMarkNum < nMarkAnz; nMarkNum++) + for(sal_uIntPtr nMarkNum(0L); nMarkNum < nMarkAnz; nMarkNum++) { SdrMark* pM = GetSdrMarkByIndex(nMarkNum); CheckPolyPossibilitiesHelper( pM, b1stSmooth, b1stSegm, bCurve, bSmoothFuz, bSegmFuz, eSmooth ); @@ -215,9 +215,9 @@ void SdrPolyEditView::SetMarkedPointsSmooth(SdrPathSmoothKind eKind) const bool bUndo = IsUndoEnabled(); if( bUndo ) BegUndo(ImpGetResStr(STR_EditSetPointsSmooth), GetDescriptionOfMarkedPoints()); - ULONG nMarkAnz(GetMarkedObjectCount()); + sal_uIntPtr nMarkAnz(GetMarkedObjectCount()); - for(ULONG nMarkNum(nMarkAnz); nMarkNum > 0L;) + for(sal_uIntPtr nMarkNum(nMarkAnz); nMarkNum > 0L;) { nMarkNum--; SdrMark* pM = GetSdrMarkByIndex(nMarkNum); @@ -250,9 +250,9 @@ void SdrPolyEditView::SetMarkedSegmentsKind(SdrPathSegmentKind eKind) const bool bUndo = IsUndoEnabled(); if( bUndo ) BegUndo(ImpGetResStr(STR_EditSetSegmentsKind), GetDescriptionOfMarkedPoints()); - ULONG nMarkAnz(GetMarkedObjectCount()); + sal_uIntPtr nMarkAnz(GetMarkedObjectCount()); - for(ULONG nMarkNum(nMarkAnz); nMarkNum > 0L;) + for(sal_uIntPtr nMarkNum(nMarkAnz); nMarkNum > 0L;) { nMarkNum--; SdrMark* pM = GetSdrMarkByIndex(nMarkNum); @@ -276,7 +276,7 @@ void SdrPolyEditView::SetMarkedSegmentsKind(SdrPathSegmentKind eKind) } } -BOOL SdrPolyEditView::IsSetMarkedPointsSmoothPossible() const +sal_Bool SdrPolyEditView::IsSetMarkedPointsSmoothPossible() const { ForcePossibilities(); return bSetMarkedPointsSmoothPossible; @@ -288,7 +288,7 @@ SdrPathSmoothKind SdrPolyEditView::GetMarkedPointsSmooth() const return eMarkedPointsSmooth; } -BOOL SdrPolyEditView::IsSetMarkedSegmentsKindPossible() const +sal_Bool SdrPolyEditView::IsSetMarkedSegmentsKindPossible() const { ForcePossibilities(); return bSetMarkedSegmentsKindPossible; @@ -300,7 +300,7 @@ SdrPathSegmentKind SdrPolyEditView::GetMarkedSegmentsKind() const return eMarkedSegmentsKind; } -BOOL SdrPolyEditView::IsDeleteMarkedPointsPossible() const +sal_Bool SdrPolyEditView::IsDeleteMarkedPointsPossible() const { return HasMarkedPoints(); } @@ -311,7 +311,7 @@ void SdrPolyEditView::DeleteMarkedPoints() { BrkAction(); SortMarkedObjects(); - ULONG nMarkAnz=GetMarkedObjectCount(); + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); const bool bUndo = IsUndoEnabled(); if( bUndo ) @@ -320,7 +320,7 @@ void SdrPolyEditView::DeleteMarkedPoints() BegUndo(ImpGetResStr(STR_EditDelete),GetDescriptionOfMarkedPoints(),SDRREPFUNC_OBJ_DELETE); } - for (ULONG nMarkNum=nMarkAnz; nMarkNum>0;) + for (sal_uIntPtr nMarkNum=nMarkAnz; nMarkNum>0;) { nMarkNum--; SdrMark* pM=GetSdrMarkByIndex(nMarkNum); @@ -399,13 +399,13 @@ void SdrPolyEditView::RipUpAtMarkedPoints() pM->GetPageView()->GetObjList()->InsertObject(pNeuObj, pObj->GetOrdNum() + 1, &aReason); if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pNeuObj)); - MarkObj(pNeuObj, pM->GetPageView(), FALSE, TRUE); + MarkObj(pNeuObj, pM->GetPageView(), sal_False, sal_True); } if(nNewPt0Idx) { // Korrektur notwendig? - DBG_ASSERT(bKorregFlag==FALSE,"Mehrfache Indexkorrektur bei SdrPolyEditView::RipUp()"); + DBG_ASSERT(bKorregFlag==sal_False,"Mehrfache Indexkorrektur bei SdrPolyEditView::RipUp()"); if(!bKorregFlag) { bKorregFlag = sal_True; @@ -554,7 +554,7 @@ void SdrPolyEditView::ShutMarkedObjects() CloseMarkedObjects(); } -void SdrPolyEditView::CloseMarkedObjects(BOOL bToggle, BOOL bOpen) // , long nOpenDistance) +void SdrPolyEditView::CloseMarkedObjects(sal_Bool bToggle, sal_Bool bOpen) // , long nOpenDistance) { if (AreObjectsMarked()) { @@ -563,12 +563,12 @@ void SdrPolyEditView::CloseMarkedObjects(BOOL bToggle, BOOL bOpen) // , long nOp BegUndo(ImpGetResStr(STR_EditShut),GetDescriptionOfMarkedPoints()); bool bChg=false; - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nm=0; nm<nMarkAnz; nm++) + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pO=pM->GetMarkedSdrObj(); - BOOL bClosed=pO->IsClosedObj(); + sal_Bool bClosed=pO->IsClosedObj(); if ((pO->IsPolyObj() && (bClosed==bOpen)) || bToggle) { if( bUndo ) @@ -604,13 +604,13 @@ void SdrPolyEditView::ImpTransformMarkedPoints(PPolyTrFunc pTrFunc, const void* { const bool bUndo = IsUndoEnabled(); - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nm=0; nm<nMarkAnz; nm++) + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrUShortCont* pPts=pM->GetMarkedPoints(); - ULONG nPtAnz=pPts==NULL ? 0 : pPts->GetCount(); + sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->GetCount(); SdrPathObj* pPath=PTR_CAST(SdrPathObj,pObj); if (nPtAnz!=0 && pPath!=NULL) { @@ -684,7 +684,7 @@ static void ImpMove(Point& rPt, Point* pC1, Point* pC2, const void* p1, const vo void SdrPolyEditView::MoveMarkedPoints(const Size& rSiz, bool bCopy) { - bCopy=FALSE; // noch nicht implementiert + bCopy=sal_False; // noch nicht implementiert ForceUndirtyMrkPnt(); XubString aStr(ImpGetResStr(STR_EditMove)); if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy); @@ -706,7 +706,7 @@ static void ImpResize(Point& rPt, Point* pC1, Point* pC2, const void* p1, const void SdrPolyEditView::ResizeMarkedPoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy) { - bCopy=FALSE; // noch nicht implementiert + bCopy=sal_False; // noch nicht implementiert ForceUndirtyMrkPnt(); XubString aStr(ImpGetResStr(STR_EditResize)); if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy); @@ -728,7 +728,7 @@ static void ImpRotate(Point& rPt, Point* pC1, Point* pC2, const void* p1, const void SdrPolyEditView::RotateMarkedPoints(const Point& rRef, long nWink, bool bCopy) { - bCopy=FALSE; // noch nicht implementiert + bCopy=sal_False; // noch nicht implementiert ForceUndirtyMrkPnt(); XubString aStr(ImpGetResStr(STR_EditResize)); if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy); diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx index 5649856efbaa..ef39697b5ff4 100644..100755 --- a/svx/source/svdraw/svdsnpv.cxx +++ b/svx/source/svdraw/svdsnpv.cxx @@ -36,13 +36,13 @@ #include <svx/svdobj.hxx> #include <svx/svdpagv.hxx> #include <svx/svdpage.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/sdr/overlay/overlayobjectlist.hxx> #include <svx/sdr/overlay/overlaycrosshair.hxx> #include <svx/sdr/overlay/overlayhelpline.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> //////////////////////////////////////////////////////////////////////////////////////////////////// // #114409#-1 Migrate PageOrigin @@ -204,29 +204,29 @@ void ImplHelpLineOverlay::SetPosition(const basegfx::B2DPoint& rNewPosition) void SdrSnapView::ClearVars() { nMagnSizPix=4; - bSnapEnab=TRUE; - bGridSnap=TRUE; - bSnapTo1Pix=TRUE; - bBordSnap=TRUE; - bHlplSnap=TRUE; - bOFrmSnap=TRUE; - bOPntSnap=FALSE; - bOConSnap=TRUE; - bMoveMFrmSnap=TRUE; - bMoveOFrmSnap=TRUE; - bMoveOPntSnap=TRUE; - bMoveOConSnap=TRUE; - bMoveSnapOnlyTopLeft=FALSE; - bOrtho=FALSE; - bBigOrtho=TRUE; + bSnapEnab=sal_True; + bGridSnap=sal_True; + bSnapTo1Pix=sal_True; + bBordSnap=sal_True; + bHlplSnap=sal_True; + bOFrmSnap=sal_True; + bOPntSnap=sal_False; + bOConSnap=sal_True; + bMoveMFrmSnap=sal_True; + bMoveOFrmSnap=sal_True; + bMoveOPntSnap=sal_True; + bMoveOConSnap=sal_True; + bMoveSnapOnlyTopLeft=sal_False; + bOrtho=sal_False; + bBigOrtho=sal_True; nSnapAngle=1500; - bAngleSnapEnab=FALSE; - bMoveOnlyDragging=FALSE; - bSlantButShear=FALSE; - bCrookNoContortion=FALSE; + bAngleSnapEnab=sal_False; + bMoveOnlyDragging=sal_False; + bSlantButShear=sal_False; + bCrookNoContortion=sal_False; eCrookMode=SDRCROOK_ROTATE; - bHlplFixed=FALSE; - bEliminatePolyPoints=FALSE; + bHlplFixed=sal_False; + bEliminatePolyPoints=sal_False; nEliminatePolyPointLimitAngle=0; // #114409#-1 Migrate PageOrigin @@ -258,7 +258,7 @@ SdrSnapView::~SdrSnapView() //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SdrSnapView::IsAction() const +sal_Bool SdrSnapView::IsAction() const { return IsSetPageOrg() || IsDragHelpLine() || SdrPaintView::IsAction(); } @@ -318,7 +318,7 @@ Point SdrSnapView::GetSnapPos(const Point& rPnt, const SdrPageView* pPV) const } #define NOT_SNAPPED 0x7FFFFFFF -USHORT SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const +sal_uInt16 SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const { if (!bSnapEnab) return SDRSNAP_NOTSNAPPED; long x=rPnt.X(); @@ -336,8 +336,8 @@ USHORT SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const if (bHlplVisible && bHlplSnap && !IsDragHelpLine()) { const SdrHelpLineList& rHLL=pPV->GetHelpLines(); - USHORT nAnz=rHLL.GetCount(); - for (USHORT i=nAnz; i>0;) { + sal_uInt16 nAnz=rHLL.GetCount(); + for (sal_uInt16 i=nAnz; i>0;) { i--; const SdrHelpLine& rHL=rHLL[i]; const Point& rPos=rHL.GetPos(); @@ -380,11 +380,11 @@ USHORT SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const a=y- ys ; if (Abs(a)<=my) { dy1=-a; if (Abs(dy1)<Abs(dy)) dy=dy1; } // rechte Papierkante } if (bOFrmSnap || bOPntSnap /*|| (bConnVisible && bOConSnap)*/) { - ULONG nMaxPointSnapCount=200; - ULONG nMaxFrameSnapCount=200; + sal_uIntPtr nMaxPointSnapCount=200; + sal_uIntPtr nMaxFrameSnapCount=200; // #97981# go back to IM_DEEPNOGROUPS runthrough for snap to object comparisons - SdrObjListIter aIter(*pPV->GetPage(),/*IM_FLAT*/IM_DEEPNOGROUPS,TRUE); + SdrObjListIter aIter(*pPV->GetPage(),/*IM_FLAT*/IM_DEEPNOGROUPS,sal_True); while (aIter.IsMore() && (nMaxPointSnapCount>0 || nMaxFrameSnapCount>0)) { SdrObject* pO=aIter.Next(); @@ -460,7 +460,7 @@ USHORT SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const dy = 0; } } - BOOL bRet=SDRSNAP_NOTSNAPPED; + sal_Bool bRet=SDRSNAP_NOTSNAPPED; if (dx==NOT_SNAPPED) dx=0; else bRet|=SDRSNAP_XSNAPPED; if (dy==NOT_SNAPPED) dy=0; else bRet|=SDRSNAP_YSNAPPED; rPnt.X()=x+dx; @@ -471,7 +471,7 @@ USHORT SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const void SdrSnapView::CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBestXSnap, long& nBestYSnap, bool& bXSnapped, bool& bYSnapped) const { Point aPt(rPt); - USHORT nRet=SnapPos(aPt,pPV); + sal_uInt16 nRet=SnapPos(aPt,pPV); aPt-=rPt; if ((nRet & SDRSNAP_XSNAPPED) !=0) { if (bXSnapped) { @@ -480,7 +480,7 @@ void SdrSnapView::CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBes } } else { nBestXSnap=aPt.X(); - bXSnapped=TRUE; + bXSnapped=sal_True; } } if ((nRet & SDRSNAP_YSNAPPED) !=0) { @@ -490,17 +490,17 @@ void SdrSnapView::CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBes } } else { nBestYSnap=aPt.Y(); - bYSnapped=TRUE; + bYSnapped=sal_True; } } } -USHORT SdrSnapView::SnapRect(const Rectangle& rRect, const SdrPageView* pPV, long& rDX, long& rDY) const +sal_uInt16 SdrSnapView::SnapRect(const Rectangle& rRect, const SdrPageView* pPV, long& rDX, long& rDY) const { long nBestXSnap=0; long nBestYSnap=0; - bool bXSnapped=FALSE; - bool bYSnapped=FALSE; + bool bXSnapped=sal_False; + bool bYSnapped=sal_False; CheckSnap(rRect.TopLeft() ,pPV,nBestXSnap,nBestYSnap,bXSnapped,bYSnapped); if (!bMoveSnapOnlyTopLeft) { CheckSnap(rRect.TopRight() ,pPV,nBestXSnap,nBestYSnap,bXSnapped,bYSnapped); @@ -509,7 +509,7 @@ USHORT SdrSnapView::SnapRect(const Rectangle& rRect, const SdrPageView* pPV, lon } rDX=nBestXSnap; rDY=nBestYSnap; - USHORT nRet=0; + sal_uInt16 nRet=0; if (bXSnapped) nRet+=SDRSNAP_XSNAPPED; if (bYSnapped) nRet+=SDRSNAP_YSNAPPED; return nRet; @@ -574,7 +574,7 @@ void SdrSnapView::BrkSetPageOrg() //////////////////////////////////////////////////////////////////////////////////////////////////// -sal_Bool SdrSnapView::PickHelpLine(const Point& rPnt, short nTol, const OutputDevice& rOut, USHORT& rnHelpLineNum, SdrPageView*& rpPV) const +sal_Bool SdrSnapView::PickHelpLine(const Point& rPnt, short nTol, const OutputDevice& rOut, sal_uInt16& rnHelpLineNum, SdrPageView*& rpPV) const { rpPV=NULL; nTol=ImpGetHitTolLogic(nTol,&rOut); @@ -583,7 +583,7 @@ sal_Bool SdrSnapView::PickHelpLine(const Point& rPnt, short nTol, const OutputDe if(pPV) { Point aPnt(rPnt); - USHORT nIndex=pPV->GetHelpLines().HitTest(aPnt,USHORT(nTol),rOut); + sal_uInt16 nIndex=pPV->GetHelpLines().HitTest(aPnt,sal_uInt16(nTol),rOut); if (nIndex!=SDRHELPLINE_NOTFOUND) { rpPV=pPV; rnHelpLineNum=nIndex; @@ -594,7 +594,7 @@ sal_Bool SdrSnapView::PickHelpLine(const Point& rPnt, short nTol, const OutputDe } // start HelpLine drag for new HelpLine -sal_Bool SdrSnapView::BegDragHelpLine(USHORT nHelpLineNum, SdrPageView* pPV) +sal_Bool SdrSnapView::BegDragHelpLine(sal_uInt16 nHelpLineNum, SdrPageView* pPV) { sal_Bool bRet(sal_False); diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src index 3324728402f6..de073fceebb5 100644..100755 --- a/svx/source/svdraw/svdstr.src +++ b/svx/source/svdraw/svdstr.src @@ -26,7 +26,7 @@ ************************************************************************/ /* StarView resource file */ -#include "svdstr.hrc" +#include "svx/svdstr.hrc" // Ab hier gecachte Strings String STR_ObjNameSingulNONE { @@ -2745,6 +2745,11 @@ String SIP_SA_GRAFRESERVE4 { Text = "" ; }; String SIP_SA_GRAFRESERVE5 { Text = "" ; }; String SIP_SA_GRAFRESERVE6 { Text = "" ; }; +Bitmap SIP_SA_PAGESHADOW35X35 +{ + File = "pageshadow35x35.png"; +}; + Bitmap SIP_SA_MARKERS { File = "markers.png"; @@ -2848,4 +2853,12 @@ Bitmap SIP_SA_CROP_FINE_MARKERS File = "cropmarkers2.png"; }; -// ******************************************************************* EOF +String STR_ObjNameSingulFONTWORK +{ + Text [ en-US ] = "font work" ; +}; +String STR_ObjNamePluralFONTWORK +{ + Text [ en-US ] = "font works" ; +}; + diff --git a/svx/source/svdraw/svdtext.cxx b/svx/source/svdraw/svdtext.cxx index e24c4ae00c69..369ce4ff3d81 100644..100755 --- a/svx/source/svdraw/svdtext.cxx +++ b/svx/source/svdraw/svdtext.cxx @@ -77,7 +77,7 @@ void SdrText::CheckPortionInfo( SdrOutliner& rOutliner ) void SdrText::ReformatText() { - mbPortionInfoChecked=FALSE; + mbPortionInfoChecked=sal_False; mpOutlinerParaObject->ClearPortionInfo(); } @@ -141,7 +141,7 @@ void SdrText::SetModel( SdrModel* pNewModel ) if( mpOutlinerParaObject && pOldModel!=NULL && pNewModel!=NULL) { - bool bHgtSet = GetObjectItemSet().GetItemState(EE_CHAR_FONTHEIGHT, TRUE) == SFX_ITEM_SET; + bool bHgtSet = GetObjectItemSet().GetItemState(EE_CHAR_FONTHEIGHT, sal_True) == SFX_ITEM_SET; MapUnit aOldUnit(pOldModel->GetScaleUnit()); MapUnit aNewUnit(pNewModel->GetScaleUnit()); @@ -150,10 +150,10 @@ void SdrText::SetModel( SdrModel* pNewModel ) // !!! Hier muss noch DefTab und RefDevice der beiden Models // !!! verglichen werden und dann ggf. AutoGrow zuschlagen !!! // !!! fehlende Implementation !!! - ULONG nOldFontHgt=pOldModel->GetDefaultFontHeight(); - ULONG nNewFontHgt=pNewModel->GetDefaultFontHeight(); - BOOL bDefHgtChanged=nNewFontHgt!=nOldFontHgt; - BOOL bSetHgtItem=bDefHgtChanged && !bHgtSet; + sal_uIntPtr nOldFontHgt=pOldModel->GetDefaultFontHeight(); + sal_uIntPtr nNewFontHgt=pNewModel->GetDefaultFontHeight(); + sal_Bool bDefHgtChanged=nNewFontHgt!=nOldFontHgt; + sal_Bool bSetHgtItem=bDefHgtChanged && !bHgtSet; if (bSetHgtItem) { // #32665# // zunaechst das HeightItem festklopfen, damit @@ -173,7 +173,7 @@ void SdrText::SetModel( SdrModel* pNewModel ) // Funktioniert nicht richtig: // Geht am Outliner leider nur in % // double nPercFloat=double(aMetricFactor)*100+0.5; - // USHORT nPerc=(USHORT)nPercFloat; + // sal_uInt16 nPerc=(sal_uInt16)nPercFloat; // rOutliner.DoStretchChars(100,nPerc); if (bSetHgtItem) @@ -185,12 +185,12 @@ void SdrText::SetModel( SdrModel* pNewModel ) } SetOutlinerParaObject(rOutliner.CreateParaObject()); // #34494# mpOutlinerParaObject->ClearPortionInfo(); - mbPortionInfoChecked=FALSE; + mbPortionInfoChecked=sal_False; rOutliner.Clear(); } } -void SdrText::ForceOutlinerParaObject( USHORT nOutlMode ) +void SdrText::ForceOutlinerParaObject( sal_uInt16 nOutlMode ) { if( mpModel && !mpOutlinerParaObject ) { diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx index 26a31597bd67..42ca495b3294 100644..100755 --- a/svx/source/svdraw/svdtrans.cxx +++ b/svx/source/svdraw/svdtrans.cxx @@ -93,32 +93,32 @@ void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& rxFact, con void ResizePoly(Polygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact) { - USHORT nAnz=rPoly.GetSize(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rPoly.GetSize(); + for (sal_uInt16 i=0; i<nAnz; i++) { ResizePoint(rPoly[i],rRef,xFact,yFact); } } void ResizeXPoly(XPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact) { - USHORT nAnz=rPoly.GetPointCount(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rPoly.GetPointCount(); + for (sal_uInt16 i=0; i<nAnz; i++) { ResizePoint(rPoly[i],rRef,xFact,yFact); } } void ResizePoly(PolyPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact) { - USHORT nAnz=rPoly.Count(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rPoly.Count(); + for (sal_uInt16 i=0; i<nAnz; i++) { ResizePoly(rPoly[i],rRef,xFact,yFact); } } void ResizeXPoly(XPolyPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact) { - USHORT nAnz=rPoly.Count(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rPoly.Count(); + for (sal_uInt16 i=0; i<nAnz; i++) { ResizeXPoly(rPoly[i],rRef,xFact,yFact); } } @@ -127,32 +127,32 @@ void ResizeXPoly(XPolyPolygon& rPoly, const Point& rRef, const Fraction& xFact, void RotatePoly(Polygon& rPoly, const Point& rRef, double sn, double cs) { - USHORT nAnz=rPoly.GetSize(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rPoly.GetSize(); + for (sal_uInt16 i=0; i<nAnz; i++) { RotatePoint(rPoly[i],rRef,sn,cs); } } void RotateXPoly(XPolygon& rPoly, const Point& rRef, double sn, double cs) { - USHORT nAnz=rPoly.GetPointCount(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rPoly.GetPointCount(); + for (sal_uInt16 i=0; i<nAnz; i++) { RotatePoint(rPoly[i],rRef,sn,cs); } } void RotatePoly(PolyPolygon& rPoly, const Point& rRef, double sn, double cs) { - USHORT nAnz=rPoly.Count(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rPoly.Count(); + for (sal_uInt16 i=0; i<nAnz; i++) { RotatePoly(rPoly[i],rRef,sn,cs); } } void RotateXPoly(XPolyPolygon& rPoly, const Point& rRef, double sn, double cs) { - USHORT nAnz=rPoly.Count(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rPoly.Count(); + for (sal_uInt16 i=0; i<nAnz; i++) { RotateXPoly(rPoly[i],rRef,sn,cs); } } @@ -202,32 +202,32 @@ void MirrorPoint(Point& rPnt, const Point& rRef1, const Point& rRef2) void MirrorPoly(Polygon& rPoly, const Point& rRef1, const Point& rRef2) { - USHORT nAnz=rPoly.GetSize(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rPoly.GetSize(); + for (sal_uInt16 i=0; i<nAnz; i++) { MirrorPoint(rPoly[i],rRef1,rRef2); } } void MirrorXPoly(XPolygon& rPoly, const Point& rRef1, const Point& rRef2) { - USHORT nAnz=rPoly.GetPointCount(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rPoly.GetPointCount(); + for (sal_uInt16 i=0; i<nAnz; i++) { MirrorPoint(rPoly[i],rRef1,rRef2); } } void MirrorPoly(PolyPolygon& rPoly, const Point& rRef1, const Point& rRef2) { - USHORT nAnz=rPoly.Count(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rPoly.Count(); + for (sal_uInt16 i=0; i<nAnz; i++) { MirrorPoly(rPoly[i],rRef1,rRef2); } } void MirrorXPoly(XPolyPolygon& rPoly, const Point& rRef1, const Point& rRef2) { - USHORT nAnz=rPoly.Count(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rPoly.Count(); + for (sal_uInt16 i=0; i<nAnz; i++) { MirrorXPoly(rPoly[i],rRef1,rRef2); } } @@ -236,32 +236,32 @@ void MirrorXPoly(XPolyPolygon& rPoly, const Point& rRef1, const Point& rRef2) void ShearPoly(Polygon& rPoly, const Point& rRef, double tn, bool bVShear) { - USHORT nAnz=rPoly.GetSize(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rPoly.GetSize(); + for (sal_uInt16 i=0; i<nAnz; i++) { ShearPoint(rPoly[i],rRef,tn,bVShear); } } void ShearXPoly(XPolygon& rPoly, const Point& rRef, double tn, bool bVShear) { - USHORT nAnz=rPoly.GetPointCount(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rPoly.GetPointCount(); + for (sal_uInt16 i=0; i<nAnz; i++) { ShearPoint(rPoly[i],rRef,tn,bVShear); } } void ShearPoly(PolyPolygon& rPoly, const Point& rRef, double tn, bool bVShear) { - USHORT nAnz=rPoly.Count(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rPoly.Count(); + for (sal_uInt16 i=0; i<nAnz; i++) { ShearPoly(rPoly[i],rRef,tn,bVShear); } } void ShearXPoly(XPolyPolygon& rPoly, const Point& rRef, double tn, bool bVShear) { - USHORT nAnz=rPoly.Count(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rPoly.Count(); + for (sal_uInt16 i=0; i<nAnz; i++) { ShearXPoly(rPoly[i],rRef,tn,bVShear); } } @@ -400,8 +400,8 @@ double CrookStretchXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCen void CrookRotatePoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert) { double nSin,nCos; - USHORT nPointAnz=rPoly.GetPointCount(); - USHORT i=0; + sal_uInt16 nPointAnz=rPoly.GetPointCount(); + sal_uInt16 i=0; while (i<nPointAnz) { Point* pPnt=&rPoly[i]; Point* pC1=NULL; @@ -423,8 +423,8 @@ void CrookRotatePoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, b void CrookSlantPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert) { double nSin,nCos; - USHORT nPointAnz=rPoly.GetPointCount(); - USHORT i=0; + sal_uInt16 nPointAnz=rPoly.GetPointCount(); + sal_uInt16 i=0; while (i<nPointAnz) { Point* pPnt=&rPoly[i]; Point* pC1=NULL; @@ -446,8 +446,8 @@ void CrookSlantPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bo void CrookStretchPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert, const Rectangle rRefRect) { double nSin,nCos; - USHORT nPointAnz=rPoly.GetPointCount(); - USHORT i=0; + sal_uInt16 nPointAnz=rPoly.GetPointCount(); + sal_uInt16 i=0; while (i<nPointAnz) { Point* pPnt=&rPoly[i]; Point* pC1=NULL; @@ -470,24 +470,24 @@ void CrookStretchPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, void CrookRotatePoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert) { - USHORT nPolyAnz=rPoly.Count(); - for (USHORT nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) { + sal_uInt16 nPolyAnz=rPoly.Count(); + for (sal_uInt16 nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) { CrookRotatePoly(rPoly[nPolyNum],rCenter,rRad,bVert); } } void CrookSlantPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert) { - USHORT nPolyAnz=rPoly.Count(); - for (USHORT nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) { + sal_uInt16 nPolyAnz=rPoly.Count(); + for (sal_uInt16 nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) { CrookSlantPoly(rPoly[nPolyNum],rCenter,rRad,bVert); } } void CrookStretchPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert, const Rectangle rRefRect) { - USHORT nPolyAnz=rPoly.Count(); - for (USHORT nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) { + sal_uInt16 nPolyAnz=rPoly.Count(); + for (sal_uInt16 nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) { CrookStretchPoly(rPoly[nPolyNum],rCenter,rRad,bVert,rRefRect); } } @@ -522,7 +522,7 @@ long NormAngle360(long a) return a; } -USHORT GetAngleSector(long nWink) +sal_uInt16 GetAngleSector(long nWink) { while (nWink<0) nWink+=36000; while (nWink>=36000) nWink-=36000; @@ -701,17 +701,17 @@ long BigMulDiv(long nVal, long nMul, long nDiv) void Kuerzen(Fraction& rF, unsigned nDigits) { - INT32 nMul=rF.GetNumerator(); - INT32 nDiv=rF.GetDenominator(); + sal_Int32 nMul=rF.GetNumerator(); + sal_Int32 nDiv=rF.GetDenominator(); bool bNeg = false; if (nMul<0) { nMul=-nMul; bNeg=!bNeg; } if (nDiv<0) { nDiv=-nDiv; bNeg=!bNeg; } if (nMul==0 || nDiv==0) return; - UINT32 a; - a=UINT32(nMul); unsigned nMulZ=0; // Fuehrende Nullen zaehlen + sal_uInt32 a; + a=sal_uInt32(nMul); unsigned nMulZ=0; // Fuehrende Nullen zaehlen while (a<0x00800000) { nMulZ+=8; a<<=8; } while (a<0x80000000) { nMulZ++; a<<=1; } - a=UINT32(nDiv); unsigned nDivZ=0; // Fuehrende Nullen zaehlen + a=sal_uInt32(nDiv); unsigned nDivZ=0; // Fuehrende Nullen zaehlen while (a<0x00800000) { nDivZ+=8; a<<=8; } while (a<0x80000000) { nDivZ++; a<<=1; } // Anzahl der verwendeten Digits bestimmen @@ -948,7 +948,7 @@ void SdrFormatter::Undirty() nMul_=nMul1; nDiv_=nDiv1; nKomma_=nKomma1; - bDirty=FALSE; + bDirty=sal_False; } @@ -964,7 +964,7 @@ void SdrFormatter::TakeStr(long nVal, XubString& rStr) const } // Hier fallen trotzdem evtl. Nachkommastellen weg, wg. MulDiv statt Real - BOOL bNeg(nVal < 0); + sal_Bool bNeg(nVal < 0); SvtSysLocale aSysLoc; const LocaleDataWrapper& rLoc = aSysLoc.GetLocaleData(); diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index c6471f795644..460910cea81c 100644..100755 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -30,15 +30,15 @@ #include "precompiled_svx.hxx" #include <svx/svdundo.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdotext.hxx> #include <svx/svdobj.hxx> #include <svx/svdpage.hxx> #include <svx/svdlayer.hxx> #include <svx/svdmodel.hxx> #include <svx/svdview.hxx> -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache #include <svx/scene3d.hxx> #include <editeng/outlobj.hxx> #include <svx/svdogrp.hxx> @@ -48,7 +48,7 @@ #include <svl/whiter.hxx> #include <svx/e3dsceneupdater.hxx> -#include "svdviter.hxx" +#include "svx/svdviter.hxx" //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -58,7 +58,7 @@ static void ImplUnmarkObject( SdrObject* pObj ) SdrViewIter aIter( pObj ); for ( SdrView* pView = aIter.FirstView(); pView; pView = aIter.NextView() ) { - pView->MarkObj( pObj, pView->GetSdrPageView(), TRUE ); + pView->MarkObj( pObj, pView->GetSdrPageView(), sal_True ); } } @@ -66,11 +66,11 @@ static void ImplUnmarkObject( SdrObject* pObj ) TYPEINIT1(SdrUndoAction,SfxUndoAction); -BOOL SdrUndoAction::CanRepeat(SfxRepeatTarget& rView) const +sal_Bool SdrUndoAction::CanRepeat(SfxRepeatTarget& rView) const { SdrView* pV=PTR_CAST(SdrView,&rView); if (pV!=NULL) return CanSdrRepeat(*pV); - return FALSE; + return sal_False; } void SdrUndoAction::Repeat(SfxRepeatTarget& rView) @@ -89,7 +89,7 @@ XubString SdrUndoAction::GetRepeatComment(SfxRepeatTarget& rView) const bool SdrUndoAction::CanSdrRepeat(SdrView& /*rView*/) const { - return FALSE; + return sal_False; } void SdrUndoAction::SdrRepeat(SdrView& /*rView*/) @@ -123,7 +123,7 @@ SdrUndoGroup::~SdrUndoGroup() void SdrUndoGroup::Clear() { - for (ULONG nu=0; nu<GetActionCount(); nu++) { + for (sal_uIntPtr nu=0; nu<GetActionCount(); nu++) { SdrUndoAction* pAct=GetAction(nu); delete pAct; } @@ -137,12 +137,12 @@ void SdrUndoGroup::AddAction(SdrUndoAction* pAct) void SdrUndoGroup::push_front( SdrUndoAction* pAct ) { - aBuf.Insert(pAct, (ULONG)0 ); + aBuf.Insert(pAct, (sal_uIntPtr)0 ); } void SdrUndoGroup::Undo() { - for (ULONG nu=GetActionCount(); nu>0;) { + for (sal_uIntPtr nu=GetActionCount(); nu>0;) { nu--; SdrUndoAction* pAct=GetAction(nu); pAct->Undo(); @@ -151,7 +151,7 @@ void SdrUndoGroup::Undo() void SdrUndoGroup::Redo() { - for (ULONG nu=0; nu<GetActionCount(); nu++) { + for (sal_uIntPtr nu=0; nu<GetActionCount(); nu++) { SdrUndoAction* pAct=GetAction(nu); pAct->Redo(); } @@ -171,14 +171,14 @@ XubString SdrUndoGroup::GetComment() const bool SdrUndoGroup::CanSdrRepeat(SdrView& rView) const { switch (eFunction) { - case SDRREPFUNC_OBJ_NONE : return FALSE; + case SDRREPFUNC_OBJ_NONE : return sal_False; case SDRREPFUNC_OBJ_DELETE : return rView.AreObjectsMarked(); - case SDRREPFUNC_OBJ_COMBINE_POLYPOLY: return rView.IsCombinePossible(FALSE); - case SDRREPFUNC_OBJ_COMBINE_ONEPOLY : return rView.IsCombinePossible(TRUE); - case SDRREPFUNC_OBJ_DISMANTLE_POLYS : return rView.IsDismantlePossible(FALSE); - case SDRREPFUNC_OBJ_DISMANTLE_LINES : return rView.IsDismantlePossible(TRUE); - case SDRREPFUNC_OBJ_CONVERTTOPOLY : return rView.IsConvertToPolyObjPossible(FALSE); - case SDRREPFUNC_OBJ_CONVERTTOPATH : return rView.IsConvertToPathObjPossible(FALSE); + case SDRREPFUNC_OBJ_COMBINE_POLYPOLY: return rView.IsCombinePossible(sal_False); + case SDRREPFUNC_OBJ_COMBINE_ONEPOLY : return rView.IsCombinePossible(sal_True); + case SDRREPFUNC_OBJ_DISMANTLE_POLYS : return rView.IsDismantlePossible(sal_False); + case SDRREPFUNC_OBJ_DISMANTLE_LINES : return rView.IsDismantlePossible(sal_True); + case SDRREPFUNC_OBJ_CONVERTTOPOLY : return rView.IsConvertToPolyObjPossible(sal_False); + case SDRREPFUNC_OBJ_CONVERTTOPATH : return rView.IsConvertToPathObjPossible(sal_False); case SDRREPFUNC_OBJ_GROUP : return rView.IsGroupPossible(); case SDRREPFUNC_OBJ_UNGROUP : return rView.IsUnGroupPossible(); case SDRREPFUNC_OBJ_PUTTOTOP : return rView.IsToTopPossible(); @@ -189,7 +189,7 @@ bool SdrUndoGroup::CanSdrRepeat(SdrView& rView) const case SDRREPFUNC_OBJ_IMPORTMTF : return rView.IsImportMtfPossible(); default: break; } // switch - return FALSE; + return sal_False; } void SdrUndoGroup::SdrRepeat(SdrView& rView) @@ -199,10 +199,10 @@ void SdrUndoGroup::SdrRepeat(SdrView& rView) case SDRREPFUNC_OBJ_DELETE : rView.DeleteMarked(); break; case SDRREPFUNC_OBJ_COMBINE_POLYPOLY: rView.CombineMarkedObjects(sal_False); break; case SDRREPFUNC_OBJ_COMBINE_ONEPOLY : rView.CombineMarkedObjects(sal_True); break; - case SDRREPFUNC_OBJ_DISMANTLE_POLYS : rView.DismantleMarkedObjects(FALSE); break; - case SDRREPFUNC_OBJ_DISMANTLE_LINES : rView.DismantleMarkedObjects(TRUE); break; - case SDRREPFUNC_OBJ_CONVERTTOPOLY : rView.ConvertMarkedToPolyObj(FALSE); break; - case SDRREPFUNC_OBJ_CONVERTTOPATH : rView.ConvertMarkedToPathObj(FALSE); break; + case SDRREPFUNC_OBJ_DISMANTLE_POLYS : rView.DismantleMarkedObjects(sal_False); break; + case SDRREPFUNC_OBJ_DISMANTLE_LINES : rView.DismantleMarkedObjects(sal_True); break; + case SDRREPFUNC_OBJ_CONVERTTOPOLY : rView.ConvertMarkedToPolyObj(sal_False); break; + case SDRREPFUNC_OBJ_CONVERTTOPATH : rView.ConvertMarkedToPathObj(sal_False); break; case SDRREPFUNC_OBJ_GROUP : rView.GroupMarked(); break; case SDRREPFUNC_OBJ_UNGROUP : rView.UnGroupMarked(); break; case SDRREPFUNC_OBJ_PUTTOTOP : rView.PutMarkedToTop(); break; @@ -246,7 +246,7 @@ SdrUndoObj::SdrUndoObj(SdrObject& rNewObj): { } -void SdrUndoObj::GetDescriptionStringForObject( const SdrObject& _rForObject, USHORT nStrCacheID, String& rStr, bool bRepeat ) +void SdrUndoObj::GetDescriptionStringForObject( const SdrObject& _rForObject, sal_uInt16 nStrCacheID, String& rStr, bool bRepeat ) { rStr = ImpGetResStr(nStrCacheID); @@ -272,7 +272,7 @@ void SdrUndoObj::GetDescriptionStringForObject( const SdrObject& _rForObject, US } } -void SdrUndoObj::ImpTakeDescriptionStr(USHORT nStrCacheID, XubString& rStr, bool bRepeat) const +void SdrUndoObj::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr, bool bRepeat) const { if ( pObj ) GetDescriptionStringForObject( *pObj, nStrCacheID, rStr, bRepeat ); @@ -303,7 +303,7 @@ SdrUndoAttrObj::SdrUndoAttrObj(SdrObject& rNewObj, bool bStyleSheet1, bool bSave pUndoStyleSheet(NULL), pRedoStyleSheet(NULL), pRepeatStyleSheet(NULL), - bHaveToTakeRedoSet(TRUE), + bHaveToTakeRedoSet(sal_True), pTextUndo(NULL), // #i8508# @@ -314,8 +314,8 @@ SdrUndoAttrObj::SdrUndoAttrObj(SdrObject& rNewObj, bool bStyleSheet1, bool bSave bStyleSheet = bStyleSheet1; SdrObjList* pOL = rNewObj.GetSubList(); - BOOL bIsGroup(pOL!=NULL && pOL->GetObjCount()); - BOOL bIs3DScene(bIsGroup && pObj->ISA(E3dScene)); + sal_Bool bIsGroup(pOL!=NULL && pOL->GetObjCount()); + sal_Bool bIs3DScene(bIsGroup && pObj->ISA(E3dScene)); if(bIsGroup) { @@ -380,7 +380,7 @@ void SdrUndoAttrObj::SetRepeatAttr(const SfxItemSet& rSet) void SdrUndoAttrObj::Undo() { E3DModifySceneSnapRectUpdater aUpdater(pObj); - BOOL bIs3DScene(pObj && pObj->ISA(E3dScene)); + sal_Bool bIs3DScene(pObj && pObj->ISA(E3dScene)); // #94278# Trigger PageChangeCall ImpShowPageOfThisObject(); @@ -389,7 +389,7 @@ void SdrUndoAttrObj::Undo() { if(bHaveToTakeRedoSet) { - bHaveToTakeRedoSet = FALSE; + bHaveToTakeRedoSet = sal_False; if(pRedoSet) { @@ -414,7 +414,7 @@ void SdrUndoAttrObj::Undo() if(bStyleSheet) { pRedoStyleSheet = pObj->GetStyleSheet(); - pObj->SetStyleSheet(pUndoStyleSheet, TRUE); + pObj->SetStyleSheet(pUndoStyleSheet, sal_True); } sdr::properties::ItemChangeBroadcaster aItemChange(*pObj); @@ -481,14 +481,14 @@ void SdrUndoAttrObj::Undo() void SdrUndoAttrObj::Redo() { E3DModifySceneSnapRectUpdater aUpdater(pObj); - BOOL bIs3DScene(pObj && pObj->ISA(E3dScene)); + sal_Bool bIs3DScene(pObj && pObj->ISA(E3dScene)); if(!pUndoGroup || bIs3DScene) { if(bStyleSheet) { pUndoStyleSheet = pObj->GetStyleSheet(); - pObj->SetStyleSheet(pRedoStyleSheet, TRUE); + pObj->SetStyleSheet(pRedoStyleSheet, sal_True); } sdr::properties::ItemChangeBroadcaster aItemChange(*pObj); @@ -571,7 +571,7 @@ void SdrUndoAttrObj::SdrRepeat(SdrView& rView) { if(pRepeatSet) { - rView.SetAttrToMarked(*pRepeatSet, FALSE); + rView.SetAttrToMarked(*pRepeatSet, sal_False); } } @@ -586,11 +586,11 @@ XubString SdrUndoAttrObj::GetSdrRepeatComment(SdrView& /*rView*/) const if(bStyleSheet) { - ImpTakeDescriptionStr(STR_EditSetStylesheet, aStr, TRUE); + ImpTakeDescriptionStr(STR_EditSetStylesheet, aStr, sal_True); } else { - ImpTakeDescriptionStr(STR_EditSetAttributes, aStr, TRUE); + ImpTakeDescriptionStr(STR_EditSetAttributes, aStr, sal_True); } return aStr; @@ -634,7 +634,7 @@ bool SdrUndoMoveObj::CanSdrRepeat(SdrView& rView) const XubString SdrUndoMoveObj::GetSdrRepeatComment(SdrView& /*rView*/) const { XubString aStr; - ImpTakeDescriptionStr(STR_EditMove,aStr,TRUE); + ImpTakeDescriptionStr(STR_EditMove,aStr,sal_True); return aStr; } @@ -652,8 +652,8 @@ SdrUndoGeoObj::SdrUndoGeoObj(SdrObject& rNewObj): // Aha, Gruppenobjekt // AW: Aber keine 3D-Szene, dann nur fuer die Szene selbst den Undo anlegen pUndoGroup=new SdrUndoGroup(*pObj->GetModel()); - ULONG nObjAnz=pOL->GetObjCount(); - for (ULONG nObjNum=0; nObjNum<nObjAnz; nObjNum++) { + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + for (sal_uIntPtr nObjNum=0; nObjNum<nObjAnz; nObjNum++) { pUndoGroup->AddAction(new SdrUndoGeoObj(*pOL->GetObj(nObjNum))); } } else { @@ -721,7 +721,7 @@ XubString SdrUndoGeoObj::GetComment() const SdrUndoObjList::SdrUndoObjList(SdrObject& rNewObj, bool bOrdNumDirect) : SdrUndoObj(rNewObj), - bOwner(FALSE), + bOwner(sal_False), pView(NULL), pPageView(NULL) { @@ -738,7 +738,7 @@ SdrUndoObjList::~SdrUndoObjList() if (pObj!=NULL && IsOwner()) { // Attribute muessen wieder in den regulaeren Pool - SetOwner(FALSE); + SetOwner(sal_False); // nun loeschen SdrObject::Free( pObj ); @@ -854,14 +854,14 @@ void SdrUndoDelObj::Undo() { SdrUndoRemoveObj::Undo(); DBG_ASSERT(IsOwner(),"UndoDeleteObj: pObj gehoert nicht der UndoAction"); - SetOwner(FALSE); + SetOwner(sal_False); } void SdrUndoDelObj::Redo() { SdrUndoRemoveObj::Redo(); DBG_ASSERT(!IsOwner(),"RedoDeleteObj: pObj gehoert bereits der UndoAction"); - SetOwner(TRUE); + SetOwner(sal_True); } XubString SdrUndoDelObj::GetComment() const @@ -884,7 +884,7 @@ bool SdrUndoDelObj::CanSdrRepeat(SdrView& rView) const XubString SdrUndoDelObj::GetSdrRepeatComment(SdrView& /*rView*/) const { XubString aStr; - ImpTakeDescriptionStr(STR_EditDelete,aStr,TRUE); + ImpTakeDescriptionStr(STR_EditDelete,aStr,sal_True); return aStr; } @@ -894,14 +894,14 @@ void SdrUndoNewObj::Undo() { SdrUndoInsertObj::Undo(); DBG_ASSERT(!IsOwner(),"RedoNewObj: pObj gehoert bereits der UndoAction"); - SetOwner(TRUE); + SetOwner(sal_True); } void SdrUndoNewObj::Redo() { SdrUndoInsertObj::Redo(); DBG_ASSERT(IsOwner(),"RedoNewObj: pObj gehoert nicht der UndoAction"); - SetOwner(FALSE); + SetOwner(sal_False); } String SdrUndoNewObj::GetComment( const SdrObject& _rForObject ) @@ -920,11 +920,11 @@ XubString SdrUndoNewObj::GetComment() const SdrUndoReplaceObj::SdrUndoReplaceObj(SdrObject& rOldObj1, SdrObject& rNewObj1, bool bOrdNumDirect) : SdrUndoObj(rOldObj1), - bOldOwner(FALSE), - bNewOwner(FALSE), + bOldOwner(sal_False), + bNewOwner(sal_False), pNewObj(&rNewObj1) { - SetOldOwner(TRUE); + SetOldOwner(sal_True); pObjList=pObj->GetObjList(); if (bOrdNumDirect) { @@ -939,7 +939,7 @@ SdrUndoReplaceObj::~SdrUndoReplaceObj() if (pObj!=NULL && IsOldOwner()) { // Attribute muessen wieder in den regulaeren Pool - SetOldOwner(FALSE); + SetOldOwner(sal_False); // nun loeschen SdrObject::Free( pObj ); @@ -947,7 +947,7 @@ SdrUndoReplaceObj::~SdrUndoReplaceObj() if (pNewObj!=NULL && IsNewOwner()) { // Attribute muessen wieder in den regulaeren Pool - SetNewOwner(FALSE); + SetNewOwner(sal_False); // nun loeschen SdrObject::Free( pNewObj ); @@ -963,8 +963,8 @@ void SdrUndoReplaceObj::Undo() { DBG_ASSERT(!pObj->IsInserted(),"SdrUndoReplaceObj::Undo(): Altes Objekt ist bereits inserted!"); DBG_ASSERT(pNewObj->IsInserted(),"SdrUndoReplaceObj::Undo(): Neues Objekt ist nicht inserted!"); - SetOldOwner(FALSE); - SetNewOwner(TRUE); + SetOldOwner(sal_False); + SetNewOwner(sal_True); ImplUnmarkObject( pNewObj ); pObjList->ReplaceObject(pObj,nOrdNum); @@ -981,8 +981,8 @@ void SdrUndoReplaceObj::Redo() { DBG_ASSERT(!pNewObj->IsInserted(),"SdrUndoReplaceObj::Redo(): Neues Objekt ist bereits inserted!"); DBG_ASSERT(pObj->IsInserted(),"SdrUndoReplaceObj::Redo(): Altes Objekt ist nicht inserted!"); - SetOldOwner(TRUE); - SetNewOwner(FALSE); + SetOldOwner(sal_True); + SetNewOwner(sal_False); ImplUnmarkObject( pObj ); pObjList->ReplaceObject(pNewObj,nOrdNum); @@ -1040,7 +1040,7 @@ void SdrUndoObjectLayerChange::Redo() //////////////////////////////////////////////////////////////////////////////////////////////////// -SdrUndoObjOrdNum::SdrUndoObjOrdNum(SdrObject& rNewObj, UINT32 nOldOrdNum1, UINT32 nNewOrdNum1): +SdrUndoObjOrdNum::SdrUndoObjOrdNum(SdrObject& rNewObj, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1): SdrUndoObj(rNewObj), nOldOrdNum(nOldOrdNum1), nNewOrdNum(nNewOrdNum1) @@ -1086,8 +1086,8 @@ SdrUndoObjSetText::SdrUndoObjSetText(SdrObject& rNewObj, sal_Int32 nText) : SdrUndoObj(rNewObj) , pOldText(NULL) , pNewText(NULL) -, bNewTextAvailable(FALSE) -, bEmptyPresObj(FALSE) +, bNewTextAvailable(sal_False) +, bEmptyPresObj(sal_False) , mnText(nText) { SdrText* pText = static_cast< SdrTextObj*>( &rNewObj )->getText(mnText); @@ -1112,7 +1112,7 @@ void SdrUndoObjSetText::AfterSetText() SdrText* pText = static_cast< SdrTextObj*>( pObj )->getText(mnText); if( pText && pText->GetOutlinerParaObject() ) pNewText = new OutlinerParaObject(*pText->GetOutlinerParaObject()); - bNewTextAvailable=TRUE; + bNewTextAvailable=sal_True; } } @@ -1184,8 +1184,8 @@ void SdrUndoObjSetText::SdrRepeat(SdrView& rView) rView.BegUndo(aStr); } - ULONG nAnz=rML.GetMarkCount(); - for (ULONG nm=0; nm<nAnz; nm++) + sal_uIntPtr nAnz=rML.GetMarkCount(); + for (sal_uIntPtr nm=0; nm<nAnz; nm++) { SdrObject* pObj2=rML.GetMark(nm)->GetMarkedSdrObj(); SdrTextObj* pTextObj=PTR_CAST(SdrTextObj,pObj2); @@ -1210,7 +1210,7 @@ bool SdrUndoObjSetText::CanSdrRepeat(SdrView& rView) const { bool bOk = false; if (bNewTextAvailable && rView.AreObjectsMarked()) { - bOk=TRUE; + bOk=sal_True; } return bOk; } @@ -1318,12 +1318,12 @@ String SdrUndoObjStrAttr::GetComment() const //////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////// -SdrUndoLayer::SdrUndoLayer(USHORT nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel): +SdrUndoLayer::SdrUndoLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel): SdrUndoAction(rNewModel), pLayer(rNewLayerAdmin.GetLayer(nLayerNum)), pLayerAdmin(&rNewLayerAdmin), nNum(nLayerNum), - bItsMine(FALSE) + bItsMine(sal_False) { } @@ -1339,7 +1339,7 @@ SdrUndoLayer::~SdrUndoLayer() void SdrUndoNewLayer::Undo() { DBG_ASSERT(!bItsMine,"SdrUndoNewLayer::Undo(): Layer gehoert bereits der UndoAction"); - bItsMine=TRUE; + bItsMine=sal_True; #ifdef DBG_UTIL SdrLayer* pCmpLayer= #endif @@ -1350,7 +1350,7 @@ void SdrUndoNewLayer::Undo() void SdrUndoNewLayer::Redo() { DBG_ASSERT(bItsMine,"SdrUndoNewLayer::Undo(): Layer gehoert nicht der UndoAction"); - bItsMine=FALSE; + bItsMine=sal_False; pLayerAdmin->InsertLayer(pLayer,nNum); } @@ -1364,14 +1364,14 @@ XubString SdrUndoNewLayer::GetComment() const void SdrUndoDelLayer::Undo() { DBG_ASSERT(bItsMine,"SdrUndoDelLayer::Undo(): Layer gehoert nicht der UndoAction"); - bItsMine=FALSE; + bItsMine=sal_False; pLayerAdmin->InsertLayer(pLayer,nNum); } void SdrUndoDelLayer::Redo() { DBG_ASSERT(!bItsMine,"SdrUndoDelLayer::Undo(): Layer gehoert bereits der UndoAction"); - bItsMine=TRUE; + bItsMine=sal_True; #ifdef DBG_UTIL SdrLayer* pCmpLayer= #endif @@ -1431,7 +1431,7 @@ SdrUndoPage::SdrUndoPage(SdrPage& rNewPg) { } -void SdrUndoPage::ImpInsertPage(USHORT nNum) +void SdrUndoPage::ImpInsertPage(sal_uInt16 nNum) { DBG_ASSERT(!mrPage.IsInserted(),"SdrUndoPage::ImpInsertPage(): mrPage ist bereits Inserted"); if (!mrPage.IsInserted()) { @@ -1443,7 +1443,7 @@ void SdrUndoPage::ImpInsertPage(USHORT nNum) } } -void SdrUndoPage::ImpRemovePage(USHORT nNum) +void SdrUndoPage::ImpRemovePage(sal_uInt16 nNum) { DBG_ASSERT(mrPage.IsInserted(),"SdrUndoPage::ImpRemovePage(): mrPage ist nicht Inserted"); if (mrPage.IsInserted()) { @@ -1458,7 +1458,7 @@ void SdrUndoPage::ImpRemovePage(USHORT nNum) } } -void SdrUndoPage::ImpMovePage(USHORT nOldNum, USHORT nNewNum) +void SdrUndoPage::ImpMovePage(sal_uInt16 nOldNum, sal_uInt16 nNewNum) { DBG_ASSERT(mrPage.IsInserted(),"SdrUndoPage::ImpMovePage(): mrPage ist nicht Inserted"); if (mrPage.IsInserted()) { @@ -1470,7 +1470,7 @@ void SdrUndoPage::ImpMovePage(USHORT nOldNum, USHORT nNewNum) } } -void SdrUndoPage::ImpTakeDescriptionStr(USHORT nStrCacheID, XubString& rStr, USHORT /*n*/, bool /*bRepeat*/) const +void SdrUndoPage::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr, sal_uInt16 /*n*/, bool /*bRepeat*/) const { rStr=ImpGetResStr(nStrCacheID); } @@ -1479,7 +1479,7 @@ void SdrUndoPage::ImpTakeDescriptionStr(USHORT nStrCacheID, XubString& rStr, USH SdrUndoPageList::SdrUndoPageList(SdrPage& rNewPg): SdrUndoPage(rNewPg), - bItsMine(FALSE) + bItsMine(sal_False) { nPageNum=rNewPg.GetPageNum(); } @@ -1498,7 +1498,7 @@ SdrUndoDelPage::SdrUndoDelPage(SdrPage& rNewPg): SdrUndoPageList(rNewPg), pUndoGroup(NULL) { - bItsMine = TRUE; + bItsMine = sal_True; // Und nun ggf. die MasterPage-Beziehungen merken if(mrPage.IsMasterPage()) @@ -1541,7 +1541,7 @@ void SdrUndoDelPage::Undo() pUndoGroup->Undo(); } DBG_ASSERT(bItsMine,"UndoDeletePage: mrPage gehoert nicht der UndoAction"); - bItsMine=FALSE; + bItsMine=sal_False; } void SdrUndoDelPage::Redo() @@ -1549,20 +1549,20 @@ void SdrUndoDelPage::Redo() ImpRemovePage(nPageNum); // Die MasterPage-Beziehungen werden ggf. von selbst geloesst DBG_ASSERT(!bItsMine,"RedoDeletePage: mrPage gehoert bereits der UndoAction"); - bItsMine=TRUE; + bItsMine=sal_True; } XubString SdrUndoDelPage::GetComment() const { XubString aStr; - ImpTakeDescriptionStr(STR_UndoDelPage,aStr,0,FALSE); + ImpTakeDescriptionStr(STR_UndoDelPage,aStr,0,sal_False); return aStr; } XubString SdrUndoDelPage::GetSdrRepeatComment(SdrView& /*rView*/) const { XubString aStr; - ImpTakeDescriptionStr(STR_UndoDelPage,aStr,0,FALSE); + ImpTakeDescriptionStr(STR_UndoDelPage,aStr,0,sal_False); return aStr; } @@ -1581,20 +1581,20 @@ void SdrUndoNewPage::Undo() { ImpRemovePage(nPageNum); DBG_ASSERT(!bItsMine,"UndoNewPage: mrPage gehoert bereits der UndoAction"); - bItsMine=TRUE; + bItsMine=sal_True; } void SdrUndoNewPage::Redo() { ImpInsertPage(nPageNum); DBG_ASSERT(bItsMine,"RedoNewPage: mrPage gehoert nicht der UndoAction"); - bItsMine=FALSE; + bItsMine=sal_False; } XubString SdrUndoNewPage::GetComment() const { XubString aStr; - ImpTakeDescriptionStr(STR_UndoNewPage,aStr,0,FALSE); + ImpTakeDescriptionStr(STR_UndoNewPage,aStr,0,sal_False); return aStr; } @@ -1603,14 +1603,14 @@ XubString SdrUndoNewPage::GetComment() const XubString SdrUndoCopyPage::GetComment() const { XubString aStr; - ImpTakeDescriptionStr(STR_UndoCopPage,aStr,0,FALSE); + ImpTakeDescriptionStr(STR_UndoCopPage,aStr,0,sal_False); return aStr; } XubString SdrUndoCopyPage::GetSdrRepeatComment(SdrView& /*rView*/) const { XubString aStr; - ImpTakeDescriptionStr(STR_UndoCopPage,aStr,0,FALSE); + ImpTakeDescriptionStr(STR_UndoCopPage,aStr,0,sal_False); return aStr; } @@ -1639,7 +1639,7 @@ void SdrUndoSetPageNum::Redo() XubString SdrUndoSetPageNum::GetComment() const { XubString aStr; - ImpTakeDescriptionStr(STR_UndoMovPage,aStr,0,FALSE); + ImpTakeDescriptionStr(STR_UndoMovPage,aStr,0,sal_False); return aStr; } @@ -1695,7 +1695,7 @@ void SdrUndoPageRemoveMasterPage::Redo() XubString SdrUndoPageRemoveMasterPage::GetComment() const { XubString aStr; - ImpTakeDescriptionStr(STR_UndoDelPageMasterDscr,aStr,0,FALSE); + ImpTakeDescriptionStr(STR_UndoDelPageMasterDscr,aStr,0,sal_False); return aStr; } @@ -1740,7 +1740,7 @@ void SdrUndoPageChangeMasterPage::Redo() XubString SdrUndoPageChangeMasterPage::GetComment() const { XubString aStr; - ImpTakeDescriptionStr(STR_UndoChgPageMasterDscr,aStr,0,FALSE); + ImpTakeDescriptionStr(STR_UndoChgPageMasterDscr,aStr,0,sal_False); return aStr; } @@ -1764,32 +1764,32 @@ SdrUndoAction* SdrUndoFactory::CreateUndoGeoObject( SdrObject& rObject ) SdrUndoAction* SdrUndoFactory::CreateUndoAttrObject( SdrObject& rObject, bool bStyleSheet1, bool bSaveText ) { - return new SdrUndoAttrObj( rObject, bStyleSheet1 ? TRUE : FALSE, bSaveText ? TRUE : FALSE ); + return new SdrUndoAttrObj( rObject, bStyleSheet1 ? sal_True : sal_False, bSaveText ? sal_True : sal_False ); } SdrUndoAction* SdrUndoFactory::CreateUndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect ) { - return new SdrUndoRemoveObj( rObject, bOrdNumDirect ? TRUE : FALSE ); + return new SdrUndoRemoveObj( rObject, bOrdNumDirect ? sal_True : sal_False ); } SdrUndoAction* SdrUndoFactory::CreateUndoInsertObject( SdrObject& rObject, bool bOrdNumDirect ) { - return new SdrUndoInsertObj( rObject, bOrdNumDirect ? TRUE : FALSE ); + return new SdrUndoInsertObj( rObject, bOrdNumDirect ? sal_True : sal_False ); } SdrUndoAction* SdrUndoFactory::CreateUndoDeleteObject( SdrObject& rObject, bool bOrdNumDirect ) { - return new SdrUndoDelObj( rObject, bOrdNumDirect ? TRUE : FALSE ); + return new SdrUndoDelObj( rObject, bOrdNumDirect ? sal_True : sal_False ); } SdrUndoAction* SdrUndoFactory::CreateUndoNewObject( SdrObject& rObject, bool bOrdNumDirect ) { - return new SdrUndoNewObj( rObject, bOrdNumDirect ? TRUE : FALSE ); + return new SdrUndoNewObj( rObject, bOrdNumDirect ? sal_True : sal_False ); } SdrUndoAction* SdrUndoFactory::CreateUndoCopyObject( SdrObject& rObject, bool bOrdNumDirect ) { - return new SdrUndoCopyObj( rObject, bOrdNumDirect ? TRUE : FALSE ); + return new SdrUndoCopyObj( rObject, bOrdNumDirect ? sal_True : sal_False ); } SdrUndoAction* SdrUndoFactory::CreateUndoObjectOrdNum( SdrObject& rObject, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1) @@ -1799,7 +1799,7 @@ SdrUndoAction* SdrUndoFactory::CreateUndoObjectOrdNum( SdrObject& rObject, sal_u SdrUndoAction* SdrUndoFactory::CreateUndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject, bool bOrdNumDirect ) { - return new SdrUndoReplaceObj( rOldObject, rNewObject, bOrdNumDirect ? TRUE : FALSE ); + return new SdrUndoReplaceObj( rOldObject, rNewObject, bOrdNumDirect ? sal_True : sal_False ); } SdrUndoAction* SdrUndoFactory::CreateUndoObjectLayerChange( SdrObject& rObject, SdrLayerID aOldLayer, SdrLayerID aNewLayer ) diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index 9ce94cd5c3e5..e77265155642 100644..100755 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -30,8 +30,8 @@ #include "precompiled_svx.hxx" #include <editeng/eeitem.hxx> -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache #include <svx/svdpagv.hxx> #include <svx/svdmrkv.hxx> #include <svx/svdedxv.hxx> @@ -56,7 +56,7 @@ #include <tools/tenccvt.hxx> #include <svx/sdr/overlay/overlaypolypolygon.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svx/sdrpagewindow.hxx> #include <svx/sdrhittesthelper.hxx> @@ -77,20 +77,20 @@ SdrViewEvent::SdrViewEvent() nMouseCode(0), nHlplIdx(0), nGlueId(0), - bMouseDown(FALSE), - bMouseUp(FALSE), - bDoubleHdlSize(FALSE), - bIsAction(FALSE), - bIsTextEdit(FALSE), - bTextEditHit(FALSE), - bAddMark(FALSE), - bUnmark(FALSE), - bPrevNextMark(FALSE), - bMarkPrev(FALSE), - bInsPointNewObj(FALSE), - bDragWithCopy(FALSE), - bCaptureMouse(FALSE), - bReleaseMouse(FALSE) + bMouseDown(sal_False), + bMouseUp(sal_False), + bDoubleHdlSize(sal_False), + bIsAction(sal_False), + bIsTextEdit(sal_False), + bTextEditHit(sal_False), + bAddMark(sal_False), + bUnmark(sal_False), + bPrevNextMark(sal_False), + bMarkPrev(sal_False), + bInsPointNewObj(sal_False), + bDragWithCopy(sal_False), + bCaptureMouse(sal_False), + bReleaseMouse(sal_False) { } @@ -176,12 +176,12 @@ TYPEINIT1(SdrView,SdrCreateView); SdrView::SdrView(SdrModel* pModel1, OutputDevice* pOut) : SdrCreateView(pModel1,pOut), - bNoExtendedMouseDispatcher(FALSE), - bNoExtendedKeyDispatcher(FALSE), - bNoExtendedCommandDispatcher(FALSE), + bNoExtendedMouseDispatcher(sal_False), + bNoExtendedKeyDispatcher(sal_False), + bNoExtendedCommandDispatcher(sal_False), mbMasterPagePaintCaching(sal_False) { - bTextEditOnObjectsWithoutTextIfTextTool=FALSE; + bTextEditOnObjectsWithoutTextIfTextTool=sal_False; maAccessibilityOptions.AddListener(this); @@ -193,12 +193,12 @@ SdrView::~SdrView() maAccessibilityOptions.RemoveListener(this); } -BOOL SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin) +sal_Bool SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin) { SetActualWin(pWin); - BOOL bRet=SdrCreateView::KeyInput(rKEvt,pWin); + sal_Bool bRet=SdrCreateView::KeyInput(rKEvt,pWin); if (!bRet && !IsExtendedKeyInputDispatcherEnabled()) { - bRet=TRUE; + bRet=sal_True; switch (rKEvt.GetKeyCode().GetFullFunction()) { case KEYFUNC_CUT : Cut(); break; case KEYFUNC_COPY : Yank(); break; @@ -222,7 +222,7 @@ BOOL SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin) case KEY_BACKSPACE+KEY_MOD2+KEY_SHIFT: pMod->Redo(); break; case KEY_REPEAT: case KEY_BACKSPACE+KEY_MOD2+KEY_MOD1: pMod->Repeat(*this); break; case KEY_MOD1+KEY_A: MarkAll(); break; - default: bRet=FALSE; + default: bRet=sal_False; } // switch } } // switch @@ -236,11 +236,11 @@ BOOL SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin) return bRet; } -BOOL SdrView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin) +sal_Bool SdrView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin) { SetActualWin(pWin); - if (rMEvt.IsLeft()) aDragStat.SetMouseDown(TRUE); - BOOL bRet=SdrCreateView::MouseButtonDown(rMEvt,pWin); + if (rMEvt.IsLeft()) aDragStat.SetMouseDown(sal_True); + sal_Bool bRet=SdrCreateView::MouseButtonDown(rMEvt,pWin); if (!bRet && !IsExtendedMouseEventDispatcherEnabled()) { SdrViewEvent aVEvt; PickAnything(rMEvt,SDRMOUSEBUTTONDOWN,aVEvt); @@ -249,12 +249,12 @@ BOOL SdrView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin) return bRet; } -BOOL SdrView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin) +sal_Bool SdrView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin) { SetActualWin(pWin); - if (rMEvt.IsLeft()) aDragStat.SetMouseDown(FALSE); - BOOL bAction=IsAction(); - BOOL bRet=!bAction && SdrCreateView::MouseButtonUp(rMEvt,pWin); + if (rMEvt.IsLeft()) aDragStat.SetMouseDown(sal_False); + sal_Bool bAction=IsAction(); + sal_Bool bRet=!bAction && SdrCreateView::MouseButtonUp(rMEvt,pWin); if (!bRet && !IsExtendedMouseEventDispatcherEnabled()) { SdrViewEvent aVEvt; PickAnything(rMEvt,SDRMOUSEBUTTONUP,aVEvt); @@ -263,15 +263,15 @@ BOOL SdrView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin) return bRet; } -BOOL SdrView::MouseMove(const MouseEvent& rMEvt, Window* pWin) +sal_Bool SdrView::MouseMove(const MouseEvent& rMEvt, Window* pWin) { SetActualWin(pWin); aDragStat.SetMouseDown(rMEvt.IsLeft()); - BOOL bRet=SdrCreateView::MouseMove(rMEvt,pWin); + sal_Bool bRet=SdrCreateView::MouseMove(rMEvt,pWin); if (!IsExtendedMouseEventDispatcherEnabled() && !IsTextEditInSelectionMode()) { SdrViewEvent aVEvt; PickAnything(rMEvt,SDRMOUSEMOVE,aVEvt); - if (DoMouseEvent(aVEvt)) bRet=TRUE; + if (DoMouseEvent(aVEvt)) bRet=sal_True; } // #87792# Removed code which did let the mouse snap on object @@ -280,26 +280,26 @@ BOOL SdrView::MouseMove(const MouseEvent& rMEvt, Window* pWin) return bRet; } -BOOL SdrView::Command(const CommandEvent& rCEvt, Window* pWin) +sal_Bool SdrView::Command(const CommandEvent& rCEvt, Window* pWin) { SetActualWin(pWin); - BOOL bRet=SdrCreateView::Command(rCEvt,pWin); + sal_Bool bRet=SdrCreateView::Command(rCEvt,pWin); return bRet; } /* new interface src537 */ -BOOL SdrView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) const +sal_Bool SdrView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const { return SdrCreateView::GetAttributes(rTargetSet, bOnlyHardAttr); } SfxStyleSheet* SdrView::GetStyleSheet() const { - //BOOL bOk=FALSE; + //sal_Bool bOk=sal_False; return SdrCreateView::GetStyleSheet(); //bOk); } -SdrHitKind SdrView::PickAnything(const MouseEvent& rMEvt, USHORT nEventKind, SdrViewEvent& rVEvt) const +SdrHitKind SdrView::PickAnything(const MouseEvent& rMEvt, sal_uInt16 nEventKind, SdrViewEvent& rVEvt) const { rVEvt.bMouseDown=nEventKind==SDRMOUSEBUTTONDOWN; rVEvt.bMouseUp=nEventKind==SDRMOUSEBUTTONUP; @@ -353,29 +353,29 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co // #i73628# Use a non-changeable copy of he logic pos const Point aLocalLogicPosition(rLogicPos); - BOOL bEditMode=IsEditMode(); - BOOL bPointMode=bEditMode && HasMarkablePoints(); - BOOL bGluePointMode=IsGluePointEditMode(); - BOOL bInsPolyPt=bPointMode && IsInsObjPointMode() && IsInsObjPointPossible(); - BOOL bInsGluePt=bGluePointMode && IsInsGluePointMode() && IsInsGluePointPossible(); - BOOL bIsTextEdit=IsTextEdit(); - BOOL bTextEditHit=IsTextEditHit(aLocalLogicPosition,0/*nHitTolLog*/); - BOOL bTextEditSel=IsTextEditInSelectionMode(); - BOOL bShift=(rVEvt.nMouseCode & KEY_SHIFT) !=0; - BOOL bCtrl=(rVEvt.nMouseCode & KEY_MOD1) !=0; - BOOL bAlt=(rVEvt.nMouseCode & KEY_MOD2) !=0; + sal_Bool bEditMode=IsEditMode(); + sal_Bool bPointMode=bEditMode && HasMarkablePoints(); + sal_Bool bGluePointMode=IsGluePointEditMode(); + sal_Bool bInsPolyPt=bPointMode && IsInsObjPointMode() && IsInsObjPointPossible(); + sal_Bool bInsGluePt=bGluePointMode && IsInsGluePointMode() && IsInsGluePointPossible(); + sal_Bool bIsTextEdit=IsTextEdit(); + sal_Bool bTextEditHit=IsTextEditHit(aLocalLogicPosition,0/*nHitTolLog*/); + sal_Bool bTextEditSel=IsTextEditInSelectionMode(); + sal_Bool bShift=(rVEvt.nMouseCode & KEY_SHIFT) !=0; + sal_Bool bCtrl=(rVEvt.nMouseCode & KEY_MOD1) !=0; + sal_Bool bAlt=(rVEvt.nMouseCode & KEY_MOD2) !=0; SdrHitKind eHit=SDRHIT_NONE; SdrHdl* pHdl=pOut!=NULL && !bTextEditSel ? PickHandle(aLocalLogicPosition) : NULL; SdrPageView* pPV=NULL; SdrObject* pObj=NULL; SdrObject* pHitObj=NULL; - USHORT nHitPassNum=0; - USHORT nHlplIdx=0; - USHORT nGlueId=0; + sal_uInt16 nHitPassNum=0; + sal_uInt16 nHlplIdx=0; + sal_uInt16 nGlueId=0; if (bTextEditHit || bTextEditSel) { eHit=SDRHIT_TEXTEDIT; - bTextEditHit=TRUE; + bTextEditHit=sal_True; } else if (pHdl!=NULL) { @@ -437,8 +437,8 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co if (IsMacroMode() && eHit==SDRHIT_UNMARKEDOBJECT) { bool bRoot=pObj->HasMacro(); - BOOL bDeep=pObj!=pHitObj && pHitObj->HasMacro(); - BOOL bMid=FALSE; // Gruppierte Gruppe mit Macro getroffen? + sal_Bool bDeep=pObj!=pHitObj && pHitObj->HasMacro(); + sal_Bool bMid=sal_False; // Gruppierte Gruppe mit Macro getroffen? SdrObject* pMidObj=NULL; if (pObj!=pHitObj) { @@ -449,7 +449,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co { if (pObjTmp->HasMacro()) { - bMid=TRUE; + bMid=sal_True; pMidObj=pObjTmp; } pObjTmp=pObjTmp->GetUpGroup(); @@ -495,7 +495,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co if( pTextObj->GetModel() ) pOutliner = &pTextObj->GetModel()->GetHitTestOutliner(); - pTextObj->TakeTextRect( *pOutliner, aTextRect, FALSE, &aAnchor, FALSE ); + pTextObj->TakeTextRect( *pOutliner, aTextRect, sal_False, &aAnchor, sal_False ); // #i73628# Use a text-relative position for hit test in hit test outliner Point aTemporaryTextRelativePosition(aLocalLogicPosition - aTextRect.TopLeft()); @@ -568,7 +568,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co // TextEdit an Objekten im gesperrten Layer if (pPV->GetLockedLayers().IsSet(pHitObj->GetLayer())) { - bTEHit=FALSE; + bTEHit=sal_False; } if (bTEHit) @@ -584,12 +584,12 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co pObj=NULL; pPV=NULL; } - BOOL bMouseLeft=(rVEvt.nMouseCode&MOUSE_LEFT)!=0; - BOOL bMouseRight=(rVEvt.nMouseCode&MOUSE_RIGHT)!=0; - BOOL bMouseDown=rVEvt.bMouseDown; - BOOL bMouseUp=rVEvt.bMouseUp; + sal_Bool bMouseLeft=(rVEvt.nMouseCode&MOUSE_LEFT)!=0; + sal_Bool bMouseRight=(rVEvt.nMouseCode&MOUSE_RIGHT)!=0; + sal_Bool bMouseDown=rVEvt.bMouseDown; + sal_Bool bMouseUp=rVEvt.bMouseUp; SdrEventKind eEvent=SDREVENT_NONE; - BOOL bIsAction=IsAction(); + sal_Bool bIsAction=IsAction(); if (bIsAction) { @@ -658,21 +658,21 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co else if (eHit==SDRHIT_HANDLE) { eEvent=SDREVENT_BEGDRAGOBJ; // Mark+Drag,AddMark+Drag,DeepMark+Drag,Unmark - BOOL bGlue=pHdl->GetKind()==HDL_GLUE; - BOOL bPoly=!bGlue && IsPointMarkable(*pHdl); - BOOL bMarked=bGlue || (bPoly && pHdl->IsSelected()); + sal_Bool bGlue=pHdl->GetKind()==HDL_GLUE; + sal_Bool bPoly=!bGlue && IsPointMarkable(*pHdl); + sal_Bool bMarked=bGlue || (bPoly && pHdl->IsSelected()); if (bGlue || bPoly) { eEvent=bGlue ? SDREVENT_MARKGLUEPOINT : SDREVENT_MARKPOINT; if (MODKEY_DeepMark) { - rVEvt.bAddMark=TRUE; - rVEvt.bPrevNextMark=TRUE; + rVEvt.bAddMark=sal_True; + rVEvt.bPrevNextMark=sal_True; rVEvt.bMarkPrev=MODKEY_DeepBackw; } else if (MODKEY_MultiMark) { - rVEvt.bAddMark=TRUE; + rVEvt.bAddMark=sal_True; rVEvt.bUnmark=bMarked; // Toggle if (bGlue) { @@ -778,23 +778,23 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co return eHit; } -BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) +sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) { - BOOL bRet=FALSE; + sal_Bool bRet=sal_False; SdrHitKind eHit=rVEvt.eHit; Point aLogicPos(rVEvt.aLogicPos); - BOOL bShift=(rVEvt.nMouseCode & KEY_SHIFT) !=0; - BOOL bCtrl=(rVEvt.nMouseCode & KEY_MOD1) !=0; - BOOL bAlt=(rVEvt.nMouseCode & KEY_MOD2) !=0; - BOOL bMouseLeft=(rVEvt.nMouseCode&MOUSE_LEFT)!=0; - //BOOL bMouseRight=(rVEvt.nMouseCode&MOUSE_RIGHT)!=0; - BOOL bMouseDown=rVEvt.bMouseDown; - BOOL bMouseUp=rVEvt.bMouseUp; + sal_Bool bShift=(rVEvt.nMouseCode & KEY_SHIFT) !=0; + sal_Bool bCtrl=(rVEvt.nMouseCode & KEY_MOD1) !=0; + sal_Bool bAlt=(rVEvt.nMouseCode & KEY_MOD2) !=0; + sal_Bool bMouseLeft=(rVEvt.nMouseCode&MOUSE_LEFT)!=0; + //sal_Bool bMouseRight=(rVEvt.nMouseCode&MOUSE_RIGHT)!=0; + sal_Bool bMouseDown=rVEvt.bMouseDown; + sal_Bool bMouseUp=rVEvt.bMouseUp; if (bMouseDown) { - if (bMouseLeft) aDragStat.SetMouseDown(TRUE); + if (bMouseLeft) aDragStat.SetMouseDown(sal_True); } else if (bMouseUp) { - if (bMouseLeft) aDragStat.SetMouseDown(FALSE); + if (bMouseLeft) aDragStat.SetMouseDown(sal_False); } else { // ansonsten MoueMove aDragStat.SetMouseDown(bMouseLeft); } @@ -825,13 +825,13 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) // sein muesste (wg. eHit). } switch (rVEvt.eEvent) { - case SDREVENT_NONE: bRet=FALSE; break; - case SDREVENT_TEXTEDIT: bRet=FALSE; break; // Events an die OutlinerView werden hier nicht beruecksichtigt - case SDREVENT_MOVACTION: MovAction(aLogicPos); bRet=TRUE; break; - case SDREVENT_ENDACTION: EndAction(); bRet=TRUE; break; - case SDREVENT_BCKACTION: BckAction(); bRet=TRUE; break; - case SDREVENT_BRKACTION: BrkAction(); bRet=TRUE; break; - case SDREVENT_ENDMARK : EndAction(); bRet=TRUE; break; + case SDREVENT_NONE: bRet=sal_False; break; + case SDREVENT_TEXTEDIT: bRet=sal_False; break; // Events an die OutlinerView werden hier nicht beruecksichtigt + case SDREVENT_MOVACTION: MovAction(aLogicPos); bRet=sal_True; break; + case SDREVENT_ENDACTION: EndAction(); bRet=sal_True; break; + case SDREVENT_BCKACTION: BckAction(); bRet=sal_True; break; + case SDREVENT_BRKACTION: BrkAction(); bRet=sal_True; break; + case SDREVENT_ENDMARK : EndAction(); bRet=sal_True; break; case SDREVENT_BRKMARK : { BrkAction(); if (!MarkObj(aLogicPos,nHitTolLog,rVEvt.bAddMark)) { @@ -841,7 +841,7 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) // - und ansonsten Objekte if (!rVEvt.bAddMark) UnmarkAll(); } - bRet=TRUE; + bRet=sal_True; } break; case SDREVENT_ENDCREATE: { // ggf. MarkObj SdrCreateCmd eCmd=SDRCREATE_NEXTPOINT; @@ -852,7 +852,7 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) MarkObj(rVEvt.pRootObj,rVEvt.pPV); if (eHit==SDRHIT_TEXTEDIT) { - BOOL bRet2(pActualOutDev && OUTDEV_WINDOW == pActualOutDev->GetOutDevType() && + sal_Bool bRet2(pActualOutDev && OUTDEV_WINDOW == pActualOutDev->GetOutDevType() && SdrBeginTextEdit(rVEvt.pObj, rVEvt.pPV, (Window*)pActualOutDev, sal_False, (SdrOutliner*)0L)); if(bRet2) @@ -867,9 +867,9 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) } } } - bRet=TRUE; // Obj markiert und ggf. TextEdit gestartet - } else bRet=FALSE; // Create abgebrochen, sonst nix weiter. - } else bRet=TRUE; // EndCreate mit TRUE returniert + bRet=sal_True; // Obj markiert und ggf. TextEdit gestartet + } else bRet=sal_False; // Create abgebrochen, sonst nix weiter. + } else bRet=sal_True; // EndCreate mit sal_True returniert } break; case SDREVENT_ENDDRAG: { bRet=EndDragObj(IsDragWithCopy()); @@ -877,20 +877,20 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) } break; case SDREVENT_MARKOBJ: { // + ggf. BegDrag if (!rVEvt.bAddMark) UnmarkAllObj(); - BOOL bUnmark=rVEvt.bUnmark; + sal_Bool bUnmark=rVEvt.bUnmark; if (rVEvt.bPrevNextMark) { bRet=MarkNextObj(aLogicPos,nHitTolLog,rVEvt.bMarkPrev); } else { SortMarkedObjects(); - ULONG nAnz0=GetMarkedObjectCount(); + sal_uIntPtr nAnz0=GetMarkedObjectCount(); bRet=MarkObj(aLogicPos,nHitTolLog,rVEvt.bAddMark); SortMarkedObjects(); - ULONG nAnz1=GetMarkedObjectCount(); + sal_uIntPtr nAnz1=GetMarkedObjectCount(); bUnmark=nAnz1<nAnz0; } if (!bUnmark) { BegDragObj(aLogicPos,NULL,(SdrHdl*)NULL,nMinMovLog); - bRet=TRUE; + bRet=sal_True; } } break; case SDREVENT_MARKPOINT: { // + ggf. BegDrag @@ -902,7 +902,7 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) } if (!rVEvt.bUnmark && !rVEvt.bPrevNextMark) { BegDragObj(aLogicPos,NULL,rVEvt.pHdl,nMinMovLog); - bRet=TRUE; + bRet=sal_True; } } break; case SDREVENT_MARKGLUEPOINT: { // + ggf. BegDrag @@ -915,7 +915,7 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) if (!rVEvt.bUnmark && !rVEvt.bPrevNextMark) { SdrHdl* pHdl=GetGluePointHdl(rVEvt.pObj,rVEvt.nGlueId); BegDragObj(aLogicPos,NULL,pHdl,nMinMovLog); - bRet=TRUE; + bRet=sal_True; } } break; case SDREVENT_BEGMARK: bRet=BegMark(aLogicPos,rVEvt.bAddMark,rVEvt.bUnmark); break; @@ -925,7 +925,7 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) if (MODKEY_PolyPoly) eCmd=SDRCREATE_NEXTOBJECT; if (rVEvt.nMouseClicks>1) eCmd=SDRCREATE_FORCEEND; EndInsObjPoint(eCmd); - bRet=TRUE; + bRet=sal_True; } break; case SDREVENT_BEGINSGLUEPOINT: bRet=BegInsGluePoint(aLogicPos); break; case SDREVENT_BEGDRAGHELPLINE: bRet=BegDragHelpLine(rVEvt.nHlplIdx,rVEvt.pPV); break; @@ -959,14 +959,14 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) if (bRet && pActualOutDev!=NULL && pActualOutDev->GetOutDevType()==OUTDEV_WINDOW) { Window* pWin=(Window*)pActualOutDev; // Maus links gedrueckt? - BOOL bLeftDown=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && rVEvt.bMouseDown; + sal_Bool bLeftDown=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && rVEvt.bMouseDown; // Maus links losgelassen? - BOOL bLeftUp=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && rVEvt.bMouseUp; + sal_Bool bLeftUp=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && rVEvt.bMouseUp; // Maus links gedrueckt oder gehalten? - BOOL bLeftDown1=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && !rVEvt.bMouseUp; + sal_Bool bLeftDown1=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && !rVEvt.bMouseUp; pWin->SetPointer(GetPreferedPointer(rVEvt.aLogicPos,pWin, rVEvt.nMouseCode & (KEY_SHIFT|KEY_MOD1|KEY_MOD2),bLeftDown1)); - BOOL bAction=IsAction(); + sal_Bool bAction=IsAction(); if (bLeftDown && bAction) pWin->CaptureMouse(); else if (bLeftUp || (rVEvt.bIsAction && !bAction)) pWin->ReleaseMouse(); } @@ -974,7 +974,7 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) } #include <editeng/outlobj.hxx> -Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, USHORT nModifier, BOOL bLeftDown) const +Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nModifier, sal_Bool bLeftDown) const { // Actions if (IsCreateObj()) @@ -986,8 +986,6 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* if ((IsDraggingPoints() || IsDraggingGluePoints()) && IsMouseHideWhileDraggingPoints()) return Pointer(POINTER_NULL); - OSL_TRACE("SdrView::GetPreferedPointer(%lx) %lx\n", this, mpCurrentSdrDragMethod); - return mpCurrentSdrDragMethod->GetSdrDragPointer(); } if (IsMarkObj() || IsMarkPoints() || IsMarkGluePoints() || IsEncirclement() || IsSetPageOrg()) return Pointer(POINTER_ARROW); @@ -1003,7 +1001,7 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* aHitRec.bDown=bMacroDown; return pMacroObj->GetMacroPointer(aHitRec); } - //USHORT nTol=nHitTolLog; + //sal_uInt16 nTol=nHitTolLog; // TextEdit, ObjEdit, Macro if (IsTextEdit() && (IsTextEditInSelectionMode() || IsTextEditHit(rMousePos,0/*nTol*/))) { @@ -1087,30 +1085,30 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* default: break; } - BOOL bMarkHit=eHit==SDRHIT_MARKEDOBJECT; + sal_Bool bMarkHit=eHit==SDRHIT_MARKEDOBJECT; SdrHdl* pHdl=aVEvt.pHdl; // Nun die Pointer fuer Dragging checken if (pHdl!=NULL || bMarkHit) { SdrHdlKind eHdl= pHdl!=NULL ? pHdl->GetKind() : HDL_MOVE; - BOOL bCorner=pHdl!=NULL && pHdl->IsCornerHdl(); - BOOL bVertex=pHdl!=NULL && pHdl->IsVertexHdl(); - BOOL bMov=eHdl==HDL_MOVE; + sal_Bool bCorner=pHdl!=NULL && pHdl->IsCornerHdl(); + sal_Bool bVertex=pHdl!=NULL && pHdl->IsVertexHdl(); + sal_Bool bMov=eHdl==HDL_MOVE; if (bMov && (eDragMode==SDRDRAG_MOVE || eDragMode==SDRDRAG_RESIZE || bMarkedHitMovesAlways)) { if (!IsMoveAllowed()) return Pointer(POINTER_ARROW); // weil Doppelklick oder Drag&Drop moeglich return Pointer(POINTER_MOVE); } switch (eDragMode) { case SDRDRAG_ROTATE: { - if ((bCorner || bMov) && !IsRotateAllowed(TRUE)) + if ((bCorner || bMov) && !IsRotateAllowed(sal_True)) return Pointer(POINTER_NOTALLOWED); // Sind 3D-Objekte selektiert? - BOOL b3DObjSelected = FALSE; + sal_Bool b3DObjSelected = sal_False; #ifndef SVX_LIGHT - for (UINT32 a=0; !b3DObjSelected && a<GetMarkedObjectCount(); a++) { + for (sal_uInt32 a=0; !b3DObjSelected && a<GetMarkedObjectCount(); a++) { SdrObject* pObj = GetMarkedObjectByIndex(a); if(pObj && pObj->ISA(E3dObject)) - b3DObjSelected = TRUE; + b3DObjSelected = sal_True; } #endif // Falls es um ein 3D-Objekt geht, muss trotz !IsShearAllowed @@ -1123,7 +1121,7 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* } break; case SDRDRAG_SHEAR: case SDRDRAG_DISTORT: { if (bCorner) { - if (!IsDistortAllowed(TRUE) && !IsDistortAllowed(FALSE)) return Pointer(POINTER_NOTALLOWED); + if (!IsDistortAllowed(sal_True) && !IsDistortAllowed(sal_False)) return Pointer(POINTER_NOTALLOWED); else return Pointer(POINTER_REFHAND); } if (bVertex && !IsShearAllowed()) return Pointer(POINTER_NOTALLOWED); @@ -1136,18 +1134,18 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* if (bCorner || bVertex || bMov) { SdrHdl* pH1=aHdl.GetHdl(HDL_REF1); SdrHdl* pH2=aHdl.GetHdl(HDL_REF2); - BOOL b90=FALSE; - BOOL b45=FALSE; + sal_Bool b90=sal_False; + sal_Bool b45=sal_False; Point aDif; if (pH1!=NULL && pH2!=NULL) { aDif=pH2->GetPos()-pH1->GetPos(); b90=(aDif.X()==0) || aDif.Y()==0; b45=b90 || (Abs(aDif.X())==Abs(aDif.Y())); } - BOOL bNo=FALSE; - if (!IsMirrorAllowed(TRUE,TRUE)) bNo=TRUE; // Spiegeln ueberhaupt nicht erlaubt - if (!IsMirrorAllowed(FALSE,FALSE) && !b45) bNo=TRUE; // freies Spiegeln nicht erlaubt - if (!IsMirrorAllowed(TRUE,FALSE) && !b90) bNo=TRUE; // Spiegeln hor/ver erlaubt + sal_Bool bNo=sal_False; + if (!IsMirrorAllowed(sal_True,sal_True)) bNo=sal_True; // Spiegeln ueberhaupt nicht erlaubt + if (!IsMirrorAllowed(sal_False,sal_False) && !b45) bNo=sal_True; // freies Spiegeln nicht erlaubt + if (!IsMirrorAllowed(sal_True,sal_False) && !b90) bNo=sal_True; // Spiegeln hor/ver erlaubt if (bNo) return Pointer(POINTER_NOTALLOWED); if (b90) { return Pointer(POINTER_MIRROR); @@ -1174,7 +1172,7 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* case SDRDRAG_CROOK: { if (bCorner || bVertex || bMov) { - if (!IsCrookAllowed(TRUE) && !IsCrookAllowed(FALSE)) return Pointer(POINTER_NOTALLOWED); + if (!IsCrookAllowed(sal_True) && !IsCrookAllowed(sal_False)) return Pointer(POINTER_NOTALLOWED); return Pointer(POINTER_CROOK); } } @@ -1185,7 +1183,7 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* } default: { - if ((bCorner || bVertex) && !IsResizeAllowed(TRUE)) return Pointer(POINTER_NOTALLOWED); + if ((bCorner || bVertex) && !IsResizeAllowed(sal_True)) return Pointer(POINTER_NOTALLOWED); } } if (pHdl!=NULL) return pHdl->GetPointer(); @@ -1267,7 +1265,7 @@ XubString SdrView::GetStatusText() ESelection aSel(pTextEditOutlinerView->GetSelection()); long nPar=aSel.nEndPara,nLin=0,nCol=aSel.nEndPos; if (aSel.nEndPara>0) { - for (USHORT nParaNum=0; nParaNum<aSel.nEndPara; nParaNum++) { + for (sal_uInt16 nParaNum=0; nParaNum<aSel.nEndPara; nParaNum++) { nLin+=pTextEditOutliner->GetLineCount(nParaNum); } } @@ -1275,18 +1273,18 @@ XubString SdrView::GetStatusText() // Am Ende einer Zeile eines mehrzeiligen Absatzes wird die Position // der naechsten Zeile des selben Absatzes angezeigt, so es eine solche // gibt. - USHORT nParaLine=0; - ULONG nParaLineAnz=pTextEditOutliner->GetLineCount(aSel.nEndPara); - BOOL bBrk=FALSE; + sal_uInt16 nParaLine=0; + sal_uIntPtr nParaLineAnz=pTextEditOutliner->GetLineCount(aSel.nEndPara); + sal_Bool bBrk=sal_False; while (!bBrk) { - USHORT nLen=pTextEditOutliner->GetLineLen(aSel.nEndPara,nParaLine); - BOOL bLastLine=(nParaLine==nParaLineAnz-1); + sal_uInt16 nLen=pTextEditOutliner->GetLineLen(aSel.nEndPara,nParaLine); + sal_Bool bLastLine=(nParaLine==nParaLineAnz-1); if (nCol>nLen || (!bLastLine && nCol==nLen)) { nCol-=nLen; nLin++; nParaLine++; - } else bBrk=TRUE; - if (nLen==0) bBrk=TRUE; // Sicherheitshalber + } else bBrk=sal_True; + if (nLen==0) bBrk=sal_True; // Sicherheitshalber } aStr.SearchAndReplaceAscii("%1", UniString::CreateFromInt32(nPar + 1)); @@ -1336,14 +1334,14 @@ SdrViewContext SdrView::GetContext() const if( IsGluePointEditMode() ) return SDRCONTEXT_GLUEPOINTEDIT; - const ULONG nMarkAnz = GetMarkedObjectCount(); + const sal_uIntPtr nMarkAnz = GetMarkedObjectCount(); if( HasMarkablePoints() && !IsFrameHandles() ) { - BOOL bPath=TRUE; - for( ULONG nMarkNum = 0; nMarkNum < nMarkAnz && bPath; nMarkNum++ ) + sal_Bool bPath=sal_True; + for( sal_uIntPtr nMarkNum = 0; nMarkNum < nMarkAnz && bPath; nMarkNum++ ) if (!GetMarkedObjectByIndex(nMarkNum)->ISA(SdrPathObj)) - bPath=FALSE; + bPath=sal_False; if( bPath ) return SDRCONTEXT_POINTEDIT; @@ -1351,9 +1349,9 @@ SdrViewContext SdrView::GetContext() const if( GetMarkedObjectCount() ) { - BOOL bGraf = TRUE, bMedia = TRUE, bTable = TRUE; + sal_Bool bGraf = sal_True, bMedia = sal_True, bTable = sal_True; - for( ULONG nMarkNum = 0; nMarkNum < nMarkAnz && ( bGraf || bMedia ); nMarkNum++ ) + for( sal_uIntPtr nMarkNum = 0; nMarkNum < nMarkAnz && ( bGraf || bMedia ); nMarkNum++ ) { const SdrObject* pMarkObj = GetMarkedObjectByIndex( nMarkNum ); DBG_ASSERT( pMarkObj, "SdrView::GetContext(), null pointer in mark list!" ); @@ -1362,13 +1360,13 @@ SdrViewContext SdrView::GetContext() const continue; if( !pMarkObj->ISA( SdrGrafObj ) ) - bGraf = FALSE; + bGraf = sal_False; if( !pMarkObj->ISA( SdrMediaObj ) ) - bMedia = FALSE; + bMedia = sal_False; if( !pMarkObj->ISA( ::sdr::table::SdrTableObj ) ) - bTable = FALSE; + bTable = sal_False; } if( bGraf ) @@ -1409,24 +1407,24 @@ void SdrView::UnmarkAll() else UnmarkAllObj(); } -BOOL SdrView::IsAllMarked() const +sal_Bool SdrView::IsAllMarked() const { if (IsTextEdit()) { return ImpIsTextEditAllSelected(); } if (IsGluePointEditMode()) { - ULONG nAnz=GetMarkableGluePointCount(); + sal_uIntPtr nAnz=GetMarkableGluePointCount(); return nAnz!=0 && nAnz==GetMarkedGluePointCount(); } if (HasMarkedPoints()) { - ULONG nAnz=GetMarkablePointCount(); + sal_uIntPtr nAnz=GetMarkablePointCount(); return nAnz!=0 && nAnz==GetMarkedPointCount(); } - ULONG nAnz=GetMarkableObjCount(); + sal_uIntPtr nAnz=GetMarkableObjCount(); return nAnz!=0 && nAnz == GetMarkedObjectCount(); } -BOOL SdrView::IsMarkPossible() const +sal_Bool SdrView::IsMarkPossible() const { if(IsTextEdit()) { @@ -1446,10 +1444,10 @@ BOOL SdrView::IsMarkPossible() const return HasMarkableObj(); } -BOOL SdrView::IsAllMarkPrevNextPossible() const +sal_Bool SdrView::IsAllMarkPrevNextPossible() const { if (IsTextEdit()) { - return FALSE; + return sal_False; } if (IsGluePointEditMode()) { return HasMarkableGluePoints(); @@ -1460,10 +1458,10 @@ BOOL SdrView::IsAllMarkPrevNextPossible() const return HasMarkableObj(); } -BOOL SdrView::MarkNext(BOOL bPrev) +sal_Bool SdrView::MarkNext(sal_Bool bPrev) { if (IsTextEdit()) { - return FALSE; + return sal_False; } if (IsGluePointEditMode() && HasMarkedGluePoints()) { return MarkNextGluePoint(bPrev); @@ -1474,10 +1472,10 @@ BOOL SdrView::MarkNext(BOOL bPrev) return MarkNextObj(bPrev); } -BOOL SdrView::MarkNext(const Point& rPnt, BOOL bPrev) +sal_Bool SdrView::MarkNext(const Point& rPnt, sal_Bool bPrev) { if (IsTextEdit()) { - return FALSE; + return sal_False; } if (IsGluePointEditMode() && HasMarkedGluePoints()) { //return MarkNextGluePoint(rPnt,bPrev); fehlende Implementation !!! @@ -1535,9 +1533,9 @@ void SdrView::DeleteMarked() } } -BOOL SdrView::BegMark(const Point& rPnt, BOOL bAddMark, BOOL bUnmark) +sal_Bool SdrView::BegMark(const Point& rPnt, sal_Bool bAddMark, sal_Bool bUnmark) { - if (bUnmark) bAddMark=TRUE; + if (bUnmark) bAddMark=sal_True; if (IsGluePointEditMode()) { if (!bAddMark) UnmarkAllGluePoints(); return BegMarkGluePoints(rPnt,bUnmark); @@ -1550,12 +1548,12 @@ BOOL SdrView::BegMark(const Point& rPnt, BOOL bAddMark, BOOL bUnmark) } } -BOOL SdrView::IsDeleteMarkedPossible() const +sal_Bool SdrView::IsDeleteMarkedPossible() const { - if (IsReadOnly()) return FALSE; - if (IsTextEdit()) return TRUE; - if (IsGluePointEditMode() && HasMarkedGluePoints()) return TRUE; - if (HasMarkedPoints()) return TRUE; + if (IsReadOnly()) return sal_False; + if (IsTextEdit()) return sal_True; + if (IsGluePointEditMode() && HasMarkedGluePoints()) return sal_True; + if (HasMarkedPoints()) return sal_True; return IsDeleteMarkedObjPossible(); } diff --git a/svx/source/svdraw/svdviter.cxx b/svx/source/svdraw/svdviter.cxx index ec7dca3b28ec..5b64a8272946 100644..100755 --- a/svx/source/svdraw/svdviter.cxx +++ b/svx/source/svdraw/svdviter.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "svdviter.hxx" +#include "svx/svdviter.hxx" #include <svx/svdobj.hxx> #include <svx/svdpage.hxx> #include <svx/svdmodel.hxx> @@ -37,7 +37,7 @@ #include <svx/svdpagv.hxx> #include <svx/svdsob.hxx> #include <svl/brdcst.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -135,7 +135,7 @@ sal_Bool SdrViewIter::ImpCheckPageView(SdrPageView* pPV) const if(!aObjLay.IsEmpty()) { - return TRUE; + return sal_True; } // ansonsten die naechste MasterPage der Page ansehen... } else diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index 8d163331bd99..a7b0c6dd36d7 100644..100755 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -31,11 +31,11 @@ #include <vector> #include <editeng/editeng.hxx> -#include "xexch.hxx" +#include "svx/xexch.hxx" #include <svx/xflclit.hxx> #include <svx/svdxcgv.hxx> #include <svx/svdoutl.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdetc.hxx> #include <svx/svdundo.hxx> #include <svx/svdograf.hxx> @@ -46,9 +46,9 @@ #include <svx/svdpage.hxx> #include <svx/svdpagv.hxx> #include <svx/svdtrans.hxx> // Fuer GetMapFactor zum umskalieren bei PasteModel -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache -#include "xoutbmp.hxx" +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache +#include "svx/xoutbmp.hxx" #include <vcl/metaact.hxx> #include <svl/poolitem.hxx> #include <svl/itempool.hxx> @@ -105,34 +105,34 @@ Point SdrExchangeView::GetPastePos(SdrObjList* pLst, OutputDevice* pOut) return aP; } -BOOL SdrExchangeView::ImpLimitToWorkArea(Point& rPt) const +sal_Bool SdrExchangeView::ImpLimitToWorkArea(Point& rPt) const { - BOOL bRet(FALSE); + sal_Bool bRet(sal_False); if(!aMaxWorkArea.IsEmpty()) { if(rPt.X()<aMaxWorkArea.Left()) { rPt.X() = aMaxWorkArea.Left(); - bRet = TRUE; + bRet = sal_True; } if(rPt.X()>aMaxWorkArea.Right()) { rPt.X() = aMaxWorkArea.Right(); - bRet = TRUE; + bRet = sal_True; } if(rPt.Y()<aMaxWorkArea.Top()) { rPt.Y() = aMaxWorkArea.Top(); - bRet = TRUE; + bRet = sal_True; } if(rPt.Y()>aMaxWorkArea.Bottom()) { rPt.Y() = aMaxWorkArea.Bottom(); - bRet = TRUE; + bRet = sal_True; } } return bRet; @@ -150,14 +150,14 @@ void SdrExchangeView::ImpGetPasteObjList(Point& /*rPos*/, SdrObjList*& rpLst) } } -BOOL SdrExchangeView::ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& rLayer) const +sal_Bool SdrExchangeView::ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& rLayer) const { - BOOL bRet=FALSE; + sal_Bool bRet=sal_False; rLayer=0; if (pObjList!=NULL) { const SdrPage* pPg=pObjList->GetPage(); if (pPg!=NULL) { - rLayer=pPg->GetLayerAdmin().GetLayerID(aAktLayer,TRUE); + rLayer=pPg->GetLayerAdmin().GetLayerID(aAktLayer,sal_True); if (rLayer==SDRLAYER_NOTFOUND) rLayer=0; SdrPageView* pPV = GetSdrPageView(); if (pPV!=NULL) { @@ -170,50 +170,50 @@ BOOL SdrExchangeView::ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& r //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SdrExchangeView::Paste(const GDIMetaFile& rMtf, const Point& rPos, SdrObjList* pLst, UINT32 nOptions) +sal_Bool SdrExchangeView::Paste(const GDIMetaFile& rMtf, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions) { Point aPos(rPos); ImpGetPasteObjList(aPos,pLst); ImpLimitToWorkArea( aPos ); - if (pLst==NULL) return FALSE; + if (pLst==NULL) return sal_False; SdrLayerID nLayer; - if (!ImpGetPasteLayer(pLst,nLayer)) return FALSE; - BOOL bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit(); + if (!ImpGetPasteLayer(pLst,nLayer)) return sal_False; + sal_Bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit(); if (bUnmark) UnmarkAllObj(); SdrGrafObj* pObj=new SdrGrafObj(Graphic(rMtf)); pObj->SetLayer(nLayer); ImpPasteObject(pObj,*pLst,aPos,rMtf.GetPrefSize(),rMtf.GetPrefMapMode(),nOptions); - return TRUE; + return sal_True; } -BOOL SdrExchangeView::Paste(const Bitmap& rBmp, const Point& rPos, SdrObjList* pLst, UINT32 nOptions) +sal_Bool SdrExchangeView::Paste(const Bitmap& rBmp, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions) { Point aPos(rPos); ImpGetPasteObjList(aPos,pLst); ImpLimitToWorkArea( aPos ); - if (pLst==NULL) return FALSE; + if (pLst==NULL) return sal_False; SdrLayerID nLayer; - if (!ImpGetPasteLayer(pLst,nLayer)) return FALSE; - BOOL bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit(); + if (!ImpGetPasteLayer(pLst,nLayer)) return sal_False; + sal_Bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit(); if (bUnmark) UnmarkAllObj(); SdrGrafObj* pObj=new SdrGrafObj(Graphic(rBmp)); pObj->SetLayer(nLayer); ImpPasteObject(pObj,*pLst,aPos,rBmp.GetSizePixel(),MapMode(MAP_PIXEL),nOptions); - return TRUE; + return sal_True; } -BOOL SdrExchangeView::Paste(const XubString& rStr, const Point& rPos, SdrObjList* pLst, UINT32 nOptions) +sal_Bool SdrExchangeView::Paste(const XubString& rStr, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions) { if(!rStr.Len()) - return FALSE; + return sal_False; Point aPos(rPos); ImpGetPasteObjList(aPos,pLst); ImpLimitToWorkArea( aPos ); - if (pLst==NULL) return FALSE; + if (pLst==NULL) return sal_False; SdrLayerID nLayer; - if (!ImpGetPasteLayer(pLst,nLayer)) return FALSE; - BOOL bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit(); + if (!ImpGetPasteLayer(pLst,nLayer)) return sal_False; + sal_Bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit(); if (bUnmark) UnmarkAllObj(); Rectangle aTextRect(0,0,500,500); SdrPage* pPage=pLst->GetPage(); @@ -239,18 +239,18 @@ BOOL SdrExchangeView::Paste(const XubString& rStr, const Point& rPos, SdrObjList MapUnit eMap=pMod->GetScaleUnit(); Fraction aMap=pMod->GetScaleFraction(); ImpPasteObject(pObj,*pLst,aPos,aSiz,MapMode(eMap,Point(0,0),aMap,aMap),nOptions); - return TRUE; + return sal_True; } -BOOL SdrExchangeView::Paste(SvStream& rInput, const String& rBaseURL, USHORT eFormat, const Point& rPos, SdrObjList* pLst, UINT32 nOptions) +sal_Bool SdrExchangeView::Paste(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions) { Point aPos(rPos); ImpGetPasteObjList(aPos,pLst); ImpLimitToWorkArea( aPos ); - if (pLst==NULL) return FALSE; + if (pLst==NULL) return sal_False; SdrLayerID nLayer; - if (!ImpGetPasteLayer(pLst,nLayer)) return FALSE; - BOOL bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit(); + if (!ImpGetPasteLayer(pLst,nLayer)) return sal_False; + sal_Bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit(); if (bUnmark) UnmarkAllObj(); Rectangle aTextRect(0,0,500,500); SdrPage* pPage=pLst->GetPage(); @@ -297,14 +297,14 @@ BOOL SdrExchangeView::Paste(SvStream& rInput, const String& rBaseURL, USHORT eFo } } - return TRUE; + return sal_True; } -BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, UINT32 nOptions) +sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions) { const SdrModel* pSrcMod=&rMod; if (pSrcMod==pMod) - return FALSE; // na so geht's ja nun nicht + return sal_False; // na so geht's ja nun nicht const bool bUndo = IsUndoEnabled(); @@ -315,7 +315,7 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* { if( bUndo ) EndUndo(); - return TRUE; + return sal_True; } Point aPos(rPos); @@ -331,9 +331,9 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* ImpLimitToWorkArea( aPos ); if (pLst==NULL) - return FALSE; + return sal_False; - BOOL bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit(); + sal_Bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit(); if (bUnmark) UnmarkAllObj(); @@ -341,7 +341,7 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* // Dafuer erstmal die Faktoren berechnen MapUnit eSrcUnit=pSrcMod->GetScaleUnit(); MapUnit eDstUnit=pMod->GetScaleUnit(); - BOOL bResize=eSrcUnit!=eDstUnit; + sal_Bool bResize=eSrcUnit!=eDstUnit; Fraction xResize,yResize; Point aPt0; if (bResize) @@ -351,7 +351,7 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* yResize=aResize.Y(); } SdrObjList* pDstLst=pLst; - USHORT nPg,nPgAnz=pSrcMod->GetPageCount(); + sal_uInt16 nPg,nPgAnz=pSrcMod->GetPageCount(); for (nPg=0; nPg<nPgAnz; nPg++) { const SdrPage* pSrcPg=pSrcMod->GetPage(nPg); @@ -363,10 +363,10 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* ResizeRect(aR,aPt0,xResize,yResize); Point aDist(aPos-aR.Center()); Size aSiz(aDist.X(),aDist.Y()); - //ULONG nDstObjAnz0=pDstLst->GetObjCount(); - ULONG nCloneErrCnt=0; - ULONG nOb,nObAnz=pSrcPg->GetObjCount(); - BOOL bMark=pMarkPV!=NULL && !IsTextEdit() && (nOptions&SDRINSERT_DONTMARK)==0; + //sal_uIntPtr nDstObjAnz0=pDstLst->GetObjCount(); + sal_uIntPtr nCloneErrCnt=0; + sal_uIntPtr nOb,nObAnz=pSrcPg->GetObjCount(); + sal_Bool bMark=pMarkPV!=NULL && !IsTextEdit() && (nOptions&SDRINSERT_DONTMARK)==0; // #i13033# // New mechanism to re-create the connections of cloned connectors @@ -383,9 +383,9 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* { if(bResize) { - pNeuObj->GetModel()->SetPasteResize(TRUE); // #51139# + pNeuObj->GetModel()->SetPasteResize(sal_True); // #51139# pNeuObj->NbcResize(aPt0,xResize,yResize); - pNeuObj->GetModel()->SetPasteResize(FALSE); // #51139# + pNeuObj->GetModel()->SetPasteResize(sal_False); // #51139# } // #i39861# @@ -409,7 +409,7 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* } else { - nLayer = rAd.GetLayerID(aAktLayer, TRUE); + nLayer = rAd.GetLayerID(aAktLayer, sal_True); } if(SDRLAYER_NOTFOUND == nLayer) @@ -429,7 +429,7 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* if (bMark) { // Markhandles noch nicht sofort setzen! // Das erledigt das ModelHasChanged der MarkView. - MarkObj(pNeuObj,pMarkPV,FALSE,TRUE); + MarkObj(pNeuObj,pMarkPV,sal_False,sal_True); } // #i13033# @@ -471,10 +471,10 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* if( bUndo ) EndUndo(); - return TRUE; + return sal_True; } -BOOL SdrExchangeView::IsExchangeFormatSupported(ULONG nFormat) const +sal_Bool SdrExchangeView::IsExchangeFormatSupported(sal_uIntPtr nFormat) const { return( FORMAT_PRIVATE == nFormat || FORMAT_GDIMETAFILE == nFormat || @@ -485,7 +485,7 @@ BOOL SdrExchangeView::IsExchangeFormatSupported(ULONG nFormat) const SOT_FORMATSTR_ID_EDITENGINE == nFormat ); } -void SdrExchangeView::ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Point& rCenter, const Size& rSiz, const MapMode& rMap, UINT32 nOptions) +void SdrExchangeView::ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Point& rCenter, const Size& rSiz, const MapMode& rMap, sal_uInt32 nOptions) { BigInt nSizX(rSiz.Width()); BigInt nSizY(rSiz.Height()); @@ -525,7 +525,7 @@ void SdrExchangeView::ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Po pMarkPV=pPV; } - BOOL bMark=pMarkPV!=NULL && !IsTextEdit() && (nOptions&SDRINSERT_DONTMARK)==0; + sal_Bool bMark=pMarkPV!=NULL && !IsTextEdit() && (nOptions&SDRINSERT_DONTMARK)==0; if (bMark) { // Obj in der ersten gefundenen PageView markieren MarkObj(pObj,pMarkPV); @@ -534,7 +534,7 @@ void SdrExchangeView::ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Po //////////////////////////////////////////////////////////////////////////////////////////////////// -Bitmap SdrExchangeView::GetMarkedObjBitmap( BOOL bNoVDevIfOneBmpMarked ) const +Bitmap SdrExchangeView::GetMarkedObjBitmap( sal_Bool bNoVDevIfOneBmpMarked ) const { Bitmap aBmp; @@ -571,7 +571,7 @@ Bitmap SdrExchangeView::GetMarkedObjBitmap( BOOL bNoVDevIfOneBmpMarked ) const // ----------------------------------------------------------------------------- -GDIMetaFile SdrExchangeView::GetMarkedObjMetaFile( BOOL bNoVDevIfOneMtfMarked ) const +GDIMetaFile SdrExchangeView::GetMarkedObjMetaFile( sal_Bool bNoVDevIfOneMtfMarked ) const { GDIMetaFile aMtf; @@ -609,7 +609,7 @@ GDIMetaFile SdrExchangeView::GetMarkedObjMetaFile( BOOL bNoVDevIfOneMtfMarked ) Size aDummySize( 2, 2 ); aOut.SetOutputSizePixel( aDummySize ); - aOut.EnableOutput( FALSE ); + aOut.EnableOutput( sal_False ); aOut.SetMapMode( aMap ); aMtf.Clear(); @@ -650,7 +650,7 @@ Graphic SdrExchangeView::GetAllMarkedGraphic() const if( ( 1 == GetMarkedObjectCount() ) && GetSdrMarkByIndex( 0 ) ) aRet = SdrExchangeView::GetObjGraphic( pMod, GetMarkedObjectByIndex( 0 ) ); else - aRet = GetMarkedObjMetaFile( FALSE ); + aRet = GetMarkedObjMetaFile( sal_False ); } return aRet; @@ -692,7 +692,7 @@ Graphic SdrExchangeView::GetObjGraphic( const SdrModel* pModel, const SdrObject* pModel->GetScaleFraction(), pModel->GetScaleFraction() ); - aOut.EnableOutput( FALSE ); + aOut.EnableOutput( sal_False ); aOut.SetMapMode( aMap ); aMtf.Record( &aOut ); pObj->SingleObjectPainter( aOut ); // #110094#-17 @@ -726,7 +726,7 @@ void SdrExchangeView::DrawMarkedObj(OutputDevice& rOut) const ::std::vector< SdrMark* >& rObjVector1 = aObjVectors[ 0 ]; ::std::vector< SdrMark* >& rObjVector2 = aObjVectors[ 1 ]; const SdrLayerAdmin& rLayerAdmin = pMod->GetLayerAdmin(); - const sal_uInt32 nControlLayerId = rLayerAdmin.GetLayerID( rLayerAdmin.GetControlLayerName(), FALSE ); + const sal_uInt32 nControlLayerId = rLayerAdmin.GetLayerID( rLayerAdmin.GetControlLayerName(), sal_False ); sal_uInt32 n, nCount; for( n = 0, nCount = GetMarkedObjectCount(); n < nCount; n++ ) @@ -760,7 +760,7 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const // werde ich sie mir wohl kopieren muessen. SortMarkedObjects(); SdrModel* pNeuMod=pMod->AllocModel(); - SdrPage* pNeuPag=pNeuMod->AllocPage(FALSE); + SdrPage* pNeuPag=pNeuMod->AllocPage(sal_False); pNeuMod->InsertPage(pNeuPag); if( !mxSelectionController.is() || !mxSelectionController->GetMarkedObjModel( pNeuPag ) ) @@ -769,7 +769,7 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const ::std::vector< SdrMark* >& rObjVector1 = aObjVectors[ 0 ]; ::std::vector< SdrMark* >& rObjVector2 = aObjVectors[ 1 ]; const SdrLayerAdmin& rLayerAdmin = pMod->GetLayerAdmin(); - const sal_uInt32 nControlLayerId = rLayerAdmin.GetLayerID( rLayerAdmin.GetControlLayerName(), FALSE ); + const sal_uInt32 nControlLayerId = rLayerAdmin.GetLayerID( rLayerAdmin.GetControlLayerName(), sal_False ); sal_uInt32 n, nCount, nCloneErrCnt = 0; for( n = 0, nCount = GetMarkedObjectCount(); n < nCount; n++ ) @@ -858,40 +858,40 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const // ----------------------------------------------------------------------------- -BOOL SdrExchangeView::Cut( ULONG /*nFormat */) +sal_Bool SdrExchangeView::Cut( sal_uIntPtr /*nFormat */) { OSL_FAIL( "SdrExchangeView::Cut: Not supported anymore" ); - return FALSE; + return sal_False; } // ----------------------------------------------------------------------------- -void SdrExchangeView::CutMarked( ULONG /*nFormat */) +void SdrExchangeView::CutMarked( sal_uIntPtr /*nFormat */) { OSL_FAIL( "SdrExchangeView::CutMarked: Not supported anymore" ); } // ----------------------------------------------------------------------------- -BOOL SdrExchangeView::Yank(ULONG /*nFormat*/) +sal_Bool SdrExchangeView::Yank(sal_uIntPtr /*nFormat*/) { OSL_FAIL( "SdrExchangeView::Yank: Not supported anymore" ); - return FALSE; + return sal_False; } // ----------------------------------------------------------------------------- -void SdrExchangeView::YankMarked(ULONG /*nFormat*/) +void SdrExchangeView::YankMarked(sal_uIntPtr /*nFormat*/) { OSL_FAIL( "YankMarked: Not supported anymore" ); } // ----------------------------------------------------------------------------- -BOOL SdrExchangeView::Paste(Window* /*pWin*/, ULONG /*nFormat*/) +sal_Bool SdrExchangeView::Paste(Window* /*pWin*/, sal_uIntPtr /*nFormat*/) { OSL_FAIL( "SdrExchangeView::Paste: Not supported anymore" ); - return FALSE; + return sal_False; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |