sw/source/filter/ww8/docxsdrexport.cxx | 20 ++++++++--------
writerfilter/source/ooxml/OOXMLStreamImpl.cxx | 32 +++++++++++++-------------
2 files changed, 26 insertions(+), 26 deletions(-)
New commits:
commit 59698a4797101a286c177069c41d43762de6a4d5
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sun Mar 23 15:49:12 2014 +0100
DocxSdrExport: fix indentation
Change-Id: I8318caf6a80fe5fd0dbe98ef5877103f9250f616
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx
b/sw/source/filter/ww8/docxsdrexport.cxx
index d4f63bf..1083477 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -73,7 +73,7 @@ OUString lclGetAnchorIdFromGrabBag(const SdrObject* pObj)
OUString aResult;
uno::Reference<drawing::XShape>
xShape(const_cast<SdrObject*>(pObj)->getUnoShape(), uno::UNO_QUERY);
uno::Sequence< beans::PropertyValue > propList =
- lclGetProperty< uno::Sequence<beans::PropertyValue> >(xShape,
"FrameInteropGrabBag");
+ lclGetProperty< uno::Sequence<beans::PropertyValue> >(xShape,
"FrameInteropGrabBag");
for (sal_Int32 nProp = 0; nProp < propList.getLength(); ++nProp)
{
OUString aPropName = propList[nProp].Name;
@@ -91,19 +91,19 @@ void lclMovePositionWithRotation(awt::Point& aPos,
sal_Int64 nRotation)
// code from ImplEESdrWriter::ImplFlipBoundingBox
(filter/source/msfilter/eschesdo.cxx)
// TODO: refactor
- if ( nRotation == 0 )
+ if (nRotation == 0)
return;
- if ( nRotation < 0 )
- nRotation = ( 36000 + nRotation ) % 36000;
- if ( nRotation % 18000 == 0 )
+ if (nRotation < 0)
+ nRotation = (36000 + nRotation) % 36000;
+ if (nRotation % 18000 == 0)
nRotation = 0;
- while ( nRotation > 9000 )
- nRotation = ( 18000 - ( nRotation % 18000 ) );
+ while (nRotation > 9000)
+ nRotation = (18000 - (nRotation % 18000));
double fVal = (double) nRotation * F_PI18000;
- double fCos = cos( fVal );
- double fSin = sin( fVal );
+ double fCos = cos(fVal);
+ double fSin = sin(fVal);
double nWidthHalf = (double) aPos.X / 2;
double nHeightHalf = (double) aPos.Y / 2;
@@ -609,7 +609,7 @@ void DocxSdrExport::writeDMLDrawing(const SdrObject*
pSdrObject, const SwFrmFmt*
bool bLockedCanvas = false;
uno::Sequence< beans::PropertyValue > propList =
- lclGetProperty< uno::Sequence<beans::PropertyValue> >(xShape,
"InteropGrabBag");
+ lclGetProperty< uno::Sequence<beans::PropertyValue> >(xShape,
"InteropGrabBag");
for (sal_Int32 nProp=0; nProp < propList.getLength(); ++nProp)
{
OUString propName = propList[nProp].Name;
commit 5e01f04cf34970e8583858146c79380fa1bf7aba
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sun Mar 23 15:43:22 2014 +0100
a -> r prefix for references
Change-Id: I62d54ba948a78dceef1d50fa684e2051111a9709
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
index 6c6b2ee..6f639e6 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
@@ -243,42 +243,42 @@ bool
OOXMLStreamImpl::lcl_getTarget(uno::Reference<embed::XRelationshipAccess>
for (sal_Int32 j = 0; j < aSeqs.getLength(); j++)
{
- const uno::Sequence< beans::StringPair > &aSeq = aSeqs[j];
+ const uno::Sequence< beans::StringPair > &rSeq = aSeqs[j];
bool bExternalTarget = false;
OUString sMyTarget;
- for (sal_Int32 i = 0; i < aSeq.getLength(); i++)
+ for (sal_Int32 i = 0; i < rSeq.getLength(); i++)
{
- const beans::StringPair &aPair = aSeq[i];
+ const beans::StringPair &rPair = rSeq[i];
- if (aPair.First.compareTo(sType) == 0 &&
- ( aPair.Second.compareTo(sStreamType) == 0 ||
- aPair.Second.compareTo(sStreamTypeStrict) == 0))
+ if (rPair.First.compareTo(sType) == 0 &&
+ ( rPair.Second.compareTo(sStreamType) == 0 ||
+ rPair.Second.compareTo(sStreamTypeStrict) == 0))
bFound = true;
- else if(aPair.First.compareTo(sType) == 0 &&
- ((aPair.Second.compareTo(sOleObjectType) == 0 ||
- aPair.Second.compareTo(sOleObjectTypeStrict) == 0) &&
+ else if(rPair.First.compareTo(sType) == 0 &&
+ ((rPair.Second.compareTo(sOleObjectType) == 0 ||
+ rPair.Second.compareTo(sOleObjectTypeStrict) == 0) &&
nStreamType == EMBEDDINGS))
{
bFound = true;
}
- else if (aPair.First.compareTo(sId) == 0 &&
- aPair.Second.compareTo(rId) == 0)
+ else if (rPair.First.compareTo(sId) == 0 &&
+ rPair.Second.compareTo(rId) == 0)
bFound = true;
- else if (aPair.First.compareTo(sTarget) == 0)
+ else if (rPair.First.compareTo(sTarget) == 0)
{
// checking item[n].xml or activex[n].xml is not visited
already.
- if(customTarget != aPair.Second && (sStreamType ==
sCustomType || sStreamType == sActiveXType || sStreamType == sChartType ||
sStreamType == sFooterType || sStreamType == sHeaderType))
+ if(customTarget != rPair.Second && (sStreamType ==
sCustomType || sStreamType == sActiveXType || sStreamType == sChartType ||
sStreamType == sFooterType || sStreamType == sHeaderType))
{
bFound = false;
}
else
{
- sMyTarget = aPair.Second;
+ sMyTarget = rPair.Second;
}
}
- else if (aPair.First.compareTo(sTargetMode) == 0 &&
- aPair.Second.compareTo(sExternal) == 0)
+ else if (rPair.First.compareTo(sTargetMode) == 0 &&
+ rPair.Second.compareTo(sExternal) == 0)
bExternalTarget = true;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
