summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--svtools/inc/table/tablecontrol.hxx8
-rw-r--r--svtools/inc/table/tablecontrolinterface.hxx2
-rw-r--r--svtools/source/config/colorcfg.cxx12
-rw-r--r--svtools/source/config/extcolorcfg.cxx12
-rw-r--r--svtools/source/filter/exportdialog.cxx10
-rw-r--r--svtools/source/filter/exportdialog.hxx2
-rw-r--r--svtools/source/table/tablecontrol.cxx4
-rw-r--r--svtools/source/table/tablecontrol_impl.cxx4
-rw-r--r--svtools/source/table/tablecontrol_impl.hxx4
-rw-r--r--svtools/source/uno/treecontrolpeer.cxx4
-rw-r--r--svtools/source/uno/treecontrolpeer.hxx2
11 files changed, 22 insertions, 42 deletions
diff --git a/svtools/inc/table/tablecontrol.hxx b/svtools/inc/table/tablecontrol.hxx
index 1038ac7aaf04..c09cacb55ff4 100644
--- a/svtools/inc/table/tablecontrol.hxx
+++ b/svtools/inc/table/tablecontrol.hxx
@@ -97,14 +97,8 @@ namespace svt { namespace table
sal_Int32 GetCurrentColumn() const override;
/** activates the cell at the given position
-
- @return
- <sal_True/> if the move was successful, <FALSE/> otherwise. Usual
- failure conditions include some other instance vetoing the move,
- or impossibility to execute the move at all (for instance because
- of invalid coordinates).
*/
- bool GoTo( ColPos _nColumnPos, RowPos _nRow);
+ void GoTo( ColPos _nColumnPos, RowPos _nRow);
SVT_DLLPRIVATE virtual void Resize() override;
void Select();
diff --git a/svtools/inc/table/tablecontrolinterface.hxx b/svtools/inc/table/tablecontrolinterface.hxx
index f2af7146178c..95b6d49d6ab8 100644
--- a/svtools/inc/table/tablecontrolinterface.hxx
+++ b/svtools/inc/table/tablecontrolinterface.hxx
@@ -210,7 +210,7 @@ namespace svt { namespace table
virtual RowPos getCurrentRow() const = 0;
/// activates the given cell
- virtual bool activateCell( ColPos const i_col, RowPos const i_row ) = 0;
+ virtual void activateCell( ColPos const i_col, RowPos const i_row ) = 0;
/// retrieves the size of the table window, in pixels
virtual ::Size getTableSizePixel() const = 0;
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index 568fbcff64d0..1abdc6c59f6c 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -92,8 +92,8 @@ public:
uno::Sequence< OUString> GetSchemeNames();
- bool AddScheme(const OUString& rNode);
- bool RemoveScheme(const OUString& rNode);
+ void AddScheme(const OUString& rNode);
+ void RemoveScheme(const OUString& rNode);
void SetModified(){ConfigItem::SetModified();}
void ClearModified(){ConfigItem::ClearModified();}
void SettingsChanged();
@@ -319,21 +319,19 @@ uno::Sequence< OUString> ColorConfig_Impl::GetSchemeNames()
return GetNodeNames("ColorSchemes");
}
-bool ColorConfig_Impl::AddScheme(const OUString& rScheme)
+void ColorConfig_Impl::AddScheme(const OUString& rScheme)
{
if(ConfigItem::AddNode("ColorSchemes", rScheme))
{
m_sLoadedScheme = rScheme;
Commit();
- return true;
}
- return false;
}
-bool ColorConfig_Impl::RemoveScheme(const OUString& rScheme)
+void ColorConfig_Impl::RemoveScheme(const OUString& rScheme)
{
uno::Sequence< OUString > aElements { rScheme };
- return ClearNodeElements("ColorSchemes", aElements);
+ ClearNodeElements("ColorSchemes", aElements);
}
void ColorConfig_Impl::SettingsChanged()
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index 37eb86115b68..3363ad978ff7 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -118,8 +118,8 @@ public:
void SetColorConfigValue(const OUString& _sName,
const ExtendedColorConfigValue& rValue );
- bool AddScheme(const OUString& rNode);
- bool RemoveScheme(const OUString& rNode);
+ void AddScheme(const OUString& rNode);
+ void RemoveScheme(const OUString& rNode);
void SetModified(){ConfigItem::SetModified();}
void ClearModified(){ConfigItem::ClearModified();}
void SettingsChanged();
@@ -490,21 +490,19 @@ void ExtendedColorConfig_Impl::SetColorConfigValue(const OUString& _sName, const
}
}
-bool ExtendedColorConfig_Impl::AddScheme(const OUString& rScheme)
+void ExtendedColorConfig_Impl::AddScheme(const OUString& rScheme)
{
if(ConfigItem::AddNode("ExtendedColorScheme/ColorSchemes", rScheme))
{
m_sLoadedScheme = rScheme;
Commit();
- return true;
}
- return false;
}
-bool ExtendedColorConfig_Impl::RemoveScheme(const OUString& rScheme)
+void ExtendedColorConfig_Impl::RemoveScheme(const OUString& rScheme)
{
uno::Sequence< OUString > aElements { rScheme };
- return ClearNodeElements("ExtendedColorScheme/ColorSchemes", aElements);
+ ClearNodeElements("ExtendedColorScheme/ColorSchemes", aElements);
}
void ExtendedColorConfig_Impl::SettingsChanged()
diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx
index a8654e6a702b..4f46e0c03faa 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -387,15 +387,13 @@ void ExportDialog::GetGraphicSource()
}
}
-bool ExportDialog::GetGraphicStream()
+void ExportDialog::GetGraphicStream()
{
- bool bRet = false;
-
if ( !IsTempExportAvailable() )
{
delete mpTempStream, mpTempStream = new SvMemoryStream();
maBitmap = Bitmap();
- return bRet;
+ return;
}
bool bRecreateOutputStream = mpTempStream->Tell() == 0;
@@ -440,7 +438,6 @@ bool ExportDialog::GetGraphicStream()
{
xGraphicExporter->setSourceDocument( xSourceDoc );
xGraphicExporter->filter( aDescriptor );
- bRet = true;
if ( mnFormat == FORMAT_JPG )
{
@@ -450,8 +447,6 @@ bool ExportDialog::GetGraphicStream()
}
}
}
- else
- bRet = true;
}
catch( uno::Exception& )
{
@@ -459,7 +454,6 @@ bool ExportDialog::GetGraphicStream()
// ups
}
- return bRet;
}
Bitmap ExportDialog::GetGraphicBitmap( SvStream& rInputStream )
diff --git a/svtools/source/filter/exportdialog.hxx b/svtools/source/filter/exportdialog.hxx
index bf1c96496e71..a3e55f46520b 100644
--- a/svtools/source/filter/exportdialog.hxx
+++ b/svtools/source/filter/exportdialog.hxx
@@ -155,7 +155,7 @@ private:
void updateControls();
void GetGraphicSource();
- bool GetGraphicStream();
+ void GetGraphicStream();
static Bitmap GetGraphicBitmap( SvStream& rStream );
css::uno::Sequence< css::beans::PropertyValue >
GetFilterData( bool bUpdateConfig );
diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx
index 5975b67c8ebe..3ac1cc7ce5df 100644
--- a/svtools/source/table/tablecontrol.cxx
+++ b/svtools/source/table/tablecontrol.cxx
@@ -188,9 +188,9 @@ namespace svt { namespace table
}
- bool TableControl::GoTo( ColPos _nColumn, RowPos _nRow )
+ void TableControl::GoTo( ColPos _nColumn, RowPos _nRow )
{
- return m_pImpl->goTo( _nColumn, _nRow );
+ m_pImpl->goTo( _nColumn, _nRow );
}
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index 6538e03d4166..740e0c712c37 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -1832,9 +1832,9 @@ namespace svt { namespace table
}
- bool TableControl_Impl::activateCell( ColPos const i_col, RowPos const i_row )
+ void TableControl_Impl::activateCell( ColPos const i_col, RowPos const i_row )
{
- return goTo( i_col, i_row );
+ goTo( i_col, i_row );
}
diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx
index 0a71f8e44960..169fda79b90b 100644
--- a/svtools/source/table/tablecontrol_impl.hxx
+++ b/svtools/source/table/tablecontrol_impl.hxx
@@ -52,8 +52,6 @@ namespace svt { namespace table
void move( long const i_offset ) { nStartPixel += i_offset; nEndPixel += i_offset; }
long getWidth() const { return nEndPixel - nStartPixel; }
-
- ColumnMetrics const & operator()() { return *this; }
};
struct ColumnInfoPositionLess
@@ -254,7 +252,7 @@ namespace svt { namespace table
virtual PTableModel getModel() const override;
virtual ColPos getCurrentColumn() const override;
virtual RowPos getCurrentRow() const override;
- virtual bool activateCell( ColPos const i_col, RowPos const i_row ) override;
+ virtual void activateCell( ColPos const i_col, RowPos const i_row ) override;
virtual ::Size getTableSizePixel() const override;
virtual void setPointer( Pointer const & i_pointer ) override;
virtual void captureMouse() override;
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index e2699e97887e..7cfe29d7401f 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -271,7 +271,7 @@ UnoTreeListEntry* TreeControlPeer::createEntry( const Reference< XTreeNode >& xN
-bool TreeControlPeer::updateEntry( UnoTreeListEntry* pEntry )
+void TreeControlPeer::updateEntry( UnoTreeListEntry* pEntry )
{
bool bChanged = false;
if( pEntry && pEntry->mxNode.is() && mpTreeImpl )
@@ -333,8 +333,6 @@ bool TreeControlPeer::updateEntry( UnoTreeListEntry* pEntry )
if( bChanged )
mpTreeImpl->GetModel()->InvalidateEntry( pEntry );
}
-
- return bChanged;
}
diff --git a/svtools/source/uno/treecontrolpeer.hxx b/svtools/source/uno/treecontrolpeer.hxx
index db1992847f23..b06daf4e00da 100644
--- a/svtools/source/uno/treecontrolpeer.hxx
+++ b/svtools/source/uno/treecontrolpeer.hxx
@@ -127,7 +127,7 @@ private:
void addNode( UnoTreeListBoxImpl& rTree, const css::uno::Reference< css::awt::tree::XTreeNode >& xNode, UnoTreeListEntry* pParentEntry );
UnoTreeListEntry* createEntry( const css::uno::Reference< css::awt::tree::XTreeNode >& xNode, UnoTreeListEntry* pParent, sal_uLong nPos = TREELIST_APPEND );
- bool updateEntry( UnoTreeListEntry* pEntry );
+ void updateEntry( UnoTreeListEntry* pEntry );
void updateTree( const css::awt::tree::TreeDataModelEvent& rEvent, bool bRecursive );
void updateNode( UnoTreeListBoxImpl& rTree, const css::uno::Reference< css::awt::tree::XTreeNode >& xNode, bool bRecursive );