[Libreoffice-commits] libcdr.git: src/lib
Fridrich Å trba
fridrich.strba at bluewin.ch
Wed Dec 11 13:08:14 PST 2013
src/lib/CDRContentCollector.cpp | 4 ++--
src/lib/CDRParser.cpp | 8 ++++----
src/lib/CDRStylesCollector.cpp | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 6d30f036332c31b3bcc1a4e54d831ca63b6caa5d
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Dec 11 22:07:53 2013 +0100
Re-astyle
Change-Id: Ic84f176d190362364a3f6d13a811df3447fa32e6
diff --git a/src/lib/CDRContentCollector.cpp b/src/lib/CDRContentCollector.cpp
index 5884f51..2979a21 100644
--- a/src/lib/CDRContentCollector.cpp
+++ b/src/lib/CDRContentCollector.cpp
@@ -591,8 +591,8 @@ void libcdr::CDRContentCollector::collectFillStyle(unsigned short fillType, cons
}
void libcdr::CDRContentCollector::collectLineStyle(unsigned short lineType, unsigned short capsType, unsigned short joinType, double lineWidth,
- double stretch, double angle, const CDRColor &color, const std::vector<unsigned> &dashArray,
- const CDRPath &startMarker, const CDRPath &endMarker)
+ double stretch, double angle, const CDRColor &color, const std::vector<unsigned> &dashArray,
+ const CDRPath &startMarker, const CDRPath &endMarker)
{
m_currentLineStyle = CDRLineStyle(lineType, capsType, joinType, lineWidth, stretch, angle, color, dashArray, startMarker, endMarker);
}
diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
index e3cbbb9..c204ad1 100644
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -384,9 +384,9 @@ bool libcdr::CDRParser::parseWaldo(librevenge::RVNGInputStream *input)
}
bool libcdr::CDRParser::gatherWaldoInformation(librevenge::RVNGInputStream *input, std::vector<WaldoRecordInfo> &records, std::map<unsigned, WaldoRecordInfo> &records2,
- std::map<unsigned, WaldoRecordInfo> &records3, std::map<unsigned, WaldoRecordInfo> &records4,
- std::map<unsigned, WaldoRecordInfo> &records6, std::map<unsigned, WaldoRecordInfo> &records7,
- std::map<unsigned, WaldoRecordInfo> &records8, std::map<unsigned, WaldoRecordInfo> recordsOther)
+ std::map<unsigned, WaldoRecordInfo> &records3, std::map<unsigned, WaldoRecordInfo> &records4,
+ std::map<unsigned, WaldoRecordInfo> &records6, std::map<unsigned, WaldoRecordInfo> &records7,
+ std::map<unsigned, WaldoRecordInfo> &records8, std::map<unsigned, WaldoRecordInfo> recordsOther)
{
try
{
@@ -435,7 +435,7 @@ bool libcdr::CDRParser::gatherWaldoInformation(librevenge::RVNGInputStream *inpu
bool libcdr::CDRParser::parseWaldoStructure(librevenge::RVNGInputStream *input, std::stack<WaldoRecordType1> &waldoStack,
- const std::map<unsigned, WaldoRecordType1> &records1, std::map<unsigned, WaldoRecordInfo> &records2)
+ const std::map<unsigned, WaldoRecordType1> &records1, std::map<unsigned, WaldoRecordInfo> &records2)
{
while (!waldoStack.empty())
{
diff --git a/src/lib/CDRStylesCollector.cpp b/src/lib/CDRStylesCollector.cpp
index 4febb01..d1f60b8 100644
--- a/src/lib/CDRStylesCollector.cpp
+++ b/src/lib/CDRStylesCollector.cpp
@@ -229,7 +229,7 @@ void libcdr::CDRStylesCollector::collectPaletteEntry(unsigned colorId, unsigned
}
void libcdr::CDRStylesCollector::collectText(unsigned textId, unsigned styleId, const std::vector<unsigned char> &data,
- const std::vector<unsigned char> &charDescriptions, const std::map<unsigned, CDRCharacterStyle> &styleOverrides)
+ const std::vector<unsigned char> &charDescriptions, const std::map<unsigned, CDRCharacterStyle> &styleOverrides)
{
if (data.empty() || charDescriptions.empty())
return;
More information about the Libreoffice-commits
mailing list