[Libreoffice-commits] core.git: basctl/source compilerplugins/clang desktop/source editeng/source extensions/source filter/source framework/source hwpfilter/source l10ntools/inc l10ntools/source lingucomponent/source lotuswordpro/source mysqlc/source registry/source sal/osl sot/source starmath/inc starmath/source toolkit/source tools/source unotools/source
Noel Grandin
noel at peralex.com
Mon Jan 18 04:50:39 PST 2016
basctl/source/basicide/baside2.cxx | 20 +++--------
basctl/source/basicide/baside2.hxx | 4 +-
basctl/source/basicide/scriptdocument.cxx | 9 +----
compilerplugins/clang/unusedmethods.cxx | 2 +
desktop/source/deployment/dp_persmap.cxx | 13 +++----
desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 6 +--
desktop/source/deployment/gui/dp_gui_extlistbox.hxx | 2 -
desktop/source/deployment/inc/dp_persmap.h | 2 -
editeng/source/editeng/editdoc.cxx | 4 --
editeng/source/editeng/editdoc.hxx | 2 -
editeng/source/editeng/editobj.cxx | 5 --
editeng/source/editeng/editobj2.hxx | 6 ---
editeng/source/editeng/impedit.hxx | 4 +-
editeng/source/editeng/impedit5.cxx | 8 +---
extensions/source/propctrlr/browserlistbox.cxx | 4 --
extensions/source/propctrlr/browserlistbox.hxx | 2 -
filter/source/graphicfilter/etiff/etiff.cxx | 7 +--
filter/source/graphicfilter/idxf/dxfvec.hxx | 7 ---
filter/source/svg/b2dellipse.cxx | 6 ---
filter/source/svg/b2dellipse.hxx | 1
filter/source/svg/svgexport.cxx | 7 ---
filter/source/svg/svgfilter.hxx | 1
framework/source/fwe/classes/addonsoptions.cxx | 8 +---
hwpfilter/source/hfont.cxx | 7 +--
hwpfilter/source/hfont.h | 2 -
hwpfilter/source/hinfo.cxx | 36 +++++++++-----------
hwpfilter/source/hinfo.h | 2 -
hwpfilter/source/hstyle.cxx | 7 +--
hwpfilter/source/hstyle.h | 2 -
l10ntools/inc/cfgmerge.hxx | 2 -
l10ntools/source/cfgmerge.cxx | 4 --
lingucomponent/source/languageguessing/guess.hxx | 1
lotuswordpro/source/filter/lwpobjid.cxx | 3 -
lotuswordpro/source/filter/lwpobjid.hxx | 2 -
lotuswordpro/source/filter/lwptblformula.cxx | 16 ++------
lotuswordpro/source/filter/lwptblformula.hxx | 4 +-
mysqlc/source/mysqlc_resultset.hxx | 5 --
mysqlc/source/mysqlc_resultsetmetadata.hxx | 4 --
registry/source/keyimpl.hxx | 4 +-
sal/osl/all/utility.cxx | 4 +-
sot/source/sdstor/ucbstorage.cxx | 11 +-----
starmath/inc/rect.hxx | 4 +-
starmath/source/rect.cxx | 10 +----
toolkit/source/controls/unocontrolcontainer.cxx | 14 ++-----
tools/source/inet/inetmime.cxx | 5 +-
unotools/source/config/securityoptions.cxx | 20 ++---------
unotools/source/config/viewoptions.cxx | 17 ++-------
47 files changed, 101 insertions(+), 215 deletions(-)
New commits:
commit a7f6efc68ba97db98ebab9ebc473bffb8ded757f
Author: Noel Grandin <noel at peralex.com>
Date: Mon Jan 18 10:39:48 2016 +0200
loplugin: unused return values
Change-Id: I9c61a46c57894bc63a57740206c0bcb4a16553af
Reviewed-on: https://gerrit.libreoffice.org/21571
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 34d037d..09a3bac 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -296,7 +296,7 @@ void ModulWindow::CheckCompileBasic()
}
}
-bool ModulWindow::BasicExecute()
+void ModulWindow::BasicExecute()
{
// #116444# check security settings before macro execution
ScriptDocument aDocument( GetDocument() );
@@ -305,7 +305,7 @@ bool ModulWindow::BasicExecute()
if ( !aDocument.allowMacros() )
{
ScopedVclPtrInstance<MessageDialog>::Create(this, IDE_RESSTR(RID_STR_CANNOTRUNMACRO), VCL_MESSAGE_WARNING)->Execute();
- return false;
+ return;
}
}
@@ -341,7 +341,8 @@ bool ModulWindow::BasicExecute()
if ( !pMethod )
{
// If not in a method then prompt the user
- return ( !ChooseMacro( uno::Reference< frame::XModel >(), false, OUString() ).isEmpty() );
+ ChooseMacro( uno::Reference< frame::XModel >(), false, OUString() );
+ return;
}
if ( pMethod )
{
@@ -357,10 +358,6 @@ bool ModulWindow::BasicExecute()
else
aStatus.bIsRunning = false; // cancel of Reschedule()
}
-
- bool bDone = !aStatus.bError;
-
- return bDone;
}
void ModulWindow::CompileBasic()
@@ -490,18 +487,16 @@ void ModulWindow::ImportDialog()
implImportDialog( this, aCurPath, rDocument, aLibName );
}
-bool ModulWindow::ToggleBreakPoint( sal_uLong nLine )
+void ModulWindow::ToggleBreakPoint( sal_uLong nLine )
{
DBG_ASSERT( XModule().Is(), "Kein Modul!" );
- bool bNewBreakPoint = false;
-
if ( XModule().Is() )
{
CheckCompileBasic();
if ( aStatus.bError )
{
- return false;
+ return;
}
BreakPoint* pBrk = GetBreakPoints().FindBreakPoint( nLine );
@@ -515,7 +510,6 @@ bool ModulWindow::ToggleBreakPoint( sal_uLong nLine )
if ( xModule->SetBP( (sal_uInt16)nLine) )
{
GetBreakPoints().InsertSorted( new BreakPoint( nLine ) );
- bNewBreakPoint = true;
if ( StarBASIC::IsRunning() )
{
for ( sal_uInt16 nMethod = 0; nMethod < xModule->GetMethods()->Count(); nMethod++ )
@@ -528,8 +522,6 @@ bool ModulWindow::ToggleBreakPoint( sal_uLong nLine )
}
}
}
-
- return bNewBreakPoint;
}
void ModulWindow::UpdateBreakPoint( const BreakPoint& rBrk )
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index 8be5eff..41dd6d3 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -310,7 +310,7 @@ private:
OUString m_aModule;
void CheckCompileBasic();
- bool BasicExecute();
+ void BasicExecute();
static void GoOnTop();
@@ -373,7 +373,7 @@ public:
void EditMacro( const OUString& rMacroName );
- bool ToggleBreakPoint( sal_uLong nLine );
+ void ToggleBreakPoint( sal_uLong nLine );
BasicStatus& GetBasicStatus() { return aStatus; }
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index ea2f02d..6d3a328 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -242,7 +242,7 @@ namespace basctl
getDocument() const;
void setDocumentModified() const;
bool isDocumentModified() const;
- bool saveDocument( const Reference< XStatusIndicator >& _rxStatusIndicator ) const;
+ void saveDocument( const Reference< XStatusIndicator >& _rxStatusIndicator ) const;
OUString getTitle() const;
OUString getURL() const;
@@ -805,11 +805,11 @@ namespace basctl
}
- bool ScriptDocument::Impl::saveDocument( const Reference< XStatusIndicator >& _rxStatusIndicator ) const
+ void ScriptDocument::Impl::saveDocument( const Reference< XStatusIndicator >& _rxStatusIndicator ) const
{
Reference< XFrame > xFrame;
if ( !getCurrentFrame( xFrame ) )
- return false;
+ return;
Sequence< PropertyValue > aArgs;
if ( _rxStatusIndicator.is() )
@@ -837,10 +837,7 @@ namespace basctl
catch( const Exception& )
{
DBG_UNHANDLED_EXCEPTION();
- return false;
}
-
- return true;
}
diff --git a/compilerplugins/clang/unusedmethods.cxx b/compilerplugins/clang/unusedmethods.cxx
index c74bfed..6f724f8 100644
--- a/compilerplugins/clang/unusedmethods.cxx
+++ b/compilerplugins/clang/unusedmethods.cxx
@@ -237,6 +237,8 @@ gotfunc:
}
const Stmt* parent = parentStmt(expr);
if (!parent) {
+ // we will get null parent if it's under a CXXConstructExpr node
+ logCallToRootMethods(calleeFunctionDecl, usedReturnSet);
return true;
}
if (isa<Expr>(parent) || isa<ReturnStmt>(parent) || isa<DeclStmt>(parent)
diff --git a/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx
index 010c0f5..d032153 100644
--- a/desktop/source/deployment/dp_persmap.cxx
+++ b/desktop/source/deployment/dp_persmap.cxx
@@ -158,7 +158,7 @@ void PersistentMap::open()
}
-bool PersistentMap::readAll()
+void PersistentMap::readAll()
{
// prepare for re-reading the map-file
const osl::FileBase::RC nRes = m_MapFile.setPos( osl_Pos_Absolut, 0);
@@ -171,11 +171,11 @@ bool PersistentMap::readAll()
m_MapFile.read( aHeaderBytes, sizeof(aHeaderBytes), nBytesRead);
OSL_ASSERT( nBytesRead == sizeof(aHeaderBytes));
if( nBytesRead != sizeof(aHeaderBytes))
- return false;
+ return;
// check header magic
for( int i = 0; i < (int)sizeof(PmapMagic); ++i)
if( aHeaderBytes[i] != PmapMagic[i])
- return false;
+ return;
// read key value pairs and add them to the map
ByteSequence aKeyLine;
@@ -185,11 +185,11 @@ bool PersistentMap::readAll()
// read key-value line pair
// an empty key name indicates the end of the line pairs
if( m_MapFile.readLine( aKeyLine) != osl::File::E_None)
- return false;
+ return;
if( !aKeyLine.getLength())
break;
if( m_MapFile.readLine( aValLine) != osl::File::E_None)
- return false;
+ return;
// decode key and value strings
const OString aKeyName = decodeString( reinterpret_cast<char const *>(aKeyLine.getConstArray()), aKeyLine.getLength());
const OString aValName = decodeString( reinterpret_cast<char const *>(aValLine.getConstArray()), aValLine.getLength());
@@ -198,13 +198,12 @@ bool PersistentMap::readAll()
// check end-of-file status
sal_Bool bIsEOF = true;
if( m_MapFile.isEndOfFile( &bIsEOF) != osl::File::E_None )
- return false;
+ return;
if( bIsEOF )
break;
}
m_bIsDirty = false;
- return true;
}
void PersistentMap::flush()
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index a76eceb..34b3fc2 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -919,7 +919,7 @@ void ExtensionBox_Impl::addEventListenerOnce(
}
-long ExtensionBox_Impl::addEntry( const uno::Reference< deployment::XPackage > &xPackage,
+void ExtensionBox_Impl::addEntry( const uno::Reference< deployment::XPackage > &xPackage,
bool bLicenseMissing )
{
long nPos = 0;
@@ -930,7 +930,7 @@ long ExtensionBox_Impl::addEntry( const uno::Reference< deployment::XPackage > &
// Don't add empty entries
if ( pEntry->m_sTitle.isEmpty() )
- return 0;
+ return;
::osl::ClearableMutexGuard guard(m_entriesMutex);
if ( m_vEntries.empty() )
@@ -969,8 +969,6 @@ long ExtensionBox_Impl::addEntry( const uno::Reference< deployment::XPackage > &
Invalidate();
m_bNeedsRecalc = true;
-
- return nPos;
}
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index eaf4f40..1f927f3 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -191,7 +191,7 @@ public:
virtual void selectEntry( const long nPos );
- long addEntry(const css::uno::Reference<css::deployment::XPackage> &xPackage,
+ void addEntry(const css::uno::Reference<css::deployment::XPackage> &xPackage,
bool bLicenseMissing = false );
void updateEntry(const css::uno::Reference<css::deployment::XPackage> &xPackage );
void removeEntry(const css::uno::Reference<css::deployment::XPackage> &xPackage );
diff --git a/desktop/source/deployment/inc/dp_persmap.h b/desktop/source/deployment/inc/dp_persmap.h
index c18b2c8..d40aed4 100644
--- a/desktop/source/deployment/inc/dp_persmap.h
+++ b/desktop/source/deployment/inc/dp_persmap.h
@@ -55,7 +55,7 @@ public:
protected:
void open();
- bool readAll();
+ void readAll();
void add( OString const & key, OString const & value );
void flush();
};
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index f120766..4fb88ee 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -2393,15 +2393,13 @@ EditPaM EditDoc::ConnectParagraphs( ContentNode* pLeft, ContentNode* pRight )
return aPaM;
}
-EditPaM EditDoc::RemoveChars( EditPaM aPaM, sal_Int32 nChars )
+void EditDoc::RemoveChars( EditPaM aPaM, sal_Int32 nChars )
{
// Maybe remove Features!
aPaM.GetNode()->Erase( aPaM.GetIndex(), nChars );
aPaM.GetNode()->CollapsAttribs( aPaM.GetIndex(), nChars, GetItemPool() );
SetModified( true );
-
- return aPaM;
}
void EditDoc::InsertAttribInSelection( ContentNode* pNode, sal_Int32 nStart, sal_Int32 nEnd, const SfxPoolItem& rPoolItem )
diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx
index cf898df..0e3ad60 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -780,7 +780,7 @@ public:
EditPaM Clear();
EditPaM RemoveText();
- EditPaM RemoveChars( EditPaM aPaM, sal_Int32 nChars );
+ void RemoveChars( EditPaM aPaM, sal_Int32 nChars );
EditPaM InsertText( EditPaM aPaM, const OUString& rStr );
EditPaM InsertParaBreak( EditPaM aPaM, bool bKeepEndingAttribs );
EditPaM InsertFeature( EditPaM aPaM, const SfxPoolItem& rItem );
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index de10b02..f12c68e 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -226,11 +226,6 @@ bool ContentInfo::operator==( const ContentInfo& rCompare ) const
return false;
}
-bool ContentInfo::operator!=(const ContentInfo& rCompare) const
-{
- return !operator==(rCompare);
-}
-
EditTextObject::EditTextObject( SfxItemPool* pPool ) :
mpImpl(new EditTextObjectImpl(this, pPool))
{
diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx
index 0e61edd..aa8b248 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -71,11 +71,6 @@ public:
void SetItem(const SfxPoolItem& rNew);
inline bool operator==( const XEditAttribute& rCompare ) const;
-
- bool operator!= (const XEditAttribute& r) const
- {
- return !operator==(r);
- }
};
inline bool XEditAttribute::operator==( const XEditAttribute& rCompare ) const
@@ -163,7 +158,6 @@ public:
const WrongList* GetWrongList() const;
void SetWrongList( WrongList* p );
bool operator==( const ContentInfo& rCompare ) const;
- bool operator!=( const ContentInfo& rCompare ) const;
// #i102062#
bool isWrongListEqual(const ContentInfo& rCompare) const;
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 5f180cd..57e03f7 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -842,8 +842,8 @@ public:
void IndentBlock( EditView* pView, bool bRight );
// For Undo/Redo
- bool Undo( EditView* pView );
- bool Redo( EditView* pView );
+ void Undo( EditView* pView );
+ void Redo( EditView* pView );
// OV-Special
void InvalidateFromParagraph( sal_Int32 nFirstInvPara );
diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx
index 027c3ce..bab347e 100644
--- a/editeng/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -281,26 +281,22 @@ void ImpEditEngine::EnableUndo( bool bEnable )
bUndoEnabled = bEnable;
}
-bool ImpEditEngine::Undo( EditView* pView )
+void ImpEditEngine::Undo( EditView* pView )
{
if ( HasUndoManager() && GetUndoManager().GetUndoActionCount() )
{
SetActiveView( pView );
GetUndoManager().Undo();
- return true;
}
- return false;
}
-bool ImpEditEngine::Redo( EditView* pView )
+void ImpEditEngine::Redo( EditView* pView )
{
if ( HasUndoManager() && GetUndoManager().GetRedoActionCount() )
{
SetActiveView( pView );
GetUndoManager().Redo();
- return true;
}
- return false;
}
SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, EditEngineAttribs nOnlyHardAttrib )
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index 875c7b4..76bc794 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -721,7 +721,7 @@ namespace pcr
}
- sal_uInt16 OBrowserListBox::InsertEntry(const OLineDescriptor& _rPropertyData, sal_uInt16 _nPos)
+ void OBrowserListBox::InsertEntry(const OLineDescriptor& _rPropertyData, sal_uInt16 _nPos)
{
// create a new line
BrowserLinePointer pBrowserLine( new OBrowserLine( _rPropertyData.sName, m_aLinesPlayground.get() ) );
@@ -757,8 +757,6 @@ namespace pcr
while ( nUpdatePos < m_aLines.size() )
m_aOutOfDateLines.insert( nUpdatePos++ );
UpdatePosNSize( );
-
- return nInsertPos;
}
diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx
index 8bfa467..73724e1 100644
--- a/extensions/source/propctrlr/browserlistbox.hxx
+++ b/extensions/source/propctrlr/browserlistbox.hxx
@@ -127,7 +127,7 @@ namespace pcr
void Clear();
- sal_uInt16 InsertEntry( const OLineDescriptor&, sal_uInt16 nPos = EDITOR_LIST_APPEND );
+ void InsertEntry( const OLineDescriptor&, sal_uInt16 nPos = EDITOR_LIST_APPEND );
bool RemoveEntry( const OUString& _rName );
void ChangeEntry( const OLineDescriptor&, sal_uInt16 nPos );
diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx
index 239c66d..caee92e 100644
--- a/filter/source/graphicfilter/etiff/etiff.cxx
+++ b/filter/source/graphicfilter/etiff/etiff.cxx
@@ -95,9 +95,9 @@ private:
css::uno::Reference< css::task::XStatusIndicator > xStatusIndicator;
void ImplCallback( sal_uInt32 nPercent );
- bool ImplWriteHeader( bool bMultiPage );
+ bool ImplWriteHeader( bool bMultiPage );
void ImplWritePalette();
- bool ImplWriteBody();
+ void ImplWriteBody();
void ImplWriteTag( sal_uInt16 TagID, sal_uInt16 DataType, sal_uInt32 NumberOfItems, sal_uInt32 Value);
void ImplWriteResolution( sal_uLong nStreamPos, sal_uInt32 nResolutionUnit );
void StartCompression();
@@ -358,7 +358,7 @@ void TIFFWriter::ImplWritePalette()
-bool TIFFWriter::ImplWriteBody()
+void TIFFWriter::ImplWriteBody()
{
sal_uInt8 nTemp = 0;
sal_uInt8 nShift;
@@ -461,7 +461,6 @@ bool TIFFWriter::ImplWriteBody()
m_rOStm.WriteUInt32( nGfxEnd - nGfxBegin ); // mnStripByteCountPos needs the size of the compression data
m_rOStm.Seek( nGfxEnd );
}
- return mbStatus;
}
diff --git a/filter/source/graphicfilter/idxf/dxfvec.hxx b/filter/source/graphicfilter/idxf/dxfvec.hxx
index 94bf034..21e63bc 100644
--- a/filter/source/graphicfilter/idxf/dxfvec.hxx
+++ b/filter/source/graphicfilter/idxf/dxfvec.hxx
@@ -94,7 +94,6 @@ public:
// equivalence or net:
bool operator == (const DXFVector & rV) const;
- bool operator != (const DXFVector & rV) const;
};
@@ -246,12 +245,6 @@ inline bool DXFVector::operator == (const DXFVector & rV) const
}
-inline bool DXFVector::operator != (const DXFVector & rV) const
-{
- if (fx!=rV.fx || fy!=rV.fy || fz!=rV.fz) return true;
- else return false;
-}
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/svg/b2dellipse.cxx b/filter/source/svg/b2dellipse.cxx
index 07799b5..4e4e1f0 100644
--- a/filter/source/svg/b2dellipse.cxx
+++ b/filter/source/svg/b2dellipse.cxx
@@ -27,12 +27,6 @@ namespace basegfx
return (maCenter == rEllipse.maCenter) && (maRadius == rEllipse.maRadius);
}
- bool B2DEllipse::operator!=(const B2DEllipse& rEllipse) const
- {
- return !(*this == rEllipse);
- }
-
-
} // end of namespace basegfx
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/svg/b2dellipse.hxx b/filter/source/svg/b2dellipse.hxx
index 30e19d9..45ad6f9 100644
--- a/filter/source/svg/b2dellipse.hxx
+++ b/filter/source/svg/b2dellipse.hxx
@@ -42,7 +42,6 @@ namespace basegfx
// compare operators
bool operator==(const B2DEllipse& rEllipse) const;
- bool operator!=(const B2DEllipse& rEllipse) const;
// Coordinate interface
basegfx::B2DPoint getB2DEllipseCenter() const { return maCenter; }
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 794f5b0..ce4aeec 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -433,13 +433,6 @@ ObjectRepresentation& ObjectRepresentation::operator=( const ObjectRepresentatio
-bool ObjectRepresentation::operator==( const ObjectRepresentation& rPresentation ) const
-{
- return( ( mxObject == rPresentation.mxObject ) &&
- ( *mpMtf == *rPresentation.mpMtf ) );
-}
-
-
namespace
{
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index 89544ad..fc929d6 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -141,7 +141,6 @@ public:
~ObjectRepresentation();
ObjectRepresentation& operator=( const ObjectRepresentation& rPresentation );
- bool operator==( const ObjectRepresentation& rPresentation ) const;
const Reference< XInterface >& GetObject() const { return mxObject; }
bool HasRepresentation() const { return mpMtf != nullptr; }
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index 1820c21..0e38d9c 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -266,8 +266,8 @@ class AddonsOptions_Impl : public ConfigItem
bool HasAssociatedImages( const OUString& aURL );
void SubstituteVariables( OUString& aURL );
- bool ReadSubMenuEntries( const Sequence< OUString >& aSubMenuNodeNames, Sequence< Sequence< PropertyValue > >& rSubMenu );
- OUString GeneratePrefixURL();
+ void ReadSubMenuEntries( const Sequence< OUString >& aSubMenuNodeNames, Sequence< Sequence< PropertyValue > >& rSubMenu );
+ OUString GeneratePrefixURL();
Sequence< OUString > GetPropertyNamesMenuItem( const OUString& aPropertyRootNode ) const;
Sequence< OUString > GetPropertyNamesPopupMenu( const OUString& aPropertyRootNode ) const;
@@ -1235,7 +1235,7 @@ bool AddonsOptions_Impl::ReadToolBarItem( const OUString& aToolBarItemNodeName,
return bResult;
}
-bool AddonsOptions_Impl::ReadSubMenuEntries( const Sequence< OUString >& aSubMenuNodeNames, Sequence< Sequence< PropertyValue > >& rSubMenuSeq )
+void AddonsOptions_Impl::ReadSubMenuEntries( const Sequence< OUString >& aSubMenuNodeNames, Sequence< Sequence< PropertyValue > >& rSubMenuSeq )
{
Sequence< PropertyValue > aMenuItem( PROPERTYCOUNT_MENUITEM );
@@ -1258,8 +1258,6 @@ bool AddonsOptions_Impl::ReadSubMenuEntries( const Sequence< OUString >& aSubMen
rSubMenuSeq[nIndex++] = aMenuItem;
}
}
-
- return true;
}
bool AddonsOptions_Impl::HasAssociatedImages( const OUString& aURL )
diff --git a/hwpfilter/source/hfont.cxx b/hwpfilter/source/hfont.cxx
index a530f12..a16905c 100644
--- a/hwpfilter/source/hfont.cxx
+++ b/hwpfilter/source/hfont.cxx
@@ -69,7 +69,7 @@ const char *HWPFont::GetFontName(int lang, int id)
static char buffer[FONTNAMELEN];
-bool HWPFont::Read(HWPFile & hwpf)
+void HWPFont::Read(HWPFile & hwpf)
{
int lang = 0;
short nfonts = 0;
@@ -80,7 +80,8 @@ bool HWPFont::Read(HWPFile & hwpf)
hwpf.Read2b(&nfonts, 1);
if (!(nfonts > 0 && nfonts < MAXFONTS))
{
- return !hwpf.SetState(HWP_InvalidFileFormat);
+ hwpf.SetState(HWP_InvalidFileFormat);
+ return;
}
fontnames[lang] = new char[nfonts * FONTNAMELEN];
@@ -91,8 +92,6 @@ bool HWPFont::Read(HWPFile & hwpf)
AddFont(lang, buffer);
}
}
-
- return !hwpf.State();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/hwpfilter/source/hfont.h b/hwpfilter/source/hfont.h
index 39aa159..074346f 100644
--- a/hwpfilter/source/hfont.h
+++ b/hwpfilter/source/hfont.h
@@ -62,7 +62,7 @@ class DLLEXPORT HWPFont
*/
const char *GetFontName( int lang, int id );
- bool Read( HWPFile &hwpf );
+ void Read( HWPFile &hwpf );
};
#endif /* _HWPFONTS+H_ */
diff --git a/hwpfilter/source/hinfo.cxx b/hwpfilter/source/hinfo.cxx
index b9d75a6..241ab2f 100644
--- a/hwpfilter/source/hinfo.cxx
+++ b/hwpfilter/source/hinfo.cxx
@@ -75,7 +75,7 @@ HWPInfo::~HWPInfo()
* Function for reading document information (128 bytes)
* Document information is the information after the file identification information (30 bytes).
*/
-bool HWPInfo::Read(HWPFile & hwpf)
+void HWPInfo::Read(HWPFile & hwpf)
{
hwpf.Read2b(&cur_col, 1); /* When a document is saving, the paragraph number where the coursor is */
hwpf.Read2b(&cur_row, 1); /* Paragraphs rows */
@@ -86,31 +86,31 @@ bool HWPInfo::Read(HWPFile & hwpf)
// paper geometry information
unsigned short tmp16;
if (!hwpf.Read2b(tmp16))
- return false;
+ return;
paper.paper_height = tmp16; /* Paper length */
if (!hwpf.Read2b(tmp16))
- return false;
+ return;
paper.paper_width = tmp16; /* Sheet width */
if (!hwpf.Read2b(tmp16))
- return false;
+ return;
paper.top_margin = tmp16; /* Top margin */
if (!hwpf.Read2b(tmp16))
- return false;
+ return;
paper.bottom_margin = tmp16; /* The bottom margin */
if (!hwpf.Read2b(tmp16))
- return false;
+ return;
paper.left_margin = tmp16; /* Left Margin */
if (!hwpf.Read2b(tmp16))
- return false;
+ return;
paper.right_margin = tmp16; /* Right margins */
if (!hwpf.Read2b(tmp16))
- return false;
+ return;
paper.header_length = tmp16; /* Header length */
if (!hwpf.Read2b(tmp16))
- return false;
+ return;
paper.footer_length = tmp16; /* Footer length */
if (!hwpf.Read2b(tmp16))
- return false;
+ return;
paper.gutter_length = tmp16; /* The binding margin */
hwpf.Read2b(&readonly, 1); /* Reserve */
hwpf.Read1b(reserved1, 4); /* Reserve */
@@ -129,13 +129,13 @@ bool HWPInfo::Read(HWPFile & hwpf)
hwpf.Read2b(&countfn,1); /* Number of footnote */
if (!hwpf.Read2b(tmp16))
- return false;
+ return;
splinetext = tmp16;
if (!hwpf.Read2b(tmp16))
- return false;
+ return;
splinefn = tmp16;
if (!hwpf.Read2b(tmp16))
- return false;
+ return;
spfnfn = tmp16;
hwpf.Read1b(&fnchar, 1);
hwpf.Read1b(&fnlinetype, 1);
@@ -143,7 +143,7 @@ bool HWPInfo::Read(HWPFile & hwpf)
for (int ii = 0; ii < 4; ++ii)
{
if (!hwpf.Read2b(tmp16))
- return false;
+ return;
bordermargin[ii] = tmp16;
}
hwpf.Read2b(&borderline, 1);
@@ -156,17 +156,17 @@ bool HWPInfo::Read(HWPFile & hwpf)
hwpf.Read2b(&info_block_len, 1);
if (hwpf.State())
- return false;
+ return;
/* Read the article summary. */
if (!summary.Read(hwpf))
- return false;
+ return;
if (info_block_len > 0)
{
info_block = new unsigned char[info_block_len + 1];
if (!HWPReadInfoBlock(info_block, info_block_len, hwpf))
- return false;
+ return;
}
/* reset the value of hwpf. */
@@ -174,8 +174,6 @@ bool HWPInfo::Read(HWPFile & hwpf)
hwpf.encrypted = encrypted != 0;
hwpf.info_block_len = info_block_len;
hwpf.SetCompressed(hwpf.compressed);
-
- return (!hwpf.State());
}
diff --git a/hwpfilter/source/hinfo.h b/hwpfilter/source/hinfo.h
index 884c089..b080150 100644
--- a/hwpfilter/source/hinfo.h
+++ b/hwpfilter/source/hinfo.h
@@ -205,7 +205,7 @@ class DLLEXPORT HWPInfo
HWPInfo(void);
~HWPInfo(void);
- bool Read(HWPFile &hwpf);
+ void Read(HWPFile &hwpf);
};
diff --git a/hwpfilter/source/hstyle.cxx b/hwpfilter/source/hstyle.cxx
index cc7734c..f2ba4b2 100644
--- a/hwpfilter/source/hstyle.cxx
+++ b/hwpfilter/source/hstyle.cxx
@@ -115,7 +115,7 @@ void HWPStyle::SetParaShape(int n, ParaShape * pshapep)
}
-bool HWPStyle::Read(HWPFile & hwpf)
+void HWPStyle::Read(HWPFile & hwpf)
{
CharShape cshape;
ParaShape pshape;
@@ -123,7 +123,7 @@ bool HWPStyle::Read(HWPFile & hwpf)
hwpf.Read2b(&nstyles, 1);
style = ::comphelper::newArray_null<StyleData>(nstyles);
if (!style)
- return false;
+ return;
for (int ii = 0; ii < nstyles; ii++)
{
@@ -135,9 +135,8 @@ bool HWPStyle::Read(HWPFile & hwpf)
SetCharShape(ii, &cshape);
SetParaShape(ii, &pshape);
if (hwpf.State())
- return false;
+ return;
}
- return true;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/hwpfilter/source/hstyle.h b/hwpfilter/source/hstyle.h
index 4431029..c135230 100644
--- a/hwpfilter/source/hstyle.h
+++ b/hwpfilter/source/hstyle.h
@@ -45,7 +45,7 @@ class DLLEXPORT HWPStyle
void SetCharShape( int n, CharShape *cshapep );
void SetParaShape( int n, ParaShape *pshapep );
- bool Read( HWPFile &hwpf );
+ void Read( HWPFile &hwpf );
};
#endif
/* _HWPSTYLE+H_ */
diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index 9f90fab..9099b27 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -115,7 +115,7 @@ protected:
static void Error(const OString &rError);
private:
- int ExecuteAnalyzedToken( int nToken, char *pToken );
+ void ExecuteAnalyzedToken( int nToken, char *pToken );
void AddText(
OString &rText,
const OString &rIsoLang,
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index ba2d157..2175aec 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -161,7 +161,7 @@ void CfgParser::AddText(
pStackData->sText[ rIsoLang ] = rText;
}
-int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken )
+void CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken )
{
OString sToken( pToken );
@@ -295,8 +295,6 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken )
if ( sToken != " " && sToken != "\t" )
sLastWhitespace = "";
-
- return 1;
}
void CfgExport::Output(const OString&)
diff --git a/lingucomponent/source/languageguessing/guess.hxx b/lingucomponent/source/languageguessing/guess.hxx
index 98ebe36..efe61a0 100644
--- a/lingucomponent/source/languageguessing/guess.hxx
+++ b/lingucomponent/source/languageguessing/guess.hxx
@@ -50,7 +50,6 @@ class Guess{
string GetLanguage() { return language_str;}
string GetCountry() { return country_str;}
- string GetEncoding() { return encoding_str;}
protected:
string language_str;
diff --git a/lotuswordpro/source/filter/lwpobjid.cxx b/lotuswordpro/source/filter/lwpobjid.cxx
index c6d609d..22f4c2f 100644
--- a/lotuswordpro/source/filter/lwpobjid.cxx
+++ b/lotuswordpro/source/filter/lwpobjid.cxx
@@ -71,11 +71,10 @@ LwpObjectID::LwpObjectID(sal_uInt32 low, sal_uInt16 high)
* @descr Read object id with format: low(4bytes)+high(2bytes) from stream
* for LWP7 record
*/
-sal_uInt32 LwpObjectID::Read(LwpSvStream *pStrm)
+void LwpObjectID::Read(LwpSvStream *pStrm)
{
pStrm->ReadUInt32( m_nLow );
pStrm->ReadUInt16( m_nHigh );
- return DiskSize();
}
/**
* @descr Read object id with format: low(4bytes)+high(2bytes) from object stream
diff --git a/lotuswordpro/source/filter/lwpobjid.hxx b/lotuswordpro/source/filter/lwpobjid.hxx
index c57ada2..b461682 100644
--- a/lotuswordpro/source/filter/lwpobjid.hxx
+++ b/lotuswordpro/source/filter/lwpobjid.hxx
@@ -84,7 +84,7 @@ private:
sal_uInt8 m_nIndex;
bool m_bIsCompressed;
public:
- sal_uInt32 Read( LwpSvStream *pStrm );
+ void Read( LwpSvStream *pStrm );
sal_uInt32 Read( LwpObjectStream *pStrm );
void ReadIndexed( LwpSvStream* pStrm );
sal_uInt32 ReadIndexed( LwpObjectStream *pStrm );
diff --git a/lotuswordpro/source/filter/lwptblformula.cxx b/lotuswordpro/source/filter/lwptblformula.cxx
index 2b3195b..e8ba28d 100644
--- a/lotuswordpro/source/filter/lwptblformula.cxx
+++ b/lotuswordpro/source/filter/lwptblformula.cxx
@@ -133,16 +133,13 @@ bool LwpFormulaInfo::ReadCellID()
return readSucceeded;
}
-bool LwpFormulaInfo::ReadCellRange()
+void LwpFormulaInfo::ReadCellRange()
{
- bool readSucceeded = true;
- if (!ReadCellID( )) // start
- readSucceeded = false;
+ ReadCellID( ); // start
LwpFormulaCellAddr* pStartCellAddr = static_cast<LwpFormulaCellAddr*>(m_aStack.back());
m_aStack.pop_back();
- if (!ReadCellID()) // end
- readSucceeded = false;
+ ReadCellID(); // end
LwpFormulaCellAddr* pEndCellAddr = static_cast<LwpFormulaCellAddr*>(m_aStack.back());
m_aStack.pop_back();
@@ -152,8 +149,6 @@ bool LwpFormulaInfo::ReadCellRange()
pEndCellAddr->GetRow()) );
delete pStartCellAddr;
delete pEndCellAddr;
-
- return readSucceeded;
}
/**
@@ -264,12 +259,11 @@ void LwpFormulaInfo::MarkUnsupported(sal_uInt16 TokenType)
* Read arguments of functions from wordpro file
* @param LwpFormulaFunc& aFunc, functions object
*/
-bool LwpFormulaInfo::ReadArguments(LwpFormulaFunc& aFunc)
+void LwpFormulaInfo::ReadArguments(LwpFormulaFunc& aFunc)
{
sal_uInt16 NumberOfArguments = m_pObjStrm->QuickReaduInt16();
sal_uInt16 ArgumentDiskLength, Count;
sal_uInt8 ArgumentType;
- bool readSucceeded = true;
for (Count = 0; Count < NumberOfArguments; Count++)
{
@@ -302,7 +296,6 @@ bool LwpFormulaInfo::ReadArguments(LwpFormulaFunc& aFunc)
default:
bArgument = false;
m_pObjStrm->SeekRel(ArgumentDiskLength);
- readSucceeded = false;
break;
}
@@ -312,7 +305,6 @@ bool LwpFormulaInfo::ReadArguments(LwpFormulaFunc& aFunc)
m_aStack.pop_back();
}
}
- return readSucceeded;
}
void LwpFormulaInfo::Read()
diff --git a/lotuswordpro/source/filter/lwptblformula.hxx b/lotuswordpro/source/filter/lwptblformula.hxx
index 0934575..3e5964a 100644
--- a/lotuswordpro/source/filter/lwptblformula.hxx
+++ b/lotuswordpro/source/filter/lwptblformula.hxx
@@ -201,9 +201,9 @@ protected:
void Read() override;
bool ReadCellID();
void ReadText();
- bool ReadCellRange();
+ void ReadCellRange();
void ReadExpression();
- bool ReadArguments(LwpFormulaFunc& aFunc);
+ void ReadArguments(LwpFormulaFunc& aFunc);
bool m_bSupported;
private:
virtual ~LwpFormulaInfo();
diff --git a/mysqlc/source/mysqlc_resultset.hxx b/mysqlc/source/mysqlc_resultset.hxx
index d971461..ee92fcc 100644
--- a/mysqlc/source/mysqlc_resultset.hxx
+++ b/mysqlc/source/mysqlc_resultset.hxx
@@ -104,11 +104,6 @@ namespace connectivity
OResultSet( OCommonStatement* pStmt, sql::ResultSet *result, rtl_TextEncoding _encoding );
- css::uno::Reference< css::uno::XInterface > operator *()
- {
- return css::uno::Reference< css::uno::XInterface >(*static_cast<OResultSet_BASE*>(this));
- }
-
// ::cppu::OComponentHelper
void SAL_CALL disposing() SAL_OVERRIDE;
diff --git a/mysqlc/source/mysqlc_resultsetmetadata.hxx b/mysqlc/source/mysqlc_resultsetmetadata.hxx
index e79bb9b..65ea730 100644
--- a/mysqlc/source/mysqlc_resultsetmetadata.hxx
+++ b/mysqlc/source/mysqlc_resultsetmetadata.hxx
@@ -56,10 +56,6 @@ namespace connectivity
return rtl::OUString( _string.c_str(), _string.size(), m_encoding );
}
- /// Avoid ambigous cast error from the compiler.
- inline operator css::uno::Reference< css::sdbc::XResultSetMetaData > () throw()
- { return this; }
-
sal_Int32 SAL_CALL getColumnCount() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL isAutoIncrement(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/registry/source/keyimpl.hxx b/registry/source/keyimpl.hxx
index e7cb810..2b3880e 100644
--- a/registry/source/keyimpl.hxx
+++ b/registry/source/keyimpl.hxx
@@ -31,8 +31,8 @@ public:
ORegKey(const OUString& keyName, ORegistry* pReg);
~ORegKey();
- sal_uInt32 acquire()
- { return ++m_refCount; }
+ void acquire()
+ { ++m_refCount; }
sal_uInt32 release()
{ return --m_refCount; }
diff --git a/sal/osl/all/utility.cxx b/sal/osl/all/utility.cxx
index 25611ca..584a1be 100644
--- a/sal/osl/all/utility.cxx
+++ b/sal/osl/all/utility.cxx
@@ -36,9 +36,9 @@ public:
getTime();
}
- sal_uInt32 getTime()
+ void getTime()
{
- return osl_getGlobalTimer();
+ osl_getGlobalTimer();
}
};
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 6c1f908..3b69a4b 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -449,7 +449,7 @@ public:
sal_uInt64 ReadSourceWriteTemporary( sal_uInt64 aLength ); // read aLength from source and copy to temporary,
// no seeking is produced
- sal_uLong ReadSourceWriteTemporary(); // read source till the end and copy to temporary,
+ void ReadSourceWriteTemporary(); // read source till the end and copy to temporary,
void CopySourceToTemporary(); // same as ReadSourceWriteToTemporary()
// but the writing is done at the end of temporary
@@ -793,13 +793,11 @@ bool UCBStorageStream_Impl::Init()
return true;
}
-sal_uLong UCBStorageStream_Impl::ReadSourceWriteTemporary()
+void UCBStorageStream_Impl::ReadSourceWriteTemporary()
{
// read source stream till the end and copy all the data to
// the current position of the temporary stream
- sal_uLong aResult = 0;
-
if( m_bSourceRead )
{
Sequence<sal_Int8> aData(32000);
@@ -810,7 +808,7 @@ sal_uLong UCBStorageStream_Impl::ReadSourceWriteTemporary()
do
{
aReaded = m_rSource->readBytes( aData, 32000 );
- aResult += m_pStream->Write( aData.getArray(), aReaded );
+ m_pStream->Write( aData.getArray(), aReaded );
} while( aReaded == 32000 );
}
catch (const Exception &e)
@@ -821,9 +819,6 @@ sal_uLong UCBStorageStream_Impl::ReadSourceWriteTemporary()
}
m_bSourceRead = false;
-
- return aResult;
-
}
sal_uInt64 UCBStorageStream_Impl::ReadSourceWriteTemporary(sal_uInt64 aLength)
diff --git a/starmath/inc/rect.hxx b/starmath/inc/rect.hxx
index ac7e99d..2058e0d 100644
--- a/starmath/inc/rect.hxx
+++ b/starmath/inc/rect.hxx
@@ -104,7 +104,7 @@ protected:
inline void CopyMBL(const SmRect& rRect);
void CopyAlignInfo(const SmRect& rRect);
- SmRect & Union(const SmRect &rRect);
+ void Union(const SmRect &rRect);
public:
SmRect();
@@ -173,7 +173,7 @@ public:
RectHorAlign eHor, RectVerAlign eVer) const;
SmRect & ExtendBy(const SmRect &rRect, RectCopyMBL eCopyMode);
- SmRect & ExtendBy(const SmRect &rRect, RectCopyMBL eCopyMode,
+ void ExtendBy(const SmRect &rRect, RectCopyMBL eCopyMode,
long nNewAlignM);
SmRect & ExtendBy(const SmRect &rRect, RectCopyMBL eCopyMode,
bool bKeepVerAlignParams);
diff --git a/starmath/source/rect.cxx b/starmath/source/rect.cxx
index ebacd2c..08168e4 100644
--- a/starmath/source/rect.cxx
+++ b/starmath/source/rect.cxx
@@ -389,14 +389,14 @@ const Point SmRect::AlignTo(const SmRect &rRect, RectPos ePos,
}
-SmRect & SmRect::Union(const SmRect &rRect)
+void SmRect::Union(const SmRect &rRect)
// rectangle union of current one with 'rRect'. The result is to be the
// smallest rectangles that covers the space of both rectangles.
// (empty rectangles cover no space)
//! Italic correction is NOT taken into account here!
{
if (rRect.IsEmpty())
- return *this;
+ return;
long nL = rRect.GetLeft(),
nR = rRect.GetRight(),
@@ -427,8 +427,6 @@ SmRect & SmRect::Union(const SmRect &rRect)
SetBottom(nB);
nGlyphTop = nGT;
nGlyphBottom = nGB;
-
- return *this;
}
@@ -481,7 +479,7 @@ SmRect & SmRect::ExtendBy(const SmRect &rRect, RectCopyMBL eCopyMode)
}
-SmRect & SmRect::ExtendBy(const SmRect &rRect, RectCopyMBL eCopyMode,
+void SmRect::ExtendBy(const SmRect &rRect, RectCopyMBL eCopyMode,
long nNewAlignM)
// as 'ExtendBy' but sets AlignM value to 'nNewAlignM'.
// (this version will be used in 'SmBinVerNode' to provide means to
@@ -492,8 +490,6 @@ SmRect & SmRect::ExtendBy(const SmRect &rRect, RectCopyMBL eCopyMode,
ExtendBy(rRect, eCopyMode);
nAlignM = nNewAlignM;
-
- return *this;
}
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index 895cc79..0f7e3a4 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -90,16 +90,12 @@ public:
inline bool empty() const { return maControls.empty(); }
/** retrieves all controls currently in the list
- @return
- the number of controls in the list
*/
- size_t getControls( uno::Sequence< uno::Reference< awt::XControl > >& _out_rControls ) const;
+ void getControls( uno::Sequence< uno::Reference< awt::XControl > >& _out_rControls ) const;
/** retrieves all identifiers of all controls currently in the list
- @return
- the number of controls in the list
*/
- size_t getIdentifiers( uno::Sequence< sal_Int32 >& _out_rIdentifiers ) const;
+ void getIdentifiers( uno::Sequence< sal_Int32 >& _out_rIdentifiers ) const;
/** returns the first control which is registered under the given name
*/
@@ -180,7 +176,7 @@ UnoControlHolderList::ControlIdentifier UnoControlHolderList::addControl( const
}
-size_t UnoControlHolderList::getControls( uno::Sequence< uno::Reference< awt::XControl > >& _out_rControls ) const
+void UnoControlHolderList::getControls( uno::Sequence< uno::Reference< awt::XControl > >& _out_rControls ) const
{
_out_rControls.realloc( maControls.size() );
uno::Reference< awt::XControl >* pControls = _out_rControls.getArray();
@@ -189,11 +185,10 @@ size_t UnoControlHolderList::getControls( uno::Sequence< uno::Reference< awt::XC
++loop, ++pControls
)
*pControls = loop->second->getControl();
- return maControls.size();
}
-size_t UnoControlHolderList::getIdentifiers( uno::Sequence< sal_Int32 >& _out_rIdentifiers ) const
+void UnoControlHolderList::getIdentifiers( uno::Sequence< sal_Int32 >& _out_rIdentifiers ) const
{
_out_rIdentifiers.realloc( maControls.size() );
sal_Int32* pIndentifiers = _out_rIdentifiers.getArray();
@@ -202,7 +197,6 @@ size_t UnoControlHolderList::getIdentifiers( uno::Sequence< sal_Int32 >& _out_rI
++loop, ++pIndentifiers
)
*pIndentifiers = loop->first;
- return maControls.size();
}
diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index 3d7de44..69e564f 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.cxx
@@ -1003,7 +1003,7 @@ public:
inline void write(const sal_Unicode * pBegin, const sal_Unicode * pEnd);
- inline bool flush();
+ inline void flush();
};
inline INetMIMEEncodedWordOutputSink::INetMIMEEncodedWordOutputSink(
@@ -1035,10 +1035,9 @@ inline void INetMIMEEncodedWordOutputSink::write(const sal_Unicode * pBegin,
WriteUInt32(*pBegin++);
}
-inline bool INetMIMEEncodedWordOutputSink::flush()
+inline void INetMIMEEncodedWordOutputSink::flush()
{
finish(true);
- return m_ePrevCoding != CODING_NONE;
}
static const bool aEscape[128]
diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx
index 8de1a0c..5660442 100644
--- a/unotools/source/config/securityoptions.cxx
+++ b/unotools/source/config/securityoptions.cxx
@@ -142,7 +142,7 @@ class SvtSecurityOptions_Impl : public ConfigItem
void SetTrustedAuthors ( const Sequence< SvtSecurityOptions::Certificate >& rAuthors );
bool IsOptionSet ( SvtSecurityOptions::EOption eOption ) const;
- bool SetOption ( SvtSecurityOptions::EOption eOption, bool bValue );
+ void SetOption ( SvtSecurityOptions::EOption eOption, bool bValue );
bool IsOptionEnabled ( SvtSecurityOptions::EOption eOption ) const;
/*-****************************************************************************************************
@@ -878,26 +878,16 @@ bool SvtSecurityOptions_Impl::IsOptionSet( SvtSecurityOptions::EOption eOption )
return bRet;
}
-bool SvtSecurityOptions_Impl::SetOption( SvtSecurityOptions::EOption eOption, bool bValue )
+void SvtSecurityOptions_Impl::SetOption( SvtSecurityOptions::EOption eOption, bool bValue )
{
bool* pValue;
bool* pRO;
- bool bRet = false;
- if( GetOption( eOption, pValue, pRO ) )
+ if( GetOption( eOption, pValue, pRO ) && !*pRO && *pValue != bValue)
{
- if( !*pRO )
- {
- bRet = true;
- if( *pValue != bValue )
- {
- *pValue = bValue;
- SetModified();
- }
- }
+ *pValue = bValue;
+ SetModified();
}
-
- return bRet;
}
bool SvtSecurityOptions_Impl::IsOptionEnabled( SvtSecurityOptions::EOption eOption ) const
diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx
index 6278706..35c3fcd 100644
--- a/unotools/source/config/viewoptions.cxx
+++ b/unotools/source/config/viewoptions.cxx
@@ -93,9 +93,9 @@ class SvtViewOptionsBase_Impl
explicit SvtViewOptionsBase_Impl(const OUString& rList);
virtual ~SvtViewOptionsBase_Impl ( );
- bool Exists ( const OUString& sName );
- bool Delete ( const OUString& sName );
- OUString GetWindowState ( const OUString& sName );
+ bool Exists ( const OUString& sName );
+ void Delete ( const OUString& sName );
+ OUString GetWindowState ( const OUString& sName );
void SetWindowState ( const OUString& sName ,
const OUString& sState );
css::uno::Sequence< css::beans::NamedValue > GetUserData ( const OUString& sName );
@@ -232,32 +232,25 @@ bool SvtViewOptionsBase_Impl::Exists( const OUString& sName )
@seealso member m_aList
@param "sName", name of entry to delete it
- @return true , if item not exist(!) or could be deleted (should be the same!)
- false, otherwise
*//*-*************************************************************************************************************/
-bool SvtViewOptionsBase_Impl::Delete( const OUString& sName )
+void SvtViewOptionsBase_Impl::Delete( const OUString& sName )
{
#ifdef DEBUG_VIEWOPTIONS
++m_nWriteCount;
#endif
- bool bDeleted = false;
try
{
css::uno::Reference< css::container::XNameContainer > xSet(m_xSet, css::uno::UNO_QUERY_THROW);
xSet->removeByName(sName);
- bDeleted = true;
::comphelper::ConfigurationHelper::flush(m_xRoot);
}
catch(const css::container::NoSuchElementException&)
- { bDeleted = true; }
+ { }
catch(const css::uno::Exception& ex)
{
- bDeleted = false;
SVTVIEWOPTIONS_LOG_UNEXPECTED_EXCEPTION(ex)
}
-
- return bDeleted;
}
/*-************************************************************************************************************
More information about the Libreoffice-commits
mailing list