summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jvmfwk/inc/fwkutil.hxx6
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx2
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx2
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/util.cxx2
-rw-r--r--jvmfwk/source/elements.cxx2
-rw-r--r--jvmfwk/source/fwkbase.cxx2
-rw-r--r--l10ntools/source/localize.cxx2
-rw-r--r--linguistic/source/convdiclist.cxx8
-rw-r--r--lotuswordpro/source/filter/bento.hxx4
-rw-r--r--lotuswordpro/source/filter/lwpfribptr.cxx4
-rw-r--r--lotuswordpro/source/filter/lwpfribsection.cxx14
-rw-r--r--lotuswordpro/source/filter/lwpparastyle.cxx4
-rw-r--r--lotuswordpro/source/filter/lwptablelayout.cxx6
-rw-r--r--lotuswordpro/source/filter/tocread.cxx3
-rw-r--r--lotuswordpro/source/filter/utlist.hxx6
15 files changed, 33 insertions, 34 deletions
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(); }
generated by cgit (git 2.34.1) at 2024-12-28 22:36:16 +0000