Kaydet (Commit) ac687b4d authored tarafından Miklos Vajna's avatar Miklos Vajna

SwTextBoxHelper: use UNO_NAME_* constants

Change-Id: Ie2ce95f46c19fa6c693619242a65bccc442a7fe7
üst 6823b192
...@@ -18,8 +18,10 @@ ...@@ -18,8 +18,10 @@
#include <unotextbodyhf.hxx> #include <unotextbodyhf.hxx>
#include <unotextrange.hxx> #include <unotextrange.hxx>
#include <unomid.h> #include <unomid.h>
#include <unoprnms.hxx>
#include <dflyobj.hxx> #include <dflyobj.hxx>
#include <editeng/unoprnms.hxx>
#include <svx/svdoashp.hxx> #include <svx/svdoashp.hxx>
#include <svx/unopage.hxx> #include <svx/unopage.hxx>
#include <svx/svdpage.hxx> #include <svx/svdpage.hxx>
...@@ -47,14 +49,14 @@ void SwTextBoxHelper::create(SwFrmFmt* pShape) ...@@ -47,14 +49,14 @@ void SwTextBoxHelper::create(SwFrmFmt* pShape)
// Initialize properties. // Initialize properties.
uno::Reference<beans::XPropertySet> xPropertySet(xTextFrame, uno::UNO_QUERY); uno::Reference<beans::XPropertySet> xPropertySet(xTextFrame, uno::UNO_QUERY);
uno::Any aEmptyBorder = uno::makeAny(table::BorderLine2()); uno::Any aEmptyBorder = uno::makeAny(table::BorderLine2());
xPropertySet->setPropertyValue("TopBorder", aEmptyBorder); xPropertySet->setPropertyValue(UNO_NAME_TOP_BORDER, aEmptyBorder);
xPropertySet->setPropertyValue("BottomBorder", aEmptyBorder); xPropertySet->setPropertyValue(UNO_NAME_BOTTOM_BORDER, aEmptyBorder);
xPropertySet->setPropertyValue("LeftBorder", aEmptyBorder); xPropertySet->setPropertyValue(UNO_NAME_LEFT_BORDER, aEmptyBorder);
xPropertySet->setPropertyValue("RightBorder", aEmptyBorder); xPropertySet->setPropertyValue(UNO_NAME_RIGHT_BORDER, aEmptyBorder);
xPropertySet->setPropertyValue("FillTransparence", uno::makeAny(sal_Int32(100))); xPropertySet->setPropertyValue(UNO_NAME_FILL_TRANSPARENCE, uno::makeAny(sal_Int32(100)));
xPropertySet->setPropertyValue("SizeType", uno::makeAny(text::SizeType::FIX)); xPropertySet->setPropertyValue(UNO_NAME_SIZE_TYPE, uno::makeAny(text::SizeType::FIX));
// Link its text range to the original shape. // Link its text range to the original shape.
uno::Reference<text::XTextRange> xTextBox(xTextFrame, uno::UNO_QUERY_THROW); uno::Reference<text::XTextRange> xTextBox(xTextFrame, uno::UNO_QUERY_THROW);
...@@ -72,12 +74,12 @@ void SwTextBoxHelper::create(SwFrmFmt* pShape) ...@@ -72,12 +74,12 @@ void SwTextBoxHelper::create(SwFrmFmt* pShape)
syncProperty(pShape, RES_FRM_SIZE, MID_FRMSIZE_SIZE, uno::makeAny(xShape->getSize())); syncProperty(pShape, RES_FRM_SIZE, MID_FRMSIZE_SIZE, uno::makeAny(xShape->getSize()));
uno::Reference<beans::XPropertySet> xShapePropertySet(xShape, uno::UNO_QUERY); uno::Reference<beans::XPropertySet> xShapePropertySet(xShape, uno::UNO_QUERY);
syncProperty(pShape, RES_HORI_ORIENT, MID_HORIORIENT_ORIENT, xShapePropertySet->getPropertyValue("HoriOrient")); syncProperty(pShape, RES_HORI_ORIENT, MID_HORIORIENT_ORIENT, xShapePropertySet->getPropertyValue(UNO_NAME_HORI_ORIENT));
syncProperty(pShape, RES_HORI_ORIENT, MID_HORIORIENT_RELATION, xShapePropertySet->getPropertyValue("HoriOrientRelation")); syncProperty(pShape, RES_HORI_ORIENT, MID_HORIORIENT_RELATION, xShapePropertySet->getPropertyValue(UNO_NAME_HORI_ORIENT_RELATION));
syncProperty(pShape, RES_VERT_ORIENT, MID_VERTORIENT_ORIENT, xShapePropertySet->getPropertyValue("VertOrient")); syncProperty(pShape, RES_VERT_ORIENT, MID_VERTORIENT_ORIENT, xShapePropertySet->getPropertyValue(UNO_NAME_VERT_ORIENT));
syncProperty(pShape, RES_VERT_ORIENT, MID_VERTORIENT_RELATION, xShapePropertySet->getPropertyValue("VertOrientRelation")); syncProperty(pShape, RES_VERT_ORIENT, MID_VERTORIENT_RELATION, xShapePropertySet->getPropertyValue(UNO_NAME_VERT_ORIENT_RELATION));
syncProperty(pShape, RES_HORI_ORIENT, MID_HORIORIENT_POSITION, xShapePropertySet->getPropertyValue("HoriOrientPosition")); syncProperty(pShape, RES_HORI_ORIENT, MID_HORIORIENT_POSITION, xShapePropertySet->getPropertyValue(UNO_NAME_HORI_ORIENT_POSITION));
syncProperty(pShape, RES_VERT_ORIENT, MID_VERTORIENT_POSITION, xShapePropertySet->getPropertyValue("VertOrientPosition")); syncProperty(pShape, RES_VERT_ORIENT, MID_VERTORIENT_POSITION, xShapePropertySet->getPropertyValue(UNO_NAME_VERT_ORIENT_POSITION));
} }
} }
...@@ -247,13 +249,13 @@ void SwTextBoxHelper::syncProperty(SwFrmFmt* pShape, sal_uInt16 nWID, sal_uInt8 ...@@ -247,13 +249,13 @@ void SwTextBoxHelper::syncProperty(SwFrmFmt* pShape, sal_uInt16 nWID, sal_uInt8
switch (nMemberId) switch (nMemberId)
{ {
case MID_HORIORIENT_ORIENT: case MID_HORIORIENT_ORIENT:
aPropertyName = "HoriOrient"; aPropertyName = UNO_NAME_HORI_ORIENT;
break; break;
case MID_HORIORIENT_RELATION: case MID_HORIORIENT_RELATION:
aPropertyName = "HoriOrientRelation"; aPropertyName = UNO_NAME_HORI_ORIENT_RELATION;
break; break;
case MID_HORIORIENT_POSITION: case MID_HORIORIENT_POSITION:
aPropertyName = "HoriOrientPosition"; aPropertyName = UNO_NAME_HORI_ORIENT_POSITION;
bAdjustX = true; bAdjustX = true;
break; break;
} }
...@@ -262,19 +264,19 @@ void SwTextBoxHelper::syncProperty(SwFrmFmt* pShape, sal_uInt16 nWID, sal_uInt8 ...@@ -262,19 +264,19 @@ void SwTextBoxHelper::syncProperty(SwFrmFmt* pShape, sal_uInt16 nWID, sal_uInt8
switch (nMemberId) switch (nMemberId)
{ {
case MID_VERTORIENT_ORIENT: case MID_VERTORIENT_ORIENT:
aPropertyName = "VertOrient"; aPropertyName = UNO_NAME_VERT_ORIENT;
break; break;
case MID_VERTORIENT_RELATION: case MID_VERTORIENT_RELATION:
aPropertyName = "VertOrientRelation"; aPropertyName = UNO_NAME_VERT_ORIENT_RELATION;
break; break;
case MID_VERTORIENT_POSITION: case MID_VERTORIENT_POSITION:
aPropertyName = "VertOrientPosition"; aPropertyName = UNO_NAME_VERT_ORIENT_POSITION;
bAdjustY = true; bAdjustY = true;
break; break;
} }
break; break;
case RES_FRM_SIZE: case RES_FRM_SIZE:
aPropertyName = "Size"; aPropertyName = UNO_NAME_SIZE;
bAdjustSize = true; bAdjustSize = true;
break; break;
case RES_ANCHOR: case RES_ANCHOR:
...@@ -284,7 +286,7 @@ void SwTextBoxHelper::syncProperty(SwFrmFmt* pShape, sal_uInt16 nWID, sal_uInt8 ...@@ -284,7 +286,7 @@ void SwTextBoxHelper::syncProperty(SwFrmFmt* pShape, sal_uInt16 nWID, sal_uInt8
if (aValue.get<text::TextContentAnchorType>() == text::TextContentAnchorType_AS_CHARACTER) if (aValue.get<text::TextContentAnchorType>() == text::TextContentAnchorType_AS_CHARACTER)
{ {
uno::Reference<beans::XPropertySet> xPropertySet(static_cast<cppu::OWeakObject*>(SwXFrames::GetObject(*pFmt, FLYCNTTYPE_FRM)), uno::UNO_QUERY); uno::Reference<beans::XPropertySet> xPropertySet(static_cast<cppu::OWeakObject*>(SwXFrames::GetObject(*pFmt, FLYCNTTYPE_FRM)), uno::UNO_QUERY);
xPropertySet->setPropertyValue("Surround", uno::makeAny(text::WrapTextMode_THROUGHT)); xPropertySet->setPropertyValue(UNO_NAME_SURROUND, uno::makeAny(text::WrapTextMode_THROUGHT));
return; return;
} }
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment