oox/source/shape/WpsContext.cxx | 4 ++--
sw/qa/extras/rtfimport/rtfimport.cxx | 3 +--
sw/source/filter/ww8/docxsdrexport.cxx | 2 +-
writerfilter/source/dmapper/SdtHelper.cxx | 7 ++-----
writerfilter/source/dmapper/SdtHelper.hxx | 7 ++-----
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 7 ++-----
writerfilter/source/rtftok/rtfdocumentimpl.hxx | 2 +-
writerfilter/source/rtftok/rtfsdrimport.cxx | 3 +--
writerfilter/source/rtftok/rtfvalue.hxx | 8 ++++----
9 files changed, 16 insertions(+), 27 deletions(-)
New commits:
commit 21977778168af134e7f72afcc07ff5062324a19d
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sun Jul 27 17:30:48 2014 +0200
indentation fixes
Change-Id: I0a0f04d0f0e008e8947a5a7e3ed6083c1589e61b
diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx
index 89ed320..fb42e62 100644
--- a/oox/source/shape/WpsContext.cxx
+++ b/oox/source/shape/WpsContext.cxx
@@ -128,10 +128,10 @@ oox::core::ContextHandlerRef
WpsContext::onCreateContext(sal_Int32 nElementToken
}
break;
case XML_prstTxWarp:
- if( rAttribs.hasAttribute( XML_prst ) )
+ if (rAttribs.hasAttribute(XML_prst))
{
uno::Reference<beans::XPropertySet> xPropertySet(mxShape,
uno::UNO_QUERY);
- oox::OptValue<OUString> presetShapeName = rAttribs.getString(
XML_prst );
+ oox::OptValue<OUString> presetShapeName =
rAttribs.getString(XML_prst);
OUString preset = presetShapeName.get();
comphelper::SequenceAsHashMap
aCustomShapeGeometry(xPropertySet->getPropertyValue("CustomShapeGeometry"));
aCustomShapeGeometry["PresetTextWarp"] = uno::makeAny(preset);
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 289cce8..f7763b3 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1337,8 +1337,7 @@ DECLARE_RTFIMPORT_TEST(testFdo77996, "fdo77996.rtf")
uno::Reference<document::XDocumentPropertiesSupplier>
xDocumentPropertiesSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<document::XDocumentProperties>
xProps(xDocumentPropertiesSupplier->getDocumentProperties());
CPPUNIT_ASSERT_EQUAL(OUString("Aln Lin (Bei Jing)"), xProps->getAuthor());
- OUString
aTitle("\xe5\x8e\xa6\xe9\x97\xa8\xe9\x92\xa8\xe4\xb8\x9a\xe8\x82\xa1\xe4\xbb\xbd\xe6\x9c\x89\xe9\x99\x90\xe5\x85\xac\xe5\x8f\xb8",
30,
- RTL_TEXTENCODING_UTF8);
+ OUString
aTitle("\xe5\x8e\xa6\xe9\x97\xa8\xe9\x92\xa8\xe4\xb8\x9a\xe8\x82\xa1\xe4\xbb\xbd\xe6\x9c\x89\xe9\x99\x90\xe5\x85\xac\xe5\x8f\xb8",
30, RTL_TEXTENCODING_UTF8);
CPPUNIT_ASSERT_EQUAL(aTitle, xProps->getTitle());
uno::Reference<beans::XPropertySet>
xUDProps(xProps->getUserDefinedProperties(), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(OUString("jay"), getProperty<OUString>(xUDProps,
"Operator"));
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx
b/sw/source/filter/ww8/docxsdrexport.cxx
index 8e137d9..9429443 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -853,7 +853,7 @@ void DocxSdrExport::writeDMLAndVMLDrawing(const SdrObject*
sdrObj, const SwFrmFm
// In case we are already inside a DML block, then write the shape only as
VML, turn out that's allowed to do.
// A common service created in util to check for VML shapes which are
allowed to have textbox in content
- if ( (msfilter::util::HasTextBoxContent(eShapeType)) &&
m_pImpl->isSupportedDMLShape(xShape) && !bDMLAndVMLDrawingOpen)
+ if ((msfilter::util::HasTextBoxContent(eShapeType)) &&
m_pImpl->isSupportedDMLShape(xShape) && !bDMLAndVMLDrawingOpen)
{
m_pImpl->m_pSerializer->startElementNS(XML_mc, XML_AlternateContent,
FSEND);
diff --git a/writerfilter/source/dmapper/SdtHelper.cxx
b/writerfilter/source/dmapper/SdtHelper.cxx
index 671e4c2..ce57d60 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -135,15 +135,12 @@ void SdtHelper::createDateControl(OUString& rContentText,
beans::PropertyValue a
createControlShape(lcl_getOptimalWidth(m_rDM_Impl.GetStyleSheetTable(),
rContentText, aItems), xControlModel, aGrabBag.getAsConstPropertyValueList());
}
-void SdtHelper::createControlShape(awt::Size aSize,
- uno::Reference<awt::XControlModel> const& xControlModel)
+void SdtHelper::createControlShape(awt::Size aSize,
uno::Reference<awt::XControlModel> const& xControlModel)
{
createControlShape(aSize, xControlModel,
uno::Sequence<beans::PropertyValue>());
}
-void SdtHelper::createControlShape(awt::Size aSize,
- uno::Reference<awt::XControlModel> const& xControlModel,
- const uno::Sequence<beans::PropertyValue>& rGrabBag)
+void SdtHelper::createControlShape(awt::Size aSize,
uno::Reference<awt::XControlModel> const& xControlModel, const
uno::Sequence<beans::PropertyValue>& rGrabBag)
{
uno::Reference<drawing::XControlShape>
xControlShape(m_rDM_Impl.GetTextFactory()->createInstance("com.sun.star.drawing.ControlShape"),
uno::UNO_QUERY);
xControlShape->setSize(aSize);
diff --git a/writerfilter/source/dmapper/SdtHelper.hxx
b/writerfilter/source/dmapper/SdtHelper.hxx
index 11c879a..f4f56ab 100644
--- a/writerfilter/source/dmapper/SdtHelper.hxx
+++ b/writerfilter/source/dmapper/SdtHelper.hxx
@@ -62,11 +62,8 @@ class SdtHelper
bool m_bHasElements;
/// Create and append the drawing::XControlShape, containing the various
models.
- void createControlShape(com::sun::star::awt::Size aSize,
- com::sun::star::uno::Reference<com::sun::star::awt::XControlModel>
const&);
- void createControlShape(com::sun::star::awt::Size aSize,
- com::sun::star::uno::Reference<com::sun::star::awt::XControlModel>
const&,
- const
com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rGrabBag);
+ void createControlShape(css::awt::Size aSize,
css::uno::Reference<css::awt::XControlModel> const&);
+ void createControlShape(css::awt::Size aSize,
css::uno::Reference<css::awt::XControlModel> const&, const
css::uno::Sequence<css::beans::PropertyValue>& rGrabBag);
public:
SdtHelper(DomainMapper_Impl& rDM_Impl);
virtual ~SdtHelper();
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 95e41dc..8ff911a 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -705,9 +705,7 @@ int RTFDocumentImpl::resolvePict(bool const bInline,
uno::Reference<drawing::XSh
int b = 0, count = 2;
// Feed the destination text to a stream.
- OString aStr = OUStringToOString(
- m_aStates.top().aDestinationText.makeStringAndClear(),
- RTL_TEXTENCODING_ASCII_US);
+ OString aStr =
OUStringToOString(m_aStates.top().aDestinationText.makeStringAndClear(),
RTL_TEXTENCODING_ASCII_US);
const char* str = aStr.getStr();
for (int i = 0; i < aStr.getLength(); ++i)
{
@@ -4882,8 +4880,7 @@ int RTFDocumentImpl::popState()
case DESTINATION_SHAPEPROPERTYNAME:
if (&m_aStates.top().aDestinationText !=
m_aStates.top().pDestinationText)
break; // not for nested group
- aState.aShape.aProperties.push_back(make_pair(
- m_aStates.top().pDestinationText->makeStringAndClear(),
OUString()));
+
aState.aShape.aProperties.push_back(make_pair(m_aStates.top().pDestinationText->makeStringAndClear(),
OUString()));
break;
case DESTINATION_SHAPEPROPERTYVALUE:
if (aState.aShape.aProperties.size())
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 94f43bf..3a9f0d8 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -271,7 +271,7 @@ public:
/// Text from special destinations.
OUStringBuffer aDestinationText;
/// point to the buffer of the current destination
- OUStringBuffer * pDestinationText;
+ OUStringBuffer* pDestinationText;
/// Index of the current style.
int nCurrentStyleIndex;
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 3fb2f09..ee3f0c3 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -141,8 +141,7 @@ void
RTFSdrImport::resolveFLine(uno::Reference<beans::XPropertySet> const& xProp
xPropertySet->setPropertyValue("LineStyle",
uno::makeAny(drawing::LineStyle_NONE));
}
-void RTFSdrImport::applyProperty(uno::Reference<drawing::XShape> const& xShape,
- const OUString& aKey, const OUString& aValue)
+void RTFSdrImport::applyProperty(uno::Reference<drawing::XShape> const&
xShape, const OUString& aKey, const OUString& aValue)
{
uno::Reference<beans::XPropertySet> xPropertySet(xShape, uno::UNO_QUERY);
sal_Int16 nHoriOrient = 0;
diff --git a/writerfilter/source/rtftok/rtfvalue.hxx
b/writerfilter/source/rtftok/rtfvalue.hxx
index 9e9ec25..7c084dd 100644
--- a/writerfilter/source/rtftok/rtfvalue.hxx
+++ b/writerfilter/source/rtftok/rtfvalue.hxx
@@ -27,10 +27,10 @@ class RTFValue
public:
typedef boost::shared_ptr<RTFValue> Pointer_t;
RTFValue(int nValue, const OUString& sValue, RTFSprms rAttributes,
RTFSprms rSprms,
- css::uno::Reference<css::drawing::XShape> const& xShape,
- css::uno::Reference<css::io::XInputStream> const& xStream,
- css::uno::Reference<css::embed::XEmbeddedObject> const& xObject,
- bool bForceString, const RTFShape& aShape);
+ css::uno::Reference<css::drawing::XShape> const& xShape,
+ css::uno::Reference<css::io::XInputStream> const& xStream,
+ css::uno::Reference<css::embed::XEmbeddedObject> const& xObject,
+ bool bForceString, const RTFShape& aShape);
RTFValue();
RTFValue(int nValue);
RTFValue(const OUString& sValue, bool bForce = false);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
