[Libreoffice-commits] core.git: sw/source
Tor Lillqvist
tml at collabora.com
Mon Mar 10 15:03:28 PDT 2014
sw/source/filter/ww8/docxattributeoutput.cxx | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit b2870f65d4a9318ab87d6784920f820536a6c1a8
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Mar 11 00:02:49 2014 +0200
WaE: add explicit braces to avoid dangling else
Change-Id: I8def1c7859359b76a1258db82776177d65346c05
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 7b34920..3d58f43 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3605,7 +3605,9 @@ void DocxAttributeOutput::WritePostponedFormControl(const SdrObject* pObject)
uno::Sequence<beans::PropertyValue> aGrabBag;
uno::Reference<beans::XPropertySet> xShapePropertySet(pFormObj->getUnoShape(), uno::UNO_QUERY);
if (xShapePropertySet->getPropertyValue(UNO_NAME_MISC_OBJ_INTEROPGRABBAG) >>= aGrabBag)
+ {
for (sal_Int32 i=0; i < aGrabBag.getLength(); ++i)
+ {
if (aGrabBag[i].Name == "DateFormat")
aGrabBag[i].Value >>= sDateFormat;
else if (aGrabBag[i].Name == "Locale")
@@ -3620,7 +3622,8 @@ void DocxAttributeOutput::WritePostponedFormControl(const SdrObject* pObject)
aOriginalDate.SetMonth(aUNODate.Month);
aOriginalDate.SetYear(aUNODate.Year);
}
-
+ }
+ }
uno::Reference<beans::XPropertySet> xPropertySet(xControlModel, uno::UNO_QUERY);
OString sDate;
More information about the Libreoffice-commits
mailing list