diff options
Diffstat (limited to 'svx/source/svdraw/svdetc.cxx')
-rwxr-xr-x[-rw-r--r--] | svx/source/svdraw/svdetc.cxx | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index b68909ffa99a..d34a5df97c42 100644..100755 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -66,7 +67,7 @@ #include <svx/xflbckit.hxx> #include <svx/extrusionbar.hxx> #include <svx/fontworkbar.hxx> -#include <vcl/svapp.hxx> //add CHINA001 +#include <vcl/svapp.hxx> #include <svx/sdr/contact/viewcontact.hxx> #include <svx/svdpage.hxx> #include <svx/svdotable.hxx> @@ -321,7 +322,7 @@ void UShortCont::Sort() class ImpClipMerk { Region aClip; - FASTBOOL bClip; + bool bClip; public: ImpClipMerk(const OutputDevice& rOut): aClip(rOut.GetClipRegion()),bClip(rOut.IsClipRegion()) {} void Restore(OutputDevice& rOut) @@ -385,7 +386,7 @@ public: const Color& GetLineColor() const { return aLineColor; } }; -ImpSdrHdcMerk::ImpSdrHdcMerk(const OutputDevice& rOut, sal_uInt16 nNewMode, FASTBOOL bAutoMerk): +ImpSdrHdcMerk::ImpSdrHdcMerk(const OutputDevice& rOut, sal_uInt16 nNewMode, bool bAutoMerk): pFarbMerk(NULL), pClipMerk(NULL), pLineColorMerk(NULL), @@ -477,10 +478,10 @@ void SdrLinkList::InsertLink(const Link& rLink, unsigned nPos) if (rLink.IsSet()) { aList.Insert(new Link(rLink),nPos); } else { - DBG_ERROR("SdrLinkList::InsertLink(): Versuch, einen nicht gesetzten Link einzufuegen"); + OSL_FAIL("SdrLinkList::InsertLink(): Versuch, einen nicht gesetzten Link einzufuegen"); } } else { - DBG_ERROR("SdrLinkList::InsertLink(): Link schon vorhanden"); + OSL_FAIL("SdrLinkList::InsertLink(): Link schon vorhanden"); } } @@ -491,24 +492,24 @@ void SdrLinkList::RemoveLink(const Link& rLink) Link* pLink=(Link*)aList.Remove(nFnd); delete pLink; } else { - DBG_ERROR("SdrLinkList::RemoveLink(): Link nicht gefunden"); + OSL_FAIL("SdrLinkList::RemoveLink(): Link nicht gefunden"); } } //////////////////////////////////////////////////////////////////////////////////////////////////// // #98988# Re-implement GetDraftFillColor(...) -FASTBOOL GetDraftFillColor(const SfxItemSet& rSet, Color& rCol) +bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol) { XFillStyle eFill=((XFillStyleItem&)rSet.Get(XATTR_FILLSTYLE)).GetValue(); - FASTBOOL bRetval(sal_False); + bool bRetval = false; switch(eFill) { case XFILL_SOLID: { rCol = ((XFillColorItem&)rSet.Get(XATTR_FILLCOLOR)).GetColorValue(); - bRetval = sal_True; + bRetval = true; break; } @@ -526,7 +527,7 @@ FASTBOOL GetDraftFillColor(const SfxItemSet& rSet, Color& rCol) const basegfx::BColor aAverageColor(basegfx::average(aCol1.getBColor(), aCol2.getBColor())); rCol = Color(aAverageColor); - bRetval = sal_True; + bRetval = true; break; } @@ -536,7 +537,7 @@ FASTBOOL GetDraftFillColor(const SfxItemSet& rSet, Color& rCol) Color aCol2(rGrad.GetEndColor()); const basegfx::BColor aAverageColor(basegfx::average(aCol1.getBColor(), aCol2.getBColor())); rCol = Color(aAverageColor); - bRetval = sal_True; + bRetval = true; break; } @@ -580,7 +581,7 @@ FASTBOOL GetDraftFillColor(const SfxItemSet& rSet, Color& rCol) rCol = Color(sal_uInt8(nRt), sal_uInt8(nGn), sal_uInt8(nBl)); - bRetval = sal_True; + bRetval = true; } if(pAccess) @@ -670,9 +671,8 @@ ResMgr* ImpGetResMgr() if(!rGlobalData.pResMgr) { - ByteString aName("svx"); rGlobalData.pResMgr = - ResMgr::CreateResMgr( aName.GetBuffer(), Application::GetSettings().GetUILocale() ); + ResMgr::CreateResMgr( "svx", Application::GetSettings().GetUILocale() ); } return rGlobalData.pResMgr; @@ -1116,3 +1116,5 @@ Color GetTextEditBackgroundColor(const SdrObjEditView& rView) //////////////////////////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |