sw/source/filter/ww8/docxattributeoutput.cxx | 27 ++++++++++++-------------
sw/source/filter/ww8/rtfexport.cxx | 11 ++--------
sw/source/filter/ww8/rtfsdrexport.cxx | 4 +--
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 6 +++--
4 files changed, 22 insertions(+), 26 deletions(-)
New commits:
commit 1eb67b0d7ea8e428a576184156b8be3ad0f2b752
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sat Feb 7 17:06:42 2015 +0100
ww8 export: indentation fixes
Change-Id: I0416b782ff04e060a03b4e0494513f16bda14d6b
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 6b191ea..16770ae 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4285,19 +4285,19 @@ bool DocxAttributeOutput::WriteOLEChart( const
SdrObject* pSdrObj, const Size& r
*/
void DocxAttributeOutput::WritePostponedChart()
{
- if(m_postponedChart == NULL)
- return;
- uno::Reference< chart2::XChartDocument > xChartDoc;
- uno::Reference< drawing::XShape > xShape(
const_cast<SdrObject*>(m_postponedChart)->getUnoShape(), uno::UNO_QUERY );
- if( xShape.is() )
- {
- uno::Reference< beans::XPropertySet > xPropSet( xShape,
uno::UNO_QUERY );
- if( xPropSet.is() )
- xChartDoc.set( xPropSet->getPropertyValue( "Model" ),
uno::UNO_QUERY );
- }
+ if(m_postponedChart == NULL)
+ return;
+ uno::Reference< chart2::XChartDocument > xChartDoc;
+ uno::Reference< drawing::XShape > xShape(
const_cast<SdrObject*>(m_postponedChart)->getUnoShape(), uno::UNO_QUERY );
+ if( xShape.is() )
+ {
+ uno::Reference< beans::XPropertySet > xPropSet( xShape, uno::UNO_QUERY
);
+ if( xPropSet.is() )
+ xChartDoc.set( xPropSet->getPropertyValue( "Model" ),
uno::UNO_QUERY );
+ }
- if( xChartDoc.is() )
- {
+ if( xChartDoc.is() )
+ {
OSL_TRACE("DocxAttributeOutput::WriteOLE2Obj: export chart ");
m_pSerializer->startElementNS( XML_w, XML_drawing,
FSEND );
@@ -4360,8 +4360,7 @@ void DocxAttributeOutput::WritePostponedChart()
m_pSerializer->endElementNS( XML_w, XML_drawing );
}
- m_postponedChart = NULL;
- return;
+ m_postponedChart = NULL;
}
bool DocxAttributeOutput::WriteOLEMath( const SdrObject*, const SwOLENode&
rOLENode, const Size& )
diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx
b/sw/source/filter/ww8/rtfsdrexport.cxx
index 574215e..49fb111 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -259,8 +259,8 @@ void RtfSdrExport::Commit(EscherPropertyContainer& rProps,
const Rectangle& rRec
EscherPropSortStruct aSegments;
if (rProps.GetOpt(ESCHER_Prop_pVertices, aVertices) &&
- rProps.GetOpt(ESCHER_Prop_pSegmentInfo, aSegments) &&
- aVertices.nPropSize >= 6 && aSegments.nPropSize >= 6)
+ rProps.GetOpt(ESCHER_Prop_pSegmentInfo, aSegments) &&
+ aVertices.nPropSize >= 6 && aSegments.nPropSize >= 6)
{
const sal_uInt8* pVerticesIt = aVertices.pBuf + 6;
sal_Size nVerticesPos = 6;
commit 105ebb9c0adcf421b0b89600216aa18041c179e3
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sat Feb 7 16:15:34 2015 +0100
Use std::initializer_list ctor
Change-Id: Ib04460fe7bd33cb9b6c4fef4fc285e93c71e57c3
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index b937b5d..73287ce 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -4628,8 +4628,10 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword
nKeyword, int nParam)
rDrawingObject.nPolyLineCount--;
if (rDrawingObject.nPolyLineCount == 0)
{
- uno::Sequence< uno::Sequence<awt::Point>
>aPointSequenceSequence(1);
- aPointSequenceSequence[0] =
comphelper::containerToSequence(rDrawingObject.aPolyLinePoints);
+ uno::Sequence< uno::Sequence<awt::Point>
>aPointSequenceSequence =
+ {
+
comphelper::containerToSequence(rDrawingObject.aPolyLinePoints)
+ };
rDrawingObject.xPropertySet->setPropertyValue("PolyPolygon",
uno::Any(aPointSequenceSequence));
}
}
commit 6158c9a899db83e04c78a1c949418434a89d4fdc
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sat Feb 7 16:07:03 2015 +0100
Unused 'using namespace ::comphelper'
Change-Id: I5605c26fe0abd4c064b20562bf52b5e400bc7f33
diff --git a/sw/source/filter/ww8/rtfexport.cxx
b/sw/source/filter/ww8/rtfexport.cxx
index 01931bc..068e59d 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -46,12 +46,8 @@
#endif
#include <svx/xflclit.hxx>
-using ::editeng::SvxBorderLine;
-using namespace ::comphelper;
using namespace ::com::sun::star;
-using sw::mark::IMark;
-
// the default text encoding for the export, if it doesn't fit unicode will
// be used
#define DEF_ENCODING RTL_TEXTENCODING_ASCII_US
@@ -116,7 +112,7 @@ void RtfExport::AppendBookmarks(const SwTxtNode& rNode,
sal_Int32 nAktPos, sal_I
for (IMarkVector::const_iterator it = aMarks.begin(), end =
aMarks.end();
it != end; ++it)
{
- IMark* pMark = (*it);
+ sw::mark::IMark* pMark = (*it);
const sal_Int32 nStart = pMark->GetMarkStart().nContent.GetIndex();
const sal_Int32 nEnd = pMark->GetMarkEnd().nContent.GetIndex();
@@ -153,7 +149,7 @@ void RtfExport::AppendAnnotationMarks(const SwTxtNode&
rNode, sal_Int32 nAktPos,
for (IMarkVector::const_iterator it = aMarks.begin(), end =
aMarks.end();
it != end; ++it)
{
- IMark* pMark = (*it);
+ sw::mark::IMark* pMark = (*it);
const sal_Int32 nStart = pMark->GetMarkStart().nContent.GetIndex();
const sal_Int32 nEnd = pMark->GetMarkEnd().nContent.GetIndex();
@@ -921,7 +917,7 @@ void RtfExport::InsColor(const Color& rCol)
void RtfExport::InsColorLine(const SvxBoxItem& rBox)
{
- const SvxBorderLine* pLine = 0;
+ const editeng::SvxBorderLine* pLine = 0;
if (rBox.GetTop())
InsColor((pLine = rBox.GetTop())->GetColor());
commit 94ab2b69239f8c2eb7019c2b0ee61c63ac829592
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sat Feb 7 16:04:41 2015 +0100
Unused include
Change-Id: If893c726310ba445ba6ecb3f453022a2ad8b18a8
diff --git a/sw/source/filter/ww8/rtfexport.cxx
b/sw/source/filter/ww8/rtfexport.cxx
index ffc60d8..01931bc 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -33,7 +33,6 @@
#include <editeng/udlnitem.hxx>
#include <editeng/fontitem.hxx>
#include <editeng/paperinf.hxx>
-#include <numrule.hxx>
#include <lineinfo.hxx>
#include <swmodule.hxx>
#include <IDocumentLayoutAccess.hxx>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
