[Libreoffice-commits] core.git: writerfilter/source
Miklos Vajna
vmiklos at collabora.co.uk
Fri May 2 13:14:32 PDT 2014
writerfilter/source/rtftok/rtfcontrolwords.cxx | 12 ++++++++----
writerfilter/source/rtftok/rtfcontrolwords.hxx | 8 +++++---
2 files changed, 13 insertions(+), 7 deletions(-)
New commits:
commit 66c3d569187c4cef80b9c46ce216a8b2af0ebf02
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri May 2 21:44:43 2014 +0200
writerfilter: fix indentation in rtfcontrolwords
Change-Id: Iab15548826efd7f11f3103fd63d66be443e9039f
diff --git a/writerfilter/source/rtftok/rtfcontrolwords.cxx b/writerfilter/source/rtftok/rtfcontrolwords.cxx
index 1076f9d..578c548 100644
--- a/writerfilter/source/rtftok/rtfcontrolwords.cxx
+++ b/writerfilter/source/rtftok/rtfcontrolwords.cxx
@@ -13,10 +13,13 @@
#include <sal/macros.h>
#include <string.h>
-namespace writerfilter {
-namespace rtftok {
+namespace writerfilter
+{
+namespace rtftok
+{
-RTFSymbol aRTFControlWords[] = {
+RTFSymbol aRTFControlWords[] =
+{
// sKeyword nControlType nIndex
{"'", CONTROL_SYMBOL, RTF_HEXCHAR},
{"-", CONTROL_SYMBOL, RTF_OPTHYPH},
@@ -1851,7 +1854,8 @@ bool RTFSymbol::operator<(const RTFSymbol& rOther) const
return strcmp(sKeyword, rOther.sKeyword) < 0;
}
-RTFMathSymbol aRTFMathControlWords[] = {
+RTFMathSymbol aRTFMathControlWords[] =
+{
// eKeyword nToken eDestination
{RTF_MOMATH, M_TOKEN(oMath), DESTINATION_MOMATH},
{RTF_MF, M_TOKEN(f), DESTINATION_MF},
diff --git a/writerfilter/source/rtftok/rtfcontrolwords.hxx b/writerfilter/source/rtftok/rtfcontrolwords.hxx
index f699b79..f89e4cf 100644
--- a/writerfilter/source/rtftok/rtfcontrolwords.hxx
+++ b/writerfilter/source/rtftok/rtfcontrolwords.hxx
@@ -10,8 +10,10 @@
#ifndef INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFCONTROLWORDS_HXX
#define INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFCONTROLWORDS_HXX
-namespace writerfilter {
-namespace rtftok {
+namespace writerfilter
+{
+namespace rtftok
+{
// Note that this is not a 1:1 mapping between destination control
// words, e.g. RTF_PICT gets mapped to DESTINATION_PICT or
@@ -1981,7 +1983,7 @@ enum RTFControlTypes
/// Respresents an RTF Control Word
struct RTFSymbol
{
- const char *sKeyword;
+ const char* sKeyword;
int nControlType;
RTFKeyword nIndex;
More information about the Libreoffice-commits
mailing list