[Libreoffice-commits] core.git: 2 commits - helpcompiler/source hwpfilter/source i18npool/source i18nutil/source idlc/source idl/source io/source jvmfwk/inc jvmfwk/plugins jvmfwk/source l10ntools/source linguistic/source lotuswordpro/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Feb 9 16:07:51 UTC 2019
helpcompiler/source/BasCodeTagger.cxx | 11
hwpfilter/source/drawing.h | 8
hwpfilter/source/fontmap.cxx | 4
hwpfilter/source/formula.cxx | 24
hwpfilter/source/hbox.cxx | 8
hwpfilter/source/hcode.cxx | 54 +-
hwpfilter/source/hpara.cxx | 2
hwpfilter/source/hwpfile.cxx | 4
hwpfilter/source/hwpread.cxx | 22
hwpfilter/source/hwpreader.cxx | 264 +++++-----
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx | 26
i18npool/source/inputchecker/inputsequencechecker_hi.cxx | 2
i18npool/source/localedata/LocaleNode.cxx | 8
i18npool/source/transliteration/transliterationImpl.cxx | 2
i18nutil/source/utility/widthfolding.cxx | 16
idl/source/objects/slot.cxx | 2
idlc/source/astscope.cxx | 2
idlc/source/options.cxx | 3
idlc/source/parser.y | 6
io/source/acceptor/acc_socket.cxx | 2
io/source/connector/ctr_socket.cxx | 2
io/source/stm/omark.cxx | 2
io/source/stm/streamhelper.cxx | 2
jvmfwk/inc/fwkutil.hxx | 6
jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | 2
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 2
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 2
jvmfwk/source/elements.cxx | 2
jvmfwk/source/fwkbase.cxx | 2
l10ntools/source/localize.cxx | 2
linguistic/source/convdiclist.cxx | 8
lotuswordpro/source/filter/bento.hxx | 4
lotuswordpro/source/filter/lwpfribptr.cxx | 4
lotuswordpro/source/filter/lwpfribsection.cxx | 14
lotuswordpro/source/filter/lwpparastyle.cxx | 4
lotuswordpro/source/filter/lwptablelayout.cxx | 6
lotuswordpro/source/filter/tocread.cxx | 3
lotuswordpro/source/filter/utlist.hxx | 6
38 files changed, 271 insertions(+), 272 deletions(-)
New commits:
commit 2ae813975ae8ba97e2adbce13be272e6902ca7b5
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Feb 8 13:18:51 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Feb 9 17:07:36 2019 +0100
loplugin:indentation in jvmfwk..lotuswordpro
Change-Id: I1af665f4c6d34d8514dd23bb7a3eba700ce3ddbc
Reviewed-on: https://gerrit.libreoffice.org/67559
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/jvmfwk/inc/fwkutil.hxx b/jvmfwk/inc/fwkutil.hxx
index ce46ef2cadbe..890ccb15bbcc 100644
--- a/jvmfwk/inc/fwkutil.hxx
+++ b/jvmfwk/inc/fwkutil.hxx
@@ -55,9 +55,9 @@ struct Bootstrap :
buf.append(SAL_CONFIGFILE("/jvmfwk3"));
OUString sIni = buf.makeStringAndClear();
::rtl::Bootstrap * bootstrap = new ::rtl::Bootstrap(sIni);
- SAL_INFO("jfw.level2", "Using configuration file " << sIni);
- return bootstrap;
- }
+ SAL_INFO("jfw.level2", "Using configuration file " << sIni);
+ return bootstrap;
+ }
};
struct FwkMutex: public ::rtl::Static<osl::Mutex, FwkMutex> {};
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
index 034b0687d5e6..14faf56762d7 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
@@ -44,7 +44,7 @@ char const* const* OtherInfo::getJavaExePaths(int * size)
"jre/bin/java"
#endif
};
- *size = SAL_N_ELEMENTS (ar);
+ *size = SAL_N_ELEMENTS (ar);
return ar;
}
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index f1b0ee485480..6949ed903b1e 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -848,7 +848,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
fprintf(stderr, "lo_get_javavm returns %p", *ppVm);
#endif
- return errorcode;
+ return errorcode;
#if defined __GNUC__ && __GNUC__ == 7 && !defined __clang__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wclobbered"
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 3563e4ccb3b0..249deeaf304c 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -173,7 +173,7 @@ bool getAndAddJREInfoByPath(
{
OUString const & operator()()
{
- static OUString sIni;
+ static OUString sIni;
OUStringBuffer buf( 255);
buf.append( getLibraryLocation());
#ifdef MACOSX
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index ebd395b466fc..ec77f7ab1cae 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -53,7 +53,7 @@ static OString getElement(OString const & docPath,
{
//Prepare the xml document and context
OSL_ASSERT(!docPath.isEmpty());
- jfw::CXmlDocPtr doc(xmlParseFile(docPath.getStr()));
+ jfw::CXmlDocPtr doc(xmlParseFile(docPath.getStr()));
if (doc == nullptr)
throw FrameworkException(
JFW_E_ERROR,
diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx
index 5a8b39f9f58f..2286fd9b1e17 100644
--- a/jvmfwk/source/fwkbase.cxx
+++ b/jvmfwk/source/fwkbase.cxx
@@ -317,7 +317,7 @@ OUString BootParams::getVendorSettings()
UNO_JAVA_JFW_VENDOR_SETTINGS);
}
}
- SAL_INFO(
+ SAL_INFO(
"jfw.level2",
"Using bootstrap parameter " UNO_JAVA_JFW_VENDOR_SETTINGS " = "
<< sVendor);
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index f169fd31fac7..24dbe8f73e3f 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -230,7 +230,7 @@ bool handleFile(const OString& rProject, const OUString& rUrl, const OString& rP
cerr
<< "Error: Cannot remove entryless pot file: "
<< sOutPath << "\n";
- throw false; //TODO
+ throw false; //TODO
}
}
}
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx
index 94f844aa56fe..c34d97adf07e 100644
--- a/linguistic/source/convdiclist.cxx
+++ b/linguistic/source/convdiclist.cxx
@@ -393,10 +393,10 @@ ConvDicNameContainer & ConvDicList::GetNameContainer()
mxNameContainer->GetByName( "ChineseS2T" ), UNO_QUERY );
uno::Reference< XConversionDictionary > xT2SDic(
mxNameContainer->GetByName( "ChineseT2S" ), UNO_QUERY );
- if (xS2TDic.is())
- xS2TDic->setActive( true );
- if (xT2SDic.is())
- xT2SDic->setActive( true );
+ if (xS2TDic.is())
+ xS2TDic->setActive( true );
+ if (xT2SDic.is())
+ xT2SDic->setActive( true );
}
return *mxNameContainer;
diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx
index f437ce9bdbec..4668d292f4e6 100644
--- a/lotuswordpro/source/filter/bento.hxx
+++ b/lotuswordpro/source/filter/bento.hxx
@@ -311,11 +311,11 @@ public: // Internal methods
CBenValueSegment(CBenValue * pValue, BenContainerPos Pos,
size_t Size) : CUtListElmt(&pValue->GetValueSegments())
{ cImmediate = false; cPos = Pos;
- cSize = Size; }
+ cSize = Size; }
CBenValueSegment(CBenValue * pValue, const void * pImmData,
unsigned short Size) : CUtListElmt(&pValue->GetValueSegments())
{ cImmediate = true;
- std::memcpy(cImmData, pImmData, Size); cSize = Size; }
+ std::memcpy(cImmData, pImmData, Size); cSize = Size; }
bool IsImmediate() { return cImmediate; }
BenContainerPos GetPosition() { return cPos; }
size_t GetSize() { return cSize; }
diff --git a/lotuswordpro/source/filter/lwpfribptr.cxx b/lotuswordpro/source/filter/lwpfribptr.cxx
index 2001fe2069f3..2a7566267ba6 100644
--- a/lotuswordpro/source/filter/lwpfribptr.cxx
+++ b/lotuswordpro/source/filter/lwpfribptr.cxx
@@ -169,8 +169,8 @@ void LwpFribPtr::XFConvert()
}
}
- switch(nFribType)
- {
+ switch(nFribType)
+ {
case FRIB_TAG_TEXT:
{
LwpFribText* textFrib= static_cast<LwpFribText*>(pFrib);
diff --git a/lotuswordpro/source/filter/lwpfribsection.cxx b/lotuswordpro/source/filter/lwpfribsection.cxx
index 95bd07ca1644..ccb7307b4fe7 100644
--- a/lotuswordpro/source/filter/lwpfribsection.cxx
+++ b/lotuswordpro/source/filter/lwpfribsection.cxx
@@ -318,15 +318,11 @@ void LwpMasterPage::RegisterMasterPage(LwpFrib* pFrib)
pSectStyle->SetMarginRight(fRight);
}
- //if(bSectionColumns)
- //{
- //set columns
- XFColumns* pColumns = m_pLayout->GetXFColumns();
- if(pColumns)
- {
- pSectStyle->SetColumns(pColumns);
- }
- //}
+ XFColumns* pColumns = m_pLayout->GetXFColumns();
+ if(pColumns)
+ {
+ pSectStyle->SetColumns(pColumns);
+ }
m_SectionStyleName = pXFStyleManager->AddStyle(std::move(pSectStyle)).m_pStyle->GetStyleName();
}
}
diff --git a/lotuswordpro/source/filter/lwpparastyle.cxx b/lotuswordpro/source/filter/lwpparastyle.cxx
index e99ee6a9e603..89a0811d35a9 100644
--- a/lotuswordpro/source/filter/lwpparastyle.cxx
+++ b/lotuswordpro/source/filter/lwpparastyle.cxx
@@ -511,8 +511,8 @@ void LwpParaStyle::ApplySpacing(LwpPara* pPara, XFParaStyle* pParaStyle, LwpSpac
break;
case LwpSpacingCommonOverride::SPACING_CUSTOM:
{
- xftype = enumLHHeight;
- height = LwpTools::ConvertToMetric(LwpTools::ConvertFromUnits(sal_Int32(float(multiple)/65536L*amount)));
+ xftype = enumLHHeight;
+ height = LwpTools::ConvertToMetric(LwpTools::ConvertFromUnits(sal_Int32(float(multiple)/65536L*amount)));
pParaStyle->SetLineHeight(xftype,height);
}
break;
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx
index b595dc152c6a..e7438cb27b0d 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -1310,7 +1310,7 @@ void LwpTableLayout::SplitConflictCells()
iter1 = m_RowsMap.find(i);
if (iter1 == m_RowsMap.end())//default rows
{
- i++;
+ i++;
continue;
}
pRowLayout= iter1->second;
@@ -1326,9 +1326,9 @@ void LwpTableLayout::SplitConflictCells()
for (sal_uInt16 j = i+1; j<nEffectRows; j++)
{
iter2 = m_RowsMap.find(j);
- if (iter2 == m_RowsMap.end())
+ if (iter2 == m_RowsMap.end())
continue;
- pEffectRow = iter2->second;
+ pEffectRow = iter2->second;
if (!pEffectRow->GetMergeCellFlag())
continue;
else
diff --git a/lotuswordpro/source/filter/tocread.cxx b/lotuswordpro/source/filter/tocread.cxx
index 8cc0d7cdb9ab..e2421efb0931 100644
--- a/lotuswordpro/source/filter/tocread.cxx
+++ b/lotuswordpro/source/filter/tocread.cxx
@@ -112,7 +112,8 @@ CBenTOCReader::ReadLabel(unsigned long * pTOCOffset, unsigned long * pTOCSize)
BenByte * pCurrLabel = Label + BEN_MAGIC_BYTES_SIZE;
BenWord Flags =
- UtGetIntelWord(pCurrLabel); pCurrLabel += 2; // Flags
+ UtGetIntelWord(pCurrLabel);
+ pCurrLabel += 2; // Flags
// Newer files are 0x0101--indicates if big or little endian. Older
// files are 0x0 for flags
if (Flags != 0x0101 && Flags != 0x0)
diff --git a/lotuswordpro/source/filter/utlist.hxx b/lotuswordpro/source/filter/utlist.hxx
index 58a666a2f8a3..9913e3359fd8 100644
--- a/lotuswordpro/source/filter/utlist.hxx
+++ b/lotuswordpro/source/filter/utlist.hxx
@@ -95,8 +95,10 @@ private: // Data
class CUtList
{
public: // Methods
- CUtList() { cDummyElmt.SetNext(&cDummyElmt);
- cDummyElmt.SetPrev(&cDummyElmt); }
+ CUtList() {
+ cDummyElmt.SetNext(&cDummyElmt);
+ cDummyElmt.SetPrev(&cDummyElmt);
+ }
virtual ~CUtList();
CUtListElmt * GetFirst() { return cDummyElmt.GetNext(); }
CUtListElmt * GetLast() { return cDummyElmt.GetPrev(); }
commit de8c193833a7c60826015ecaed13d9fb3d1e0aba
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Feb 8 13:17:50 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Feb 9 17:07:29 2019 +0100
loplugin:indentation in helpcompiler..io
Change-Id: Ia3f05662cc9542feeac3096d29e9dec6d1858620
Reviewed-on: https://gerrit.libreoffice.org/67558
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/helpcompiler/source/BasCodeTagger.cxx b/helpcompiler/source/BasCodeTagger.cxx
index 8af743e1b5f7..369c49c389d5 100644
--- a/helpcompiler/source/BasCodeTagger.cxx
+++ b/helpcompiler/source/BasCodeTagger.cxx
@@ -52,12 +52,11 @@ bool LibXmlTreeWalker::end() const
BasicCodeTagger::BasicCodeTagger( xmlDocPtr rootDoc ):
m_Highlighter(HighlighterLanguage::Basic)
{
- if ( rootDoc == nullptr )
- throw NULL_DOCUMENT;
- m_pDocument = rootDoc;
+ if ( rootDoc == nullptr )
+ throw NULL_DOCUMENT;
+ m_pDocument = rootDoc;
m_pXmlTreeWalker = nullptr;
m_bTaggingCompleted = false;
-
}
BasicCodeTagger::~BasicCodeTagger()
@@ -69,7 +68,7 @@ BasicCodeTagger::~BasicCodeTagger()
*/
void BasicCodeTagger::getBasicCodeContainerNodes()
{
- xmlNodePtr currentNode;
+ xmlNodePtr currentNode;
m_BasicCodeContainerTags.clear();
@@ -163,7 +162,7 @@ void BasicCodeTagger::tagParagraph( xmlNodePtr paragraph )
*/
void BasicCodeTagger::tagBasicCodes()
{
- if ( m_bTaggingCompleted )
+ if ( m_bTaggingCompleted )
return;
//gather <bascode> nodes
try
diff --git a/hwpfilter/source/drawing.h b/hwpfilter/source/drawing.h
index 7e986455f935..60bd74f80f80 100644
--- a/hwpfilter/source/drawing.h
+++ b/hwpfilter/source/drawing.h
@@ -275,9 +275,9 @@ static bool LoadCommonHeader(HWPDrawingObject * hdo, unsigned short * link_info)
return false;
common_size += 278;
}
- if( ( size >= common_size + 3 ) && ( hdo->property.flag & HWPDO_FLAG_WATERMARK ) )
+ if( ( size >= common_size + 3 ) && ( hdo->property.flag & HWPDO_FLAG_WATERMARK ) )
//if( ( size >= common_size ) && ( hdo->property.flag >> 20 & 0x01 ) )
- {
+ {
if (size - common_size >= 5)
hmem->skipBlock(2);
unsigned char tmp8;
@@ -311,9 +311,9 @@ static bool LoadCommonHeader(HWPDrawingObject * hdo, unsigned short * link_info)
return false;
}
- if (size <= common_size)
+ if (size <= common_size)
return true;
- return hmem->skipBlock(size - common_size ) != 0;
+ return hmem->skipBlock(size - common_size ) != 0;
}
static std::unique_ptr<HWPDrawingObject> LoadDrawingObject(void)
diff --git a/hwpfilter/source/fontmap.cxx b/hwpfilter/source/fontmap.cxx
index 874d8d20579e..52fffd8f910a 100644
--- a/hwpfilter/source/fontmap.cxx
+++ b/hwpfilter/source/fontmap.cxx
@@ -149,9 +149,9 @@ int getRepFamilyName(const char* orig, char *buf, double &ratio)
for( int i = 0 ; i < int(SAL_N_ELEMENTS(FontMapTab)); i++)
{
if( !strcmp(orig, FontMapTab[i].familyname) ){
- ratio = FontMapTab[i].ratio;
+ ratio = FontMapTab[i].ratio;
return strlen( strcpy(buf,RepFontTab[FontMapTab[i].key]) );
- }
+ }
}
ratio = FontMapTab[0].ratio;
return strlen( strcpy(buf, RepFontTab[0] ) );
diff --git a/hwpfilter/source/formula.cxx b/hwpfilter/source/formula.cxx
index 362039a0036a..119bd7642355 100644
--- a/hwpfilter/source/formula.cxx
+++ b/hwpfilter/source/formula.cxx
@@ -88,24 +88,24 @@ void Formula::makeLines(Node *res)
void Formula::makeLine(Node *res)
{
- if( !res ) return;
+ if( !res ) return;
#ifdef DEBUG
- inds; fprintf(stderr,"<math:mrow>\n");
+ inds; fprintf(stderr,"<math:mrow>\n");
#else
- rstartEl("math:mrow", mxList.get());
+ rstartEl("math:mrow", mxList.get());
#endif
- if( res->child )
+ if( res->child )
makeExprList( res->child );
#ifdef DEBUG
- inde; fprintf(stderr,"</math:mrow>\n");
+ inde; fprintf(stderr,"</math:mrow>\n");
#else
- rendEl("math:mrow");
+ rendEl("math:mrow");
#endif
}
void Formula::makeExprList(Node *res)
{
- if( !res ) return;
+ if( !res ) return;
Node *tmp = res->child;
if( !tmp ) return ;
@@ -121,7 +121,7 @@ void Formula::makeExprList(Node *res)
void Formula::makeExpr(Node *res)
{
- if( !res ) return;
+ if( !res ) return;
Node *tmp = res->child;
if( !tmp ) return;
switch( tmp->id ) {
@@ -184,10 +184,10 @@ void Formula::makeExpr(Node *res)
void Formula::makeIdentifier(Node *res)
{
- Node *tmp = res;
- if( !tmp ) return;
- if( !tmp->value ) return;
- switch( tmp->id ){
+ Node *tmp = res;
+ if( !tmp ) return;
+ if( !tmp->value ) return;
+ switch( tmp->id ){
case ID_CHARACTER :
#ifdef DEBUG
inds;
diff --git a/hwpfilter/source/hbox.cxx b/hwpfilter/source/hbox.cxx
index cb1c8da4e1af..d3a2033290a5 100644
--- a/hwpfilter/source/hbox.cxx
+++ b/hwpfilter/source/hbox.cxx
@@ -540,7 +540,7 @@ enum
hchar_string Outline::GetUnicode() const
{
const hchar *p;
- hchar buffer[255];
+ hchar buffer[255];
buffer[0] = 0;
if (kind == OUTLINE_NUM)
@@ -583,12 +583,12 @@ hchar_string Outline::GetUnicode() const
p = GetOutlineStyleChars(shape);
buffer[0] = p[level];
buffer[1] = 0;
- return hstr2ucsstr(buffer);
+ return hstr2ucsstr(buffer);
}
case OLSTY_USER:
case OLSTY_BULUSER:
{
- char dest[80];
+ char dest[80];
int l = 0;
int i = level;
if( deco[i][0] ){
@@ -660,7 +660,7 @@ hchar_string Outline::GetUnicode() const
}
str2hstr(buf, buffer + l);
l += strlen(buf);
- break;
+ break;
}
default:
buffer[l++] = user_shape[i];
diff --git a/hwpfilter/source/hcode.cxx b/hwpfilter/source/hcode.cxx
index 37d7045353d8..f601c8a78187 100644
--- a/hwpfilter/source/hcode.cxx
+++ b/hwpfilter/source/hcode.cxx
@@ -891,7 +891,7 @@ int hcharconv(hchar ch, hchar *dest, int codeType)
unsigned char lo;
//printf("hcharconv[%04x]\n",ch);
if (ch < 128){
- dest[0] = ch;
+ dest[0] = ch;
return 1;
}
if (IsHangul(ch))
@@ -921,10 +921,10 @@ int hcharconv(hchar ch, hchar *dest, int codeType)
*/
if ((index = ch - 0x4000) >= 4888)
{
- if( codeType == UNICODE )
- dest[0]= 0x25A1;
- else
- dest[0]= 0xA1E0;
+ if( codeType == UNICODE )
+ dest[0]= 0x25A1;
+ else
+ dest[0]= 0xA1E0;
return 1;
}
if (codeType == KS)
@@ -951,12 +951,12 @@ int hcharconv(hchar ch, hchar *dest, int codeType)
ch = (hi << 8) | lo;
}
//printf("hcharconv Hanja[%04x]\n",ch);
- dest[0] = ch;
+ dest[0] = ch;
return 1;
}
if (LineCharDir(ch))
{
- dest[0] = lineCharConv(ch);
+ dest[0] = lineCharConv(ch);
return 1;
}
else if (0x2f00 <= ch && ch <= 0x2f6f && (ch & 0x0f) < 9)
@@ -975,7 +975,7 @@ int hcharconv(hchar ch, hchar *dest, int codeType)
else ch = 0xa2b9;
ch = (lo < 6) ? ch : ch + 1;
- if( codeType == UNICODE)
+ if( codeType == UNICODE)
ch = ksc5601_sym_to_ucs2(ch);
}
else
@@ -990,7 +990,7 @@ int hcharconv(hchar ch, hchar *dest, int codeType)
ch = (lo < 6) ? ch : ch + 1;
}
//printf("hcharconv Bullet[%04x]\n",ch);
- dest[0] = ch;
+ dest[0] = ch;
return 1 ;
}
/*
@@ -1002,13 +1002,13 @@ int hcharconv(hchar ch, hchar *dest, int codeType)
if( codeType != KSSM )
{
//printf("code[0x%04x]\n",ch);
- hchar ch2 = ch;
+ hchar ch2 = ch;
ch = s_hh2ks(ch);
//printf("code ks[0x%04x]\n",ch);
- if( codeType == UNICODE ){
+ if( codeType == UNICODE ){
if (ch < 128){
- dest[0] = ch;
- return 1;
+ dest[0] = ch;
+ return 1;
}
/* Hangul and Computer: 0x37c0 ~ 0x37c5 */
if( ch2 >= 0x37c0 && ch2 <= 0x37c5 ){
@@ -1037,7 +1037,7 @@ int hcharconv(hchar ch, hchar *dest, int codeType)
ch = ksc5601_sym_to_ucs2(ch);
}
//printf("code ucs2[0x%04x]\n",ch);
- }
+ }
}
else{
ch = s_hh2kssm(ch);
@@ -1051,7 +1051,7 @@ int hcharconv(hchar ch, hchar *dest, int codeType)
return 1;
}
//printf("hcharconv Special[%04x]\n",ch);
- dest[0] = ch;
+ dest[0] = ch;
return 1;
}
}
@@ -1067,7 +1067,7 @@ int kssm_hangul_to_ucs2(hchar ch, hchar *dest)
//printf("kssm_hangul_to_ucs2 : [%d,%d,%d]\n", choseong,joongseong,jongseong);
- if( joongseong < 2 ){ /* Not combined area, medial sound = 0,1 */
+ if( joongseong < 2 ){ /* Not combined area, medial sound = 0,1 */
if( joongseong == 0 && ch < 0xa414 ){ /* consonants and vowels includes old characters */
int index = choseong * 32 + jongseong;
dest[0] = jamo_to_unicode[index];
@@ -1090,8 +1090,8 @@ int kssm_hangul_to_ucs2(hchar ch, hchar *dest)
return 1;
}
else if ( joongseong == 2 && jongseong == 1 ){ /* Consonant */
- dest[0] = choseong_to_unicode[choseong];
- return 1;
+ dest[0] = choseong_to_unicode[choseong];
+ return 1;
}
else if( choseong > 20 || choseong == 0 ||
joongseong == 17 || joongseong == 24 ||
@@ -1130,7 +1130,7 @@ int kssm_hangul_to_ucs2(hchar ch, hchar *dest)
joongseong *= NUM_JONGSEONG;
jongseong -= jongseong > 0x12 ? 2 : 1;
- dest[0] = UNI_HANGUL_FIRST + choseong + joongseong + jongseong;
+ dest[0] = UNI_HANGUL_FIRST + choseong + joongseong + jongseong;
return 1;
}
@@ -1179,11 +1179,11 @@ hchar_string hstr2ucsstr(hchar const* hstr)
{
::std::string ret;
int j;
- hchar dest[3];
+ hchar dest[3];
for( ; *hstr ; )
{
int res = hcharconv(*hstr++, dest, KS);
- for( j = 0 ; j < res ; j++ ){
+ for( j = 0 ; j < res ; j++ ){
int c = dest[j];
if( c < 32 )
c = ' ';
@@ -1196,7 +1196,7 @@ hchar_string hstr2ucsstr(hchar const* hstr)
ret.push_back(sal::static_int_cast<char>((c >> 8 ) & 0xff));
ret.push_back(sal::static_int_cast<char>(c & 0xff));
}
- }
+ }
}
return ret;
}
@@ -1334,16 +1334,16 @@ char *hcolor2str(uchar color, uchar shade, char *buf, bool bIsChar)
ret.append("http://");
}
}
- }
- for (; i < strlen(src); i++)
- {
+ }
+ for (; i < strlen(src); i++)
+ {
if (src[i] == '\\') {
ret.push_back('/');
} else {
ret.push_back(src[i]);
}
- }
- return ret;
+ }
+ return ret;
}
#ifdef _WIN32
diff --git a/hwpfilter/source/hpara.cxx b/hwpfilter/source/hpara.cxx
index 08486c827d08..e470135d09f2 100644
--- a/hwpfilter/source/hpara.cxx
+++ b/hwpfilter/source/hpara.cxx
@@ -170,7 +170,7 @@ bool HWPPara::Read(HWPFile & hwpf, unsigned char flag)
return false;
if (hhstr[ii]->hh == CH_END_PARA)
break;
- if( hhstr[ii]->hh < CH_END_PARA )
+ if( hhstr[ii]->hh < CH_END_PARA )
pshape->reserved[0] = 0;
ii += hhstr[ii]->WSize();
}
diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx
index 2ceefc481c2f..8f221c743a43 100644
--- a/hwpfilter/source/hwpfile.cxx
+++ b/hwpfilter/source/hwpfile.cxx
@@ -250,11 +250,11 @@ void HWPFile::ReadParaList(std::vector< std::unique_ptr<HWPPara> > &aplist, unsi
unsigned char prev_etcflag = 0;
while (spNode->Read(*this, flag))
{
- if( !(spNode->etcflag & 0x04) ){
+ if( !(spNode->etcflag & 0x04) ){
tmp_etcflag = spNode->etcflag;
spNode->etcflag = prev_etcflag;
prev_etcflag = tmp_etcflag;
- }
+ }
if (spNode->nch && spNode->reuse_shape)
{
if (!aplist.empty()){
diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx
index c1899045c4e4..86c2dea33494 100644
--- a/hwpfilter/source/hwpread.cxx
+++ b/hwpfilter/source/hwpread.cxx
@@ -100,7 +100,7 @@ bool FieldCode::Read(HWPFile & hwpf)
hwpf.SkipBlock(binlen);
- if( type[0] == 3 && type[1] == 2 ){ /* It must create a format as created date. */
+ if( type[0] == 3 && type[1] == 2 ){ /* It must create a format as created date. */
DateCode *pDate = new DateCode;
for (int i = 0 ; i < static_cast<int>(len3_); i++) {
if(str3[i] == 0 ) break;
@@ -109,7 +109,7 @@ bool FieldCode::Read(HWPFile & hwpf)
}
hwpf.AddDateFormat(pDate);
m_pDate.reset( pDate );
- }
+ }
return true;
}
@@ -225,7 +225,7 @@ bool TxtBox::Read(HWPFile & hwpf)
hwpf.Read2b(&dummy2, 1);
style.boxnum = fboxnum++;
- zorder = zindex++;
+ zorder = zindex++;
hwpf.Read1b(style.anchor_type);
hwpf.Read1b(style.txtflow);
hwpf.Read2b(&style.xpos, 1);
@@ -249,7 +249,7 @@ bool TxtBox::Read(HWPFile & hwpf)
hwpf.Read2b(&pgx, 1);
hwpf.Read2b(&pgy, 1);
hwpf.Read2b(&pgno, 1);
- if( ( pgno +1 ) != hwpf.getCurrentPage() )
+ if( ( pgno +1 ) != hwpf.getCurrentPage() )
pgno = sal::static_int_cast<short>(hwpf.getCurrentPage() -1) ;
hwpf.Read2b(&showpg, 1);
@@ -380,7 +380,7 @@ bool Picture::Read(HWPFile & hwpf)
hwpf.Read2b(&dummy2, 1);
style.boxnum = fboxnum++;
- zorder = zindex++;
+ zorder = zindex++;
hwpf.Read1b(style.anchor_type); /* Reference position */
hwpf.Read1b(style.txtflow); /* Avoid painting. 0-2 (seat occupied, transparency, harmony) */
hwpf.Read2b(&style.xpos, 1); /* Horizontal position: 1=left, 2=right, 3=center, and others=any */
@@ -515,7 +515,7 @@ bool Line::Read(HWPFile & hwpf)
hwpf.AddBox(this);
style.boxnum = fboxnum++;
- zorder = zindex++;
+ zorder = zindex++;
style.boxtype = 'L';
hwpf.ReadBlock(&reserved2, 8);
hwpf.Read1b(style.anchor_type);
@@ -603,9 +603,9 @@ bool HeaderFooter::Read(HWPFile & hwpf)
lnnumber = 0;
hwpf.ReadParaList(plist, CH_HEADER_FOOTER);
linenumber = sal::static_int_cast<unsigned char>(lnnumber);
- m_nPageNumber = hwpf.getCurrentPage();
- hwpf.setMaxSettedPage();
- hwpf.AddHeaderFooter(this);
+ m_nPageNumber = hwpf.getCurrentPage();
+ hwpf.setMaxSettedPage();
+ hwpf.AddHeaderFooter(this);
return !hwpf.State();
}
@@ -704,8 +704,8 @@ bool ShowPageNum::Read(HWPFile & hwpf)
if (hh != dummy){
return hwpf.SetState(HWP_InvalidFileFormat);
}
- m_nPageNumber = hwpf.getCurrentPage();
- hwpf.setMaxSettedPage();
+ m_nPageNumber = hwpf.getCurrentPage();
+ hwpf.setMaxSettedPage();
hwpf.AddPageNumber(this);
return !hwpf.State();
}
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index 1481c1b8e042..b7978a201936 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -599,20 +599,20 @@ void HwpReader::makeDrawMiscStyle( HWPDrawingObject *hdo )
padd( "draw:cx", sXML_CDATA,ascii(Int2Str(prop->center_x, "%d%%", buf)));
padd( "draw:cy", sXML_CDATA,ascii(Int2Str(prop->center_y, "%d%%", buf)));
- HWPInfo& hwpinfo = hwpfile.GetHWPInfo();
- int default_color = 0xffffff;
- if( hwpinfo.back_info.isset )
- {
+ HWPInfo& hwpinfo = hwpfile.GetHWPInfo();
+ int default_color = 0xffffff;
+ if( hwpinfo.back_info.isset )
+ {
if( hwpinfo.back_info.color[0] > 0 || hwpinfo.back_info.color[1] > 0
|| hwpinfo.back_info.color[2] > 0 )
default_color = hwpinfo.back_info.color[0] << 16 |
hwpinfo.back_info.color[1] << 8 | hwpinfo.back_info.color[2];
- }
+ }
- if( prop->fromcolor > 0xffffff )
- prop->fromcolor = default_color;
- if( prop->tocolor > 0xffffff )
- prop->tocolor = default_color;
+ if( prop->fromcolor > 0xffffff )
+ prop->fromcolor = default_color;
+ if( prop->tocolor > 0xffffff )
+ prop->tocolor = default_color;
if( prop->gstyle == 1)
{
@@ -1051,10 +1051,10 @@ void HwpReader::makeMasterStyles()
if( aSet[i].bIsSet ) /* If you've changed the current setting */
{
- if( !aSet[i].pagenumber ){
+ if( !aSet[i].pagenumber ){
if( pPrevSet && pPrevSet->pagenumber )
aSet[i].pagenumber = pPrevSet->pagenumber;
- }
+ }
if( aSet[i].pagenumber )
{
if( aSet[i].pagenumber->where == 7 && aSet[i].header )
@@ -1490,8 +1490,8 @@ void HwpReader::makePStyle(ParaShape const * pshape)
unsigned char tf = 0;
rstartEl("style:tab-stops",mxList.get());
- int tab_margin = pshape->left_margin + pshape->indent;
- if( tab_margin < 0 )
+ int tab_margin = pshape->left_margin + pshape->indent;
+ if( tab_margin < 0 )
tab_margin = 0;
for( int i = 0 ; i < MAXTABS -1 ; i++)
{
@@ -1806,11 +1806,11 @@ void HwpReader::makePageStyle()
void HwpReader::makeColumns(ColumnDef const *coldef)
{
if( !coldef ) return;
- padd("fo:column-count", sXML_CDATA, ascii(Int2Str(coldef->ncols, "%d", buf)));
- rstartEl("style:columns",mxList.get());
- mxList->clear();
- if( coldef->separator != 0 )
- {
+ padd("fo:column-count", sXML_CDATA, ascii(Int2Str(coldef->ncols, "%d", buf)));
+ rstartEl("style:columns",mxList.get());
+ mxList->clear();
+ if( coldef->separator != 0 )
+ {
switch( coldef->separator )
{
case 1: /* thin line */
@@ -1832,10 +1832,10 @@ void HwpReader::makeColumns(ColumnDef const *coldef)
rstartEl("style:column-sep",mxList.get());
mxList->clear();
rendEl("style:column-sep");
- }
- double spacing = WTI(coldef->spacing)/ 2. ;
- for(int ii = 0 ; ii < coldef->ncols ; ii++)
- {
+ }
+ double spacing = WTI(coldef->spacing)/ 2. ;
+ for(int ii = 0 ; ii < coldef->ncols ; ii++)
+ {
if( ii == 0 )
padd("fo:margin-left", sXML_CDATA, "0mm");
else
@@ -1849,8 +1849,8 @@ void HwpReader::makeColumns(ColumnDef const *coldef)
rstartEl("style:column",mxList.get());
mxList->clear();
rendEl("style:column");
- }
- rendEl("style:columns");
+ }
+ rendEl("style:columns");
}
void HwpReader::makeTStyle(CharShape const * cshape)
@@ -2079,19 +2079,19 @@ void HwpReader::makeDrawStyle( HWPDrawingObject * hdo, FBoxStyle * fstyle)
{
padd("draw:marker-start", sXML_CDATA,
ascii(ArrowShape[hdo->property.line_tstyle].name) );
- if( hdo->property.line_width > 100 )
+ if( hdo->property.line_width > 100 )
padd("draw:marker-start-width", sXML_CDATA,
Double2Str( WTMM(hdo->property.line_width * 3)) + "mm");
- else if( hdo->property.line_width > 80 )
+ else if( hdo->property.line_width > 80 )
padd("draw:marker-start-width", sXML_CDATA,
Double2Str( WTMM(hdo->property.line_width * 4)) + "mm");
- else if( hdo->property.line_width > 60 )
+ else if( hdo->property.line_width > 60 )
padd("draw:marker-start-width", sXML_CDATA,
Double2Str( WTMM(hdo->property.line_width * 5)) + "mm");
- else if( hdo->property.line_width > 40 )
+ else if( hdo->property.line_width > 40 )
padd("draw:marker-start-width", sXML_CDATA,
Double2Str( WTMM(hdo->property.line_width * 6)) + "mm");
- else
+ else
padd("draw:marker-start-width", sXML_CDATA,
Double2Str( WTMM(hdo->property.line_width * 7)) + "mm");
}
@@ -2100,19 +2100,19 @@ void HwpReader::makeDrawStyle( HWPDrawingObject * hdo, FBoxStyle * fstyle)
{
padd("draw:marker-end", sXML_CDATA,
ascii(ArrowShape[hdo->property.line_hstyle].name) );
- if( hdo->property.line_width > 100 )
+ if( hdo->property.line_width > 100 )
padd("draw:marker-end-width", sXML_CDATA,
Double2Str( WTMM(hdo->property.line_width * 3)) + "mm");
- else if( hdo->property.line_width > 80 )
+ else if( hdo->property.line_width > 80 )
padd("draw:marker-end-width", sXML_CDATA,
Double2Str( WTMM(hdo->property.line_width * 4)) + "mm");
- else if( hdo->property.line_width > 60 )
+ else if( hdo->property.line_width > 60 )
padd("draw:marker-end-width", sXML_CDATA,
Double2Str( WTMM(hdo->property.line_width * 5)) + "mm");
- else if( hdo->property.line_width > 40 )
+ else if( hdo->property.line_width > 40 )
padd("draw:marker-end-width", sXML_CDATA,
Double2Str( WTMM(hdo->property.line_width * 6)) + "mm");
- else
+ else
padd("draw:marker-end-width", sXML_CDATA,
Double2Str( WTMM(hdo->property.line_width * 7)) + "mm");
}
@@ -2623,11 +2623,11 @@ void HwpReader::makeFStyle(FBoxStyle * fstyle)
}
}
- if( cell->linetype[0] == 0 && cell->linetype[1] == 0 &&
+ if( cell->linetype[0] == 0 && cell->linetype[1] == 0 &&
cell->linetype[2] == 0 && cell->linetype[3] == 0 ){
padd("fo:padding", sXML_CDATA,"0mm");
- }
- else{
+ }
+ else{
padd("fo:padding-left", sXML_CDATA,
Double2Str(WTMM(fstyle->margin[1][0])) + "mm");
padd("fo:padding-right", sXML_CDATA,
@@ -2636,7 +2636,7 @@ void HwpReader::makeFStyle(FBoxStyle * fstyle)
Double2Str(WTMM(fstyle->margin[1][2])) + "mm");
padd("fo:padding-bottom", sXML_CDATA,
Double2Str(WTMM(fstyle->margin[1][3])) + "mm");
- }
+ }
if(cell->shade != 0)
padd("fo:background-color", sXML_CDATA,
ascii(hcolor2str(
@@ -2655,7 +2655,7 @@ void HwpReader::makeFStyle(FBoxStyle * fstyle)
}
else if( fstyle->boxtype == 'G' )
{
- if( fstyle->margin[1][0] || fstyle->margin[1][1] || fstyle->margin[1][2] || fstyle->margin[1][3] ){
+ if( fstyle->margin[1][0] || fstyle->margin[1][1] || fstyle->margin[1][2] || fstyle->margin[1][3] ){
OUString clip = "rect(";
clip += Double2Str(WTMM(-fstyle->margin[1][0]) ) + "mm ";
clip += Double2Str(WTMM(-fstyle->margin[1][1]) ) + "mm ";
@@ -2663,7 +2663,7 @@ void HwpReader::makeFStyle(FBoxStyle * fstyle)
clip += Double2Str(WTMM(-fstyle->margin[1][3]) ) + "mm)";
padd("style:mirror", sXML_CDATA, "none");
padd("fo:clip", sXML_CDATA, clip);
- }
+ }
char *cell = static_cast<char *>(fstyle->cell);
padd("draw:luminance", sXML_CDATA,
ascii(Int2Str(cell[0], "%d%%", buf)));
@@ -2711,7 +2711,7 @@ void HwpReader::make_text_p0(HWPPara * para, bool bParaStart)
hchar_string str;
int n;
int res;
- hchar dest[3];
+ hchar dest[3];
unsigned char firstspace = 0;
if( !bParaStart)
{
@@ -2848,7 +2848,7 @@ void HwpReader::make_text_p1(HWPPara * para,bool bParaStart)
}
else
{
- if( para->hhstr[n]->hh < CH_SPACE )
+ if( para->hhstr[n]->hh < CH_SPACE )
continue;
if (para->hhstr[n]->hh == CH_SPACE)
firstspace = 0;
@@ -2871,7 +2871,7 @@ void HwpReader::make_text_p3(HWPPara * para,bool bParaStart)
{
hchar_string str;
int n, res;
- hchar dest[3];
+ hchar dest[3];
unsigned char firstspace = 0;
bool pstart = bParaStart;
bool tstart = false;
@@ -2957,23 +2957,23 @@ void HwpReader::make_text_p3(HWPPara * para,bool bParaStart)
if( !tstart ) {STARTT;}
makeChars(str);
firstspace = 1;
- if( hbox->type[0] == 4 && hbox->type[1] == 0 )
- {
- field = hbox->str3.get();
- }
- else{
- makeFieldCode(str, hbox);
- }
+ if( hbox->type[0] == 4 && hbox->type[1] == 0 )
+ {
+ field = hbox->str3.get();
+ }
+ else{
+ makeFieldCode(str, hbox);
+ }
infield = true;
}
else
{
firstspace = 1;
- if( hbox->type[0] == 4 && hbox->type[1] == 0 )
- {
- makeFieldCode(str, hbox);
- field = nullptr;
- }
+ if( hbox->type[0] == 4 && hbox->type[1] == 0 )
+ {
+ makeFieldCode(str, hbox);
+ field = nullptr;
+ }
infield = false;
str.clear();
}
@@ -3140,7 +3140,7 @@ void HwpReader::makeFieldCode(hchar_string const & rStr, FieldCode const *hbox)
if( hbox->type[0] == 4 && hbox->type[1] == 0 )
{
padd("text:placeholder-type", sXML_CDATA, "text");
- if( field )
+ if( field )
padd("text:description", sXML_CDATA, reinterpret_cast<sal_Unicode const *>(hconv(field)));
rstartEl( "text:placeholder", mxList.get());
mxList->clear();
@@ -3245,10 +3245,10 @@ void HwpReader::makeFieldCode(hchar_string const & rStr, FieldCode const *hbox)
if( hbox->m_pDate )
padd("style:data-style-name", sXML_CDATA,
ascii(Int2Str(hbox->m_pDate->key, "N%d", buf)));
- rstartEl( "text:creation-date", mxList.get() );
- mxList->clear();
- rchars( reinterpret_cast<sal_Unicode const *>(hconv(hbox->str2.get())) );
- rendEl( "text:creation-date" );
+ rstartEl( "text:creation-date", mxList.get() );
+ mxList->clear();
+ rchars( reinterpret_cast<sal_Unicode const *>(hconv(hbox->str2.get())) );
+ rendEl( "text:creation-date" );
}
}
@@ -3525,7 +3525,7 @@ void HwpReader::makeTextBox(TxtBox * hbox)
ascii(Int2Str(hbox->style.boxnum, "CapBox%d", buf)));
padd("draw:name", sXML_CDATA,
ascii(Int2Str(hbox->style.boxnum, "CaptionBox%d", buf)));
- padd("draw:z-index", sXML_CDATA,
+ padd("draw:z-index", sXML_CDATA,
ascii(Int2Str(hbox->zorder, "%d", buf)));
switch (hbox->style.anchor_type)
{
@@ -3674,7 +3674,7 @@ void HwpReader::makeFormula(TxtBox * hbox)
HWPPara* pPar;
int n, c, res;
- hchar dest[3];
+ hchar dest[3];
size_t l = 0;
pPar = hbox->plists[0].front().get();
@@ -3720,7 +3720,7 @@ void HwpReader::makeFormula(TxtBox * hbox)
void HwpReader::makeHyperText(TxtBox * hbox)
{
HyperText *hypert = hwpfile.GetHyperText();
- if( !hypert ) return;
+ if( !hypert ) return;
if (hypert->filename[0] != '\0') {
::std::string const tmp = hstr2ksstr(hypert->bookmark);
@@ -3779,7 +3779,7 @@ void HwpReader::makePicture(Picture * hbox)
ascii(Int2Str(hbox->style.boxnum, "CapBox%d", buf)));
padd("draw:name", sXML_CDATA,
ascii(Int2Str(hbox->style.boxnum, "CaptionBox%d", buf)));
- padd("draw:z-index", sXML_CDATA,
+ padd("draw:z-index", sXML_CDATA,
ascii(Int2Str(hbox->zorder, "%d", buf)));
switch (hbox->style.anchor_type)
{
@@ -3845,7 +3845,7 @@ void HwpReader::makePicture(Picture * hbox)
if( hbox->style.cap_len <= 0 )
{
- padd("draw:z-index", sXML_CDATA,
+ padd("draw:z-index", sXML_CDATA,
ascii(Int2Str(hbox->zorder, "%d", buf)));
switch (hbox->style.anchor_type)
{
@@ -3895,24 +3895,24 @@ void HwpReader::makePicture(Picture * hbox)
padd("xlink:actuate", sXML_CDATA, "onLoad");
}
- if( hbox->pictype == PICTYPE_OLE )
+ if( hbox->pictype == PICTYPE_OLE )
rstartEl("draw:object-ole", mxList.get());
- else
+ else
rstartEl("draw:image", mxList.get());
mxList->clear();
if (hbox->pictype == PICTYPE_EMBED || hbox->pictype == PICTYPE_OLE)
{
rstartEl("office:binary-data", mxList.get());
mxList->clear();
- if( hbox->pictype == PICTYPE_EMBED ){
+ if( hbox->pictype == PICTYPE_EMBED ){
EmPicture *emp = hwpfile.GetEmPicture(hbox);
if( emp )
{
std::shared_ptr<char> pStr(base64_encode_string( emp->data.get(), emp->size ), Free<char>());
rchars(ascii(pStr.get()));
}
- }
- else{
+ }
+ else{
if( hwpfile.oledata ){
#ifdef _WIN32
LPSTORAGE srcsto;
@@ -3942,12 +3942,12 @@ void HwpReader::makePicture(Picture * hbox)
rchars("");
#endif
}
- }
+ }
rendEl("office:binary-data");
}
- if( hbox->pictype == PICTYPE_OLE )
+ if( hbox->pictype == PICTYPE_OLE )
rendEl("draw:object-ole");
- else
+ else
rendEl("draw:image");
if( hbox->ishyper )
{
@@ -4020,7 +4020,7 @@ void HwpReader::makePictureDRAW(HWPDrawingObject *drawobj, Picture * hbox)
}
else
{
- bIsRotate = false;
+ bIsRotate = false;
if( (drawobj->property.flag & HWPDO_FLAG_ROTATION) &&
(drawobj->property.parall.pt[0].y != drawobj->property.parall.pt[1].y) &&
//(drawobj->type == HWPDO_RECT || drawobj->type == HWPDO_ADVANCED_ELLIPSE || drawobj->type == HWPDO_ADVANCED_ARC )
@@ -4028,70 +4028,70 @@ void HwpReader::makePictureDRAW(HWPDrawingObject *drawobj, Picture * hbox)
)
{
- int i;
+ int i;
ZZParall *pal = &drawobj->property.parall;
- ZZPoint pt[3], r_pt[3];
- for(i = 0 ; i < 3 ; i++ ){
+ ZZPoint pt[3], r_pt[3];
+ for(i = 0 ; i < 3 ; i++ ){
pt[i].x = pal->pt[i].x - drawobj->property.rot_originx;
/* Convert to a physical coordinate */
pt[i].y = -(pal->pt[i].y - drawobj->property.rot_originy);
- }
+ }
double rotate, skewX ;
- /* 2 - rotation angle calculation */
- if( pt[1].x == pt[0].x ){
+ /* 2 - rotation angle calculation */
+ if( pt[1].x == pt[0].x ){
if( pt[1].y > pt[0].y )
rotate = PI/2;
else
rotate = -(PI/2);
- }
- else
- rotate = atan(static_cast<double>( pt[1].y - pt[0].y )/(pt[1].x - pt[0].x ));
- if( pt[1].x < pt[0].x )
- rotate += PI;
+ }
+ else
+ rotate = atan(static_cast<double>( pt[1].y - pt[0].y )/(pt[1].x - pt[0].x ));
+ if( pt[1].x < pt[0].x )
+ rotate += PI;
- for( i = 0 ; i < 3 ; i++){
+ for( i = 0 ; i < 3 ; i++){
r_pt[i].x = static_cast<int>(pt[i].x * cos(-rotate) - pt[i].y * sin(-rotate));
r_pt[i].y = static_cast<int>(pt[i].y * cos(-rotate) + pt[i].x * sin(-rotate));
- }
+ }
- /* 4 - Calculation of reflex angle */
- if( r_pt[2].y == r_pt[1].y )
+ /* 4 - Calculation of reflex angle */
+ if( r_pt[2].y == r_pt[1].y )
skewX = 0;
- else
+ else
skewX = atan(static_cast<double>(r_pt[2].x - r_pt[1].x )/( r_pt[2].y - r_pt[1].y ));
- if( skewX >= PI/2 )
+ if( skewX >= PI/2 )
skewX -= PI;
- if( skewX <= -PI/2 )
+ if( skewX <= -PI/2 )
skewX += PI;
- OUString trans;
- if( skewX != 0.0 && rotate != 0.0 ){
- trans = "skewX (" + Double2Str(skewX)
- + ") rotate (" + Double2Str(rotate)
- + ") translate (" + Double2Str(WTMM(x + a + drawobj->offset2.x + pal->pt[0].x)) + "mm "
- + Double2Str(WTMM(y + b + drawobj->offset2.y + pal->pt[0].y)) + "mm)";
- bIsRotate = true;
- }
- else if( skewX != 0.0 ){
- trans = "skewX (" + Double2Str(skewX)
- + ") translate (" + Double2Str(WTMM(x + a + drawobj->offset2.x + pal->pt[0].x)) + "mm "
- + Double2Str(WTMM(y + b + drawobj->offset2.y + pal->pt[0].y)) + "mm)";
- bIsRotate = true;
- }
- else if( rotate != 0.0 ){
- trans = "rotate (" + Double2Str(rotate)
- + ") translate (" + Double2Str(WTMM(x + a + drawobj->offset2.x + pal->pt[0].x)) + "mm "
- + Double2Str(WTMM(y + b + drawobj->offset2.y + pal->pt[0].y)) + "mm)";
- bIsRotate = true;
- }
- if( bIsRotate ){
- drawobj->extent.w = static_cast<int>(sqrt(double(DBL(pt[1].x-pt[0].x)+DBL(pt[1].y-pt[0].y))));
- drawobj->extent.h = static_cast<int>(sqrt(double(DBL(pt[2].x-pt[1].x)+DBL(pt[2].y-pt[1].y))));
- padd("draw:transform", sXML_CDATA, trans);
- }
+ OUString trans;
+ if( skewX != 0.0 && rotate != 0.0 ){
+ trans = "skewX (" + Double2Str(skewX)
+ + ") rotate (" + Double2Str(rotate)
+ + ") translate (" + Double2Str(WTMM(x + a + drawobj->offset2.x + pal->pt[0].x)) + "mm "
+ + Double2Str(WTMM(y + b + drawobj->offset2.y + pal->pt[0].y)) + "mm)";
+ bIsRotate = true;
+ }
+ else if( skewX != 0.0 ){
+ trans = "skewX (" + Double2Str(skewX)
+ + ") translate (" + Double2Str(WTMM(x + a + drawobj->offset2.x + pal->pt[0].x)) + "mm "
+ + Double2Str(WTMM(y + b + drawobj->offset2.y + pal->pt[0].y)) + "mm)";
+ bIsRotate = true;
+ }
+ else if( rotate != 0.0 ){
+ trans = "rotate (" + Double2Str(rotate)
+ + ") translate (" + Double2Str(WTMM(x + a + drawobj->offset2.x + pal->pt[0].x)) + "mm "
+ + Double2Str(WTMM(y + b + drawobj->offset2.y + pal->pt[0].y)) + "mm)";
+ bIsRotate = true;
+ }
+ if( bIsRotate ){
+ drawobj->extent.w = static_cast<int>(sqrt(double(DBL(pt[1].x-pt[0].x)+DBL(pt[1].y-pt[0].y))));
+ drawobj->extent.h = static_cast<int>(sqrt(double(DBL(pt[2].x-pt[1].x)+DBL(pt[2].y-pt[1].y))));
+ padd("draw:transform", sXML_CDATA, trans);
+ }
}
switch (drawobj->type)
{
@@ -4182,11 +4182,11 @@ void HwpReader::makePictureDRAW(HWPDrawingObject *drawobj, Picture * hbox)
Double2Str (WTMM( y + b + drawobj->offset2.y)) + "mm");
}
- padd("svg:width", sXML_CDATA,
+ padd("svg:width", sXML_CDATA,
Double2Str (WTMM( drawobj->extent.w )) + "mm");
- padd("svg:height", sXML_CDATA,
+ padd("svg:height", sXML_CDATA,
Double2Str (WTMM( drawobj->extent.h )) + "mm");
- if( drawobj->type == HWPDO_ADVANCED_ELLIPSE ){
+ if( drawobj->type == HWPDO_ADVANCED_ELLIPSE ){
if( drawobj->u.arc.radial[0].x != drawobj->u.arc.radial[1].x
|| drawobj->u.arc.radial[0].y != drawobj->u.arc.radial[1].y ){
int Cx,Cy;
@@ -4203,7 +4203,7 @@ void HwpReader::makePictureDRAW(HWPDrawingObject *drawobj, Picture * hbox)
padd("draw:start-angle", sXML_CDATA, Double2Str(start_angle ));
padd("draw:end-angle", sXML_CDATA, Double2Str(end_angle));
}
- }
+ }
rstartEl("draw:ellipse", mxList.get());
mxList->clear();
if( drawobj->property.flag >> 19 & 0x01 &&
@@ -4225,7 +4225,7 @@ void HwpReader::makePictureDRAW(HWPDrawingObject *drawobj, Picture * hbox)
case HWPDO_ADVANCED_ARC:
{
/* If it is the arc, LibreOffice assumes the size as the entire ellipse size */
- uint flip = drawobj->u.line_arc.flip;
+ uint flip = drawobj->u.line_arc.flip;
if( !bIsRotate )
{
if( ( flip == 0 || flip == 2 ) && drawobj->type == HWPDO_ARC)
@@ -4242,17 +4242,17 @@ void HwpReader::makePictureDRAW(HWPDrawingObject *drawobj, Picture * hbox)
Double2Str (WTMM( y + b + drawobj->offset2.y)) + "mm");
}
- padd("svg:width", sXML_CDATA,
+ padd("svg:width", sXML_CDATA,
Double2Str (WTMM( drawobj->extent.w * 2)) + "mm");
- padd("svg:height", sXML_CDATA,
+ padd("svg:height", sXML_CDATA,
Double2Str (WTMM( drawobj->extent.h * 2)) + "mm");
- if( drawobj->property.flag & HWPDO_FLAG_DRAW_PIE ||
+ if( drawobj->property.flag & HWPDO_FLAG_DRAW_PIE ||
drawobj->property.fill_color < 0xffffff )
padd("draw:kind", sXML_CDATA, "section");
- else
+ else
padd("draw:kind", sXML_CDATA, "arc");
- if( drawobj->type == HWPDO_ADVANCED_ARC ){
+ if( drawobj->type == HWPDO_ADVANCED_ARC ){
double start_angle, end_angle;
ZZParall *pal = &drawobj->property.parall;
@@ -4288,8 +4288,8 @@ void HwpReader::makePictureDRAW(HWPDrawingObject *drawobj, Picture * hbox)
start_angle = end_angle;
end_angle = tmp_angle;
}
- padd("draw:start-angle", sXML_CDATA, Double2Str(start_angle * 180. / PI));
- padd("draw:end-angle", sXML_CDATA, Double2Str(end_angle * 180. / PI));
+ padd("draw:start-angle", sXML_CDATA, Double2Str(start_angle * 180. / PI));
+ padd("draw:end-angle", sXML_CDATA, Double2Str(end_angle * 180. / PI));
}
else{
@@ -4438,9 +4438,9 @@ void HwpReader::makePictureDRAW(HWPDrawingObject *drawobj, Picture * hbox)
{
bool bIsPolygon = false;
- padd("svg:x", sXML_CDATA,
+ padd("svg:x", sXML_CDATA,
Double2Str (WTMM( x + a + drawobj->offset2.x)) + "mm");
- padd("svg:y", sXML_CDATA,
+ padd("svg:y", sXML_CDATA,
Double2Str (WTMM( y + b + drawobj->offset2.y)) + "mm");
padd("svg:width", sXML_CDATA,
@@ -4581,7 +4581,7 @@ void HwpReader::makeHidden(Hidden * hbox)
{
hchar_string str;
int res;
- hchar dest[3];
+ hchar dest[3];
padd("text:condition", sXML_CDATA, "");
padd("text:string-value", sXML_CDATA, "");
diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 98f52939bcbe..eb75e9fc3317 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -622,13 +622,13 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal
// start empty
OUString result;
- // append prefix
- if( !should_ignore(prefix) ) result += prefix;
+ // append prefix
+ if( !should_ignore(prefix) ) result += prefix;
- // append formatted number
- using namespace style::NumberingType;
- switch( numType )
- {
+ // append formatted number
+ using namespace style::NumberingType;
+ switch( numType )
+ {
case CHARS_UPPER_LETTER:
lcl_formatChars( upperLetter, 26, number-1, result ); // 1=>A, 2=>B, ..., 26=>Z, 27=>AA, 28=>AB, ...
break;
@@ -905,23 +905,23 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal
default:
OSL_ASSERT(false);
throw IllegalArgumentException();
- }
+ }
- if (natNum) {
+ if (natNum) {
rtl::Reference<NativeNumberSupplierService> xNatNum(new NativeNumberSupplierService);
result += xNatNum->getNativeNumberStringParams(OUString::number(number), locale,
natNum, sNatNumParams);
- } else if (tableSize) {
+ } else if (tableSize) {
if ( number > tableSize && !bRecycleSymbol)
result += OUString::number( number);
else
result += OUString(&table[--number % tableSize], 1);
- }
+ }
- // append suffix
- if( !should_ignore(suffix) ) result += suffix;
+ // append suffix
+ if( !should_ignore(suffix) ) result += suffix;
- return result;
+ return result;
}
#define LANG_ALL (1 << 0)
diff --git a/i18npool/source/inputchecker/inputsequencechecker_hi.cxx b/i18npool/source/inputchecker/inputsequencechecker_hi.cxx
index c560833a9020..2a33fe104d7c 100644
--- a/i18npool/source/inputchecker/inputsequencechecker_hi.cxx
+++ b/i18npool/source/inputchecker/inputsequencechecker_hi.cxx
@@ -113,7 +113,7 @@ InputSequenceChecker_hi::checkInputSequence(const OUString& Text,
sal_Int16 inputCheckMode)
{
sal_Unicode currentChar = Text[nStartPos];
- sal_uInt16 ch1 = getCharType(inputChar);
+ sal_uInt16 ch1 = getCharType(inputChar);
sal_uInt16 ch2 = getCharType(currentChar);
return (DEV_Composible[inputCheckMode][dev_cell_check[ch2][ch1]]);
diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx
index 6944059729e4..c58f1cdbec16 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -109,10 +109,10 @@ LocaleNode* LocaleNode::createNode (const OUString& name, const Reference< XAttr
return new LCSearchNode (name,attr);
if ( name == "LC_MISC" )
return new LCMiscNode (name,attr);
- if ( name == "LC_NumberingLevel" )
- return new LCNumberingLevelNode (name, attr);
- if ( name == "LC_OutLineNumberingLevel" )
- return new LCOutlineNumberingLevelNode (name, attr);
+ if ( name == "LC_NumberingLevel" )
+ return new LCNumberingLevelNode (name, attr);
+ if ( name == "LC_OutLineNumberingLevel" )
+ return new LCOutlineNumberingLevelNode (name, attr);
return new LocaleNode(name,attr);
}
diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx
index 16bcfd3f96b2..2136ed4cdbf5 100644
--- a/i18npool/source/transliteration/transliterationImpl.cxx
+++ b/i18npool/source/transliteration/transliterationImpl.cxx
@@ -180,7 +180,7 @@ static TransliterationModules operator|(TransliterationModules lhs, Transliterat
void SAL_CALL
TransliterationImpl::loadModule( TransliterationModules modType, const Locale& rLocale )
{
- clear();
+ clear();
if (bool(modType & TransliterationModules_IGNORE_MASK) &&
bool(modType & TransliterationModules_NON_IGNORE_MASK))
{
diff --git a/i18nutil/source/utility/widthfolding.cxx b/i18nutil/source/utility/widthfolding.cxx
index 5b6b33b1426e..6f572080689c 100644
--- a/i18nutil/source/utility/widthfolding.cxx
+++ b/i18nutil/source/utility/widthfolding.cxx
@@ -70,13 +70,13 @@ OUString widthfolding::decompose_ja_voiced_sound_marks (const OUString& inStr, s
int i = int(c - 0x3040);
sal_Unicode first = decomposition_table[i].decomposited_character_1;
if (first != 0x0000) {
- *dst ++ = first;
- *dst ++ = decomposition_table[i].decomposited_character_2; // second
+ *dst ++ = first;
+ *dst ++ = decomposition_table[i].decomposited_character_2; // second
if (useOffset) {
*p ++ = position;
*p ++ = position ++;
}
- continue;
+ continue;
}
}
*dst ++ = c;
@@ -113,7 +113,7 @@ OUString widthfolding::compose_ja_voiced_sound_marks (const OUString& inStr, sal
sal_Unicode* dst = newStr->buffer;
// This conversion algorithm requires at least one character.
- if (nCount > 0) {
+ if (nCount > 0) {
// .. .. KA VOICE .. ..
// ^ ^
@@ -169,10 +169,10 @@ OUString widthfolding::compose_ja_voiced_sound_marks (const OUString& inStr, sal
position ++;
*p ++ = position ++;
}
- *dst ++ = composition_table[i][j];
- previousChar = *src ++;
- nCount --;
- continue;
+ *dst ++ = composition_table[i][j];
+ previousChar = *src ++;
+ nCount --;
+ continue;
}
}
if (useOffset)
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 25de8ecb17d0..0fbc7c78732f 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -532,7 +532,7 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
rOutStm.WriteCharPtr( "SfxSlotMode::NONE" );
rOutStm.WriteChar( ',' ) << endl;
- WriteTab( rOutStm, 4 );
+ WriteTab( rOutStm, 4 );
if ( GetDisableFlags().isEmpty() )
rOutStm.WriteCharPtr( "SfxDisableFlags::NONE" );
else
diff --git a/idlc/source/astscope.cxx b/idlc/source/astscope.cxx
index a8b8a159bde0..1ddda3984458 100644
--- a/idlc/source/astscope.cxx
+++ b/idlc/source/astscope.cxx
@@ -313,7 +313,7 @@ AstDeclaration* AstScope::lookupForAdd(AstDeclaration const * pDecl) const
AstDeclaration* pRetDecl = lookupByNameLocal(pDecl->getLocalName());
- return pRetDecl;
+ return pRetDecl;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idlc/source/options.cxx b/idlc/source/options.cxx
index d1dbe1a8680c..04db926dad0d 100644
--- a/idlc/source/options.cxx
+++ b/idlc/source/options.cxx
@@ -287,7 +287,8 @@ bool Options::initOptions(std::vector< std::string > & rArgs)
{
return badOption("invalid", option);
}
- OString param("-D"); param += OString((*first).c_str(), (*first).size());
+ OString param("-D");
+ param += OString((*first).c_str(), (*first).size());
if (m_options.count("-D") > 0)
{
OStringBuffer buffer(m_options["-D"]);
diff --git a/idlc/source/parser.y b/idlc/source/parser.y
index 054df1e81df7..a2b9c645656b 100644
--- a/idlc/source/parser.y
+++ b/idlc/source/parser.y
@@ -491,7 +491,7 @@ interface_decl :
identifier
{
idlc()->setParseState(PS_InterfaceIDSeen);
- checkIdentifier($3);
+ checkIdentifier($3);
$$ = $3;
}
;
@@ -823,7 +823,7 @@ opt_attrflag :
}
| error ']'
{
- yyerror("unknown property|attribute flag");
+ yyerror("unknown property|attribute flag");
yyerrok;
}
;
@@ -920,7 +920,7 @@ operation :
identifier
{
idlc()->setParseState(PS_OpIDSeen);
- checkIdentifier($3);
+ checkIdentifier($3);
AstInterface * pScope = static_cast< AstInterface * >(
idlc()->scopes()->top());
diff --git a/io/source/acceptor/acc_socket.cxx b/io/source/acceptor/acc_socket.cxx
index 5a9956eb75d9..a998ccd582e3 100644
--- a/io/source/acceptor/acc_socket.cxx
+++ b/io/source/acceptor/acc_socket.cxx
@@ -99,7 +99,7 @@ namespace io_acceptor {
template<class T>
static void notifyListeners(SocketConnection * pCon, bool * notified, T t)
{
- XStreamListener_hash_set listeners;
+ XStreamListener_hash_set listeners;
{
::osl::MutexGuard guard(pCon->_mutex);
diff --git a/io/source/connector/ctr_socket.cxx b/io/source/connector/ctr_socket.cxx
index 773a378a08ff..901f1206a78e 100644
--- a/io/source/connector/ctr_socket.cxx
+++ b/io/source/connector/ctr_socket.cxx
@@ -33,7 +33,7 @@ namespace stoc_connector {
template<class T>
static void notifyListeners(SocketConnection * pCon, bool * notified, T t)
{
- XStreamListener_hash_set listeners;
+ XStreamListener_hash_set listeners;
{
::osl::MutexGuard guard(pCon->_mutex);
diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx
index af6b7d390f3f..1be2c58f053a 100644
--- a/io/source/stm/omark.cxx
+++ b/io/source/stm/omark.cxx
@@ -181,7 +181,7 @@ void OMarkableOutputStream::closeOutput()
m_mapMarks.clear();
m_nCurrentPos = m_pBuffer->getSize();
- checkMarksAndFlush();
+ checkMarksAndFlush();
m_output->closeOutput();
diff --git a/io/source/stm/streamhelper.cxx b/io/source/stm/streamhelper.cxx
index c382cae96390..00ef1b50ec9f 100644
--- a/io/source/stm/streamhelper.cxx
+++ b/io/source/stm/streamhelper.cxx
@@ -75,7 +75,7 @@ void MemRingBuffer::resizeBuffer( sal_Int32 nMinSize )
}
if( nNewLen != m_nBufferLen ) {
- if (auto p = static_cast<sal_Int8*>(std::realloc(m_p, nNewLen)))
+ if (auto p = static_cast<sal_Int8*>(std::realloc(m_p, nNewLen)))
m_p = p;
else
{
More information about the Libreoffice-commits
mailing list