loplugin:indentation in jvmfwk..lotuswordpro
Change-Id: I1af665f4c6d34d8514dd23bb7a3eba700ce3ddbc Reviewed-on: https://gerrit.libreoffice.org/67559 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
@@ -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> {};
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -173,7 +173,7 @@ bool getAndAddJREInfoByPath(
|
||||
{
|
||||
OUString const & operator()()
|
||||
{
|
||||
static OUString sIni;
|
||||
static OUString sIni;
|
||||
OUStringBuffer buf( 255);
|
||||
buf.append( getLibraryLocation());
|
||||
#ifdef MACOSX
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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; }
|
||||
|
||||
@@ -169,8 +169,8 @@ void LwpFribPtr::XFConvert()
|
||||
}
|
||||
}
|
||||
|
||||
switch(nFribType)
|
||||
{
|
||||
switch(nFribType)
|
||||
{
|
||||
case FRIB_TAG_TEXT:
|
||||
{
|
||||
LwpFribText* textFrib= static_cast<LwpFribText*>(pFrib);
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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(); }
|
||||
|
||||
Reference in New Issue
Block a user