drawinglayer/Library_drawinglayer.mk | 5 +---- svx/source/svdraw/svdedtv1.cxx | 34 +++++++++++++++++----------------- vcl/source/control/field.cxx | 3 +-- 3 files changed, 19 insertions(+), 23 deletions(-)
New commits: commit e08794e953d4f1e3c31eb183590d8553a4d32caa Author: Caolán McNamara <[email protected]> Date: Thu Apr 26 11:29:05 2012 +0100 WaE: exception handlers used in code without unwind support diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk index b50b4b9..b59bd12 100644 --- a/drawinglayer/Library_drawinglayer.mk +++ b/drawinglayer/Library_drawinglayer.mk @@ -81,6 +81,7 @@ $(eval $(call gb_Library_add_exception_objects,drawinglayer,\ drawinglayer/source/attribute/sdrshadowattribute \ drawinglayer/source/attribute/strokeattribute \ drawinglayer/source/geometry/viewinformation2d \ + drawinglayer/source/geometry/viewinformation3d \ drawinglayer/source/primitive2d/animatedprimitive2d \ drawinglayer/source/primitive2d/backgroundcolorprimitive2d \ drawinglayer/source/primitive2d/baseprimitive2d \ @@ -175,8 +176,4 @@ $(eval $(call gb_Library_add_exception_objects,drawinglayer,\ drawinglayer/source/texture/texture \ )) -$(eval $(call gb_Library_add_noexception_objects,drawinglayer,\ - drawinglayer/source/geometry/viewinformation3d \ -)) - # vim: set noet sw=4 ts=4: commit 87f91c0142d20d7b6782dfc27a6837966bd678da Author: Caolán McNamara <[email protected]> Date: Thu Apr 26 11:28:39 2012 +0100 Resolves: fdo#42390 allow zwj, etc. in metric unit text diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index 1a880eb..7a7092d 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -1042,8 +1042,7 @@ static XubString ImplMetricGetUnitText( const XubString& rStr ) for ( short i = rStr.Len()-1; i >= 0; i-- ) { xub_Unicode c = rStr.GetChar( i ); - if ( unicode::isAlpha( c ) || - (c == '\'') || (c == '\"') || (c == '%' ) ) + if ( (c == '\'') || (c == '\"') || (c == '%' ) || unicode::isAlpha(c) || unicode::isControl(c) ) aStr.Insert( c, 0 ); else { commit f1b2a2a140e1cadf90f85e56a8de096e1507c5b2 Author: Caolán McNamara <[email protected]> Date: Thu Apr 26 10:25:57 2012 +0100 WaE: msvc2008 unsafe mix of bool and sal_Bool diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index b9b5795..f0b4f38 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -744,10 +744,10 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, sal_Bool /*bO long nAllSnapWdt=aAllSnapRect.GetWidth()-1; long nAllSnapHgt=aAllSnapRect.GetHeight()-1; // TODO: could go into CheckPossibilities - 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; + bool bMovProtect = false, bMovProtectDC = false; + bool bSizProtect = false, bSizProtectDC = false; + bool bPrintable = true, bPrintableDC = false; + bool bVisible = true, bVisibleDC = false; SdrLayerID nLayerId=0; sal_Bool bLayerDC=sal_False; rtl::OUString aObjName; sal_Bool bObjNameDC=sal_False,bObjNameSet=sal_False; @@ -784,11 +784,11 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, sal_Bool /*bO nRotAngle=pObj->GetRotateAngle(); nShrAngle=pObj->GetShearAngle(); } else { - 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 (!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=sal_True; if (!bShrAngleDC && nShrAngle !=pObj->GetShearAngle()) bShrAngleDC=sal_True; if (!bSnapWdtDC || !bSnapHgtDC || !bSnapPosXDC || !bSnapPosYDC || !bLogicWdtDiff || !bLogicHgtDiff) { @@ -1248,14 +1248,14 @@ SfxItemSet SdrEditView::GetGeoAttrFromMarked() const const SdrMarkList& rMarkList=GetMarkedObjectList(); sal_uIntPtr nMarkCount=rMarkList.GetMarkCount(); SdrObject* pObj=rMarkList.GetMark(0)->GetMarkedSdrObj(); - sal_Bool bPosProt=pObj->IsMoveProtect(); - sal_Bool bSizProt=pObj->IsResizeProtect(); - sal_Bool bPosProtDontCare=sal_False; - sal_Bool bSizProtDontCare=sal_False; + bool bPosProt=pObj->IsMoveProtect(); + bool bSizProt=pObj->IsResizeProtect(); + bool bPosProtDontCare=false; + bool bSizProtDontCare=false; for (sal_uIntPtr i=1; i<nMarkCount && (!bPosProtDontCare || !bSizProtDontCare); i++) { pObj=rMarkList.GetMark(i)->GetMarkedSdrObj(); - if (bPosProt!=pObj->IsMoveProtect()) bPosProtDontCare=sal_True; - if (bSizProt!=pObj->IsResizeProtect()) bSizProtDontCare=sal_True; + if (bPosProt!=pObj->IsMoveProtect()) bPosProtDontCare=true; + if (bSizProt!=pObj->IsResizeProtect()) bSizProtDontCare=true; } // InvalidateItem sets item to DONT_CARE @@ -1528,7 +1528,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) // protect position if(SFX_ITEM_SET == rAttr.GetItemState(SID_ATTR_TRANSFORM_PROTECT_POS, sal_True, &pPoolItem)) { - const sal_Bool bProtPos(((const SfxBoolItem*)pPoolItem)->GetValue()); + const bool bProtPos(((const SfxBoolItem*)pPoolItem)->GetValue()); bool bChanged(false); for(sal_uInt32 i(0); i < nMarkCount; i++) @@ -1569,7 +1569,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) // protect size if(SFX_ITEM_SET == rAttr.GetItemState(SID_ATTR_TRANSFORM_PROTECT_SIZE, sal_True, &pPoolItem)) { - const sal_Bool bProtSize(((const SfxBoolItem*)pPoolItem)->GetValue()); + const bool bProtSize(((const SfxBoolItem*)pPoolItem)->GetValue()); bool bChanged(false); for(sal_uInt32 i(0); i < nMarkCount; i++)
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
