ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

loplugin:returnconstval in sd..starmath

Browse Source 
Change-Id: Ib14f0ebef1c48a00ed09be70cb5885ccd07db762
Reviewed-on: https://gerrit.libreoffice.org/78060
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2019-08-24 22:11:31 +02:00
parent e0adee8341
commit ef2e9c91d0
14 changed files with 37 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sd/source/ui/sidebar/MasterPageContainer.cxx
+2 -12
View File
@@ -92,8 +92,7 @@ public:
const Size& GetPreviewSizePixel (PreviewSize eSize) const;
bool HasToken (Token aToken) const;
const SharedMasterPageDescriptor GetDescriptor (MasterPageContainer::Token aToken) const;
SharedMasterPageDescriptor GetDescriptor (MasterPageContainer::Token aToken);
SharedMasterPageDescriptor GetDescriptor (MasterPageContainer::Token aToken) const;
virtual Token PutMasterPage (const SharedMasterPageDescriptor& rDescriptor) override;
void InvalidatePreview (Token aToken);
Image GetPreviewForToken (
@@ -689,16 +688,7 @@ bool MasterPageContainer::Implementation::HasToken (Token aToken) const
&& maContainer[aToken].get()!=nullptr;
}
const SharedMasterPageDescriptor MasterPageContainer::Implementation::GetDescriptor (
Token aToken) const
{
if (aToken>=0 && static_cast<unsigned>(aToken)<maContainer.size())
return maContainer[aToken];
else
return SharedMasterPageDescriptor();
}
SharedMasterPageDescriptor MasterPageContainer::Implementation::GetDescriptor (Token aToken)
SharedMasterPageDescriptor MasterPageContainer::Implementation::GetDescriptor (Token aToken) const
{
if (aToken>=0 && static_cast<unsigned>(aToken)<maContainer.size())
return maContainer[aToken];
sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
+2 -2
View File
@@ -141,8 +141,8 @@ public:
const SharedLayer& back() const { return mvLayers.back(); }
const ::std::vector<SharedLayer>::const_iterator begin() const { return mvLayers.begin(); }
const ::std::vector<SharedLayer>::const_iterator end() const { return mvLayers.end(); }
::std::vector<SharedLayer>::const_iterator begin() const { return mvLayers.begin(); }
::std::vector<SharedLayer>::const_iterator end() const { return mvLayers.end(); }
void clear() { mvLayers.clear(); }
sd/source/ui/table/TableDesignPane.cxx
+1 -1
View File
@@ -576,7 +576,7 @@ static void FillCellInfoMatrix( const CellInfoVector& rStyle, const TableStyleSe
}
}
static const BitmapEx CreateDesignPreview( const Reference< XIndexAccess >& xTableStyle, const TableStyleSettings& rSettings, bool bIsPageDark )
static BitmapEx CreateDesignPreview( const Reference< XIndexAccess >& xTableStyle, const TableStyleSettings& rSettings, bool bIsPageDark )
{
CellInfoVector aCellInfoVector(sdr::table::style_count);
FillCellInfoVector( xTableStyle, aCellInfoVector );
sdext/source/presenter/PresenterTheme.cxx
+5 -5
View File
@@ -127,7 +127,7 @@ class PaneStyle
public:
PaneStyle();
const SharedBitmapDescriptor GetBitmap (const OUString& sBitmapName) const;
SharedBitmapDescriptor GetBitmap (const OUString& sBitmapName) const;
OUString msStyleName;
std::shared_ptr<PaneStyle> mpParentStyle;
@@ -166,7 +166,7 @@ class ViewStyle
public:
ViewStyle();
const SharedBitmapDescriptor GetBitmap (const OUString& sBitmapName) const;
SharedBitmapDescriptor GetBitmap (const OUString& sBitmapName) const;
PresenterTheme::SharedFontDescriptor GetFont() const;
@@ -902,11 +902,11 @@ PaneStyle::PaneStyle()
{
}
const SharedBitmapDescriptor PaneStyle::GetBitmap (const OUString& rsBitmapName) const
SharedBitmapDescriptor PaneStyle::GetBitmap (const OUString& rsBitmapName) const
{
if (mpBitmaps != nullptr)
{
const SharedBitmapDescriptor pBitmap = mpBitmaps->GetBitmap(rsBitmapName);
SharedBitmapDescriptor pBitmap = mpBitmaps->GetBitmap(rsBitmapName);
if (pBitmap.get() != nullptr)
return pBitmap;
}
@@ -1015,7 +1015,7 @@ ViewStyle::ViewStyle()
{
}
const SharedBitmapDescriptor ViewStyle::GetBitmap (const OUString& rsBitmapName) const
SharedBitmapDescriptor ViewStyle::GetBitmap (const OUString& rsBitmapName) const
{
if (rsBitmapName == "Background")
return mpBackground;
starmath/inc/document.hxx
+1 -1
View File
@@ -161,7 +161,7 @@ public:
SfxPrinter *GetPrinter() { GetPrt(); return mpPrinter; }
void SetPrinter( SfxPrinter * );
const OUString GetComment() const;
OUString GetComment() const;
// to replace chars that can not be saved with the document...
void ReplaceBadChars();
starmath/inc/rect.hxx
+2 -2
View File
@@ -153,7 +153,7 @@ public:
const Size & GetSize() const { return aSize; }
const Size GetItalicSize() const
Size GetItalicSize() const
{ return Size(GetItalicWidth(), GetHeight()); }
void Move (const Point &rPosition);
@@ -166,7 +166,7 @@ public:
bool HasAlignInfo() const { return bHasAlignInfo; }
const Point AlignTo(const SmRect &rRect, RectPos ePos,
Point AlignTo(const SmRect &rRect, RectPos ePos,
RectHorAlign eHor, RectVerAlign eVer) const;
SmRect & ExtendBy(const SmRect &rRect, RectCopyMBL eCopyMode);
starmath/inc/smmod.hxx
+4 -4
View File
@@ -55,11 +55,11 @@ class SmLocalizedSymbolData
public:
SmLocalizedSymbolData() = delete;
static const OUString GetUiSymbolName( const OUString &rExportName );
static const OUString GetExportSymbolName( const OUString &rUiName );
static OUString GetUiSymbolName( const OUString &rExportName );
static OUString GetExportSymbolName( const OUString &rUiName );
static const OUString GetUiSymbolSetName( const OUString &rExportName );
static const OUString GetExportSymbolSetName( const OUString &rUiName );
static OUString GetUiSymbolSetName( const OUString &rExportName );
static OUString GetExportSymbolSetName( const OUString &rUiName );
};
class SmModule : public SfxModule, public utl::ConfigurationListener
starmath/inc/symbol.hxx
+2 -2
View File
@@ -82,9 +82,9 @@ public:
// symbol sets are for UI purpose only, thus we assemble them here
std::set< OUString > GetSymbolSetNames() const;
const SymbolPtrVec_t GetSymbolSet( const OUString& rSymbolSetName );
SymbolPtrVec_t GetSymbolSet( const OUString& rSymbolSetName );
const SymbolPtrVec_t GetSymbols() const;
SymbolPtrVec_t GetSymbols() const;
bool AddOrReplaceSymbol( const SmSym & rSymbol, bool bForceChange = false );
void RemoveSymbol( const OUString & rSymbolName );
starmath/source/cfgitem.cxx
+5 -5
View File
@@ -176,7 +176,7 @@ SmFontFormat::SmFontFormat( const vcl::Font &rFont )
}
const vcl::Font SmFontFormat::GetFont() const
vcl::Font SmFontFormat::GetFont() const
{
vcl::Font aRes;
aRes.SetFamilyName( aName );
@@ -280,7 +280,7 @@ const SmFontFormat * SmFontFormatList::GetFontFormat( size_t nPos ) const
}
const OUString SmFontFormatList::GetFontFormatId( const SmFontFormat &rFntFmt ) const
OUString SmFontFormatList::GetFontFormatId( const SmFontFormat &rFntFmt ) const
{
OUString aRes;
@@ -297,7 +297,7 @@ const OUString SmFontFormatList::GetFontFormatId( const SmFontFormat &rFntFmt )
}
const OUString SmFontFormatList::GetFontFormatId( const SmFontFormat &rFntFmt, bool bAdd )
OUString SmFontFormatList::GetFontFormatId( const SmFontFormat &rFntFmt, bool bAdd )
{
OUString aRes( GetFontFormatId( rFntFmt) );
if (aRes.isEmpty() && bAdd)
@@ -309,7 +309,7 @@ const OUString SmFontFormatList::GetFontFormatId( const SmFontFormat &rFntFmt, b
}
const OUString SmFontFormatList::GetFontFormatId( size_t nPos ) const
OUString SmFontFormatList::GetFontFormatId( size_t nPos ) const
{
OUString aRes;
if (nPos < aEntries.size())
@@ -318,7 +318,7 @@ const OUString SmFontFormatList::GetFontFormatId( size_t nPos ) const
}
const OUString SmFontFormatList::GetNewFontFormatId() const
OUString SmFontFormatList::GetNewFontFormatId() const
{
// returns first unused FormatId
starmath/source/cfgitem.hxx
+5 -5
View File
@@ -52,7 +52,7 @@ struct SmFontFormat
SmFontFormat();
explicit SmFontFormat( const vcl::Font &rFont );
const vcl::Font GetFont() const;
vcl::Font GetFont() const;
bool operator == ( const SmFontFormat &rFntFmt ) const;
};
@@ -81,10 +81,10 @@ public:
const SmFontFormat * GetFontFormat( const OUString &rFntFmtId ) const;
const SmFontFormat * GetFontFormat( size_t nPos ) const;
const OUString GetFontFormatId( const SmFontFormat &rFntFmt ) const;
const OUString GetFontFormatId( const SmFontFormat &rFntFmt, bool bAdd );
const OUString GetFontFormatId( size_t nPos ) const;
const OUString GetNewFontFormatId() const;
OUString GetFontFormatId( const SmFontFormat &rFntFmt ) const;
OUString GetFontFormatId( const SmFontFormat &rFntFmt, bool bAdd );
OUString GetFontFormatId( size_t nPos ) const;
OUString GetNewFontFormatId() const;
size_t GetCount() const { return aEntries.size(); }
bool IsModified() const { return bModified; }
starmath/source/document.cxx
+1 -1
View File
@@ -120,7 +120,7 @@ void SmDocShell::LoadSymbols()
}
const OUString SmDocShell::GetComment() const
OUString SmDocShell::GetComment() const
{
uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
GetModel(), uno::UNO_QUERY_THROW);
starmath/source/rect.cxx
+1 -1
View File
@@ -333,7 +333,7 @@ void SmRect::Move(const Point &rPosition)
}
const Point SmRect::AlignTo(const SmRect &rRect, RectPos ePos,
Point SmRect::AlignTo(const SmRect &rRect, RectPos ePos,
RectHorAlign eHor, RectVerAlign eVer) const
{ Point aPos (GetTopLeft());
// will become the topleft point of the new rectangle position
starmath/source/smmod.cxx
+4 -4
View File
@@ -45,7 +45,7 @@ OUString SmResId(const char* pId)
return Translate::get(pId, SM_MOD()->GetResLocale());
}
const OUString SmLocalizedSymbolData::GetUiSymbolName( const OUString &rExportName )
OUString SmLocalizedSymbolData::GetUiSymbolName( const OUString &rExportName )
{
OUString aRes;
@@ -61,7 +61,7 @@ const OUString SmLocalizedSymbolData::GetUiSymbolName( const OUString &rExportNa
return aRes;
}
const OUString SmLocalizedSymbolData::GetExportSymbolName( const OUString &rUiName )
OUString SmLocalizedSymbolData::GetExportSymbolName( const OUString &rUiName )
{
OUString aRes;
@@ -78,7 +78,7 @@ const OUString SmLocalizedSymbolData::GetExportSymbolName( const OUString &rUiNa
return aRes;
}
const OUString SmLocalizedSymbolData::GetUiSymbolSetName( const OUString &rExportName )
OUString SmLocalizedSymbolData::GetUiSymbolSetName( const OUString &rExportName )
{
OUString aRes;
@@ -94,7 +94,7 @@ const OUString SmLocalizedSymbolData::GetUiSymbolSetName( const OUString &rExpor
return aRes;
}
const OUString SmLocalizedSymbolData::GetExportSymbolSetName( const OUString &rUiName )
OUString SmLocalizedSymbolData::GetExportSymbolSetName( const OUString &rUiName )
{
OUString aRes;
starmath/source/symbol.cxx
+2 -2
View File
@@ -121,7 +121,7 @@ SmSym *SmSymbolManager::GetSymbolByName(const OUString& rSymbolName)
}
const SymbolPtrVec_t SmSymbolManager::GetSymbols() const
SymbolPtrVec_t SmSymbolManager::GetSymbols() const
{
SymbolPtrVec_t aRes;
for (const auto& rEntry : m_aSymbols)
@@ -187,7 +187,7 @@ std::set< OUString > SmSymbolManager::GetSymbolSetNames() const
}
const SymbolPtrVec_t SmSymbolManager::GetSymbolSet( const OUString& rSymbolSetName )
SymbolPtrVec_t SmSymbolManager::GetSymbolSet( const OUString& rSymbolSetName )
{
SymbolPtrVec_t aRes;
if (!rSymbolSetName.isEmpty())