summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--editeng/source/editeng/editdoc.cxx13
-rw-r--r--editeng/source/editeng/editdoc.hxx2
-rw-r--r--editeng/source/editeng/impedit.hxx2
-rw-r--r--editeng/source/editeng/impedit2.cxx4
-rw-r--r--editeng/source/editeng/textconv.cxx3
-rw-r--r--editeng/source/editeng/textconv.hxx2
-rw-r--r--extensions/source/abpilot/datasourcehandling.cxx3
-rw-r--r--extensions/source/abpilot/datasourcehandling.hxx2
-rw-r--r--extensions/source/propctrlr/pcrcommon.hxx3
-rw-r--r--extensions/source/propctrlr/propertyeditor.cxx8
-rw-r--r--extensions/source/propctrlr/propertyeditor.hxx2
-rw-r--r--extensions/source/propctrlr/standardcontrol.cxx4
-rw-r--r--extensions/source/propctrlr/standardcontrol.hxx2
-rw-r--r--extensions/source/propctrlr/unourl.hxx3
-rw-r--r--extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx7
-rw-r--r--extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx2
16 files changed, 17 insertions, 45 deletions
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index baf72de5fd15..fddb24702924 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -2940,19 +2940,6 @@ bool CharAttribList::HasBoundingAttrib( sal_Int32 nBound ) const
return false;
}
-const EditCharAttrib* CharAttribList::FindEmptyAttrib( sal_uInt16 nWhich, sal_Int32 nPos ) const
-{
- if ( !bHasEmptyAttribs )
- return nullptr;
-
- for (const std::unique_ptr<EditCharAttrib>& rAttr : aAttribs)
- {
- if (rAttr->GetStart() == nPos && rAttr->GetEnd() == nPos && rAttr->Which() == nWhich)
- return rAttr.get();
- }
- return nullptr;
-}
-
EditCharAttrib* CharAttribList::FindEmptyAttrib( sal_uInt16 nWhich, sal_Int32 nPos )
{
if ( !bHasEmptyAttribs )
diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx
index ebdfb09b70f3..9fca92792894 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -201,7 +201,6 @@ public:
const EditCharAttrib* FindAttrib( sal_uInt16 nWhich, sal_Int32 nPos ) const;
EditCharAttrib* FindAttrib( sal_uInt16 nWhich, sal_Int32 nPos );
const EditCharAttrib* FindNextAttrib( sal_uInt16 nWhich, sal_Int32 nFromPos ) const;
- const EditCharAttrib* FindEmptyAttrib( sal_uInt16 nWhich, sal_Int32 nPos ) const;
EditCharAttrib* FindEmptyAttrib( sal_uInt16 nWhich, sal_Int32 nPos );
const EditCharAttrib* FindFeature( sal_Int32 nPos ) const;
@@ -262,7 +261,6 @@ public:
void SetStyleSheet( SfxStyleSheet* pS, bool bRecalcFont = true );
void SetStyleSheet( SfxStyleSheet* pS, const SvxFont& rFontFromStyle );
SfxStyleSheet* GetStyleSheet() { return aContentAttribs.GetStyleSheet(); }
- const SfxStyleSheet* GetStyleSheet() const { return aContentAttribs.GetStyleSheet(); }
void CreateDefFont();
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index e1da8ca7754e..c8d2211e6884 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -548,7 +548,7 @@ private:
void CheckPageOverflow();
- EditPaM Clear();
+ void Clear();
EditPaM RemoveText();
bool CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY );
void CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uInt32 nStartPosY );
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 97ea3936b7fa..1aa89c41568f 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -611,7 +611,7 @@ EditPaM ImpEditEngine::InsertText(const EditSelection& aSel, const OUString& rSt
return aPaM;
}
-EditPaM ImpEditEngine::Clear()
+void ImpEditEngine::Clear()
{
InitDoc( false );
@@ -628,8 +628,6 @@ EditPaM ImpEditEngine::Clear()
EditView* pView = aEditViews[--nView];
pView->pImpEditView->SetEditSelection( aSel );
}
-
- return aPaM;
}
EditPaM ImpEditEngine::RemoveText()
diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx
index 5491fbee2ca3..78077148985b 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -116,7 +116,7 @@ bool TextConvWrapper::ConvNext_impl()
}
-bool TextConvWrapper::FindConvText_impl()
+void TextConvWrapper::FindConvText_impl()
{
// modified version of SvxSpellWrapper::FindSpellError
@@ -138,7 +138,6 @@ bool TextConvWrapper::FindConvText_impl()
}
}
m_pWin->LeaveWait();
- return bFound;
}
diff --git a/editeng/source/editeng/textconv.hxx b/editeng/source/editeng/textconv.hxx
index ca666666189d..e7209fc983e0 100644
--- a/editeng/source/editeng/textconv.hxx
+++ b/editeng/source/editeng/textconv.hxx
@@ -52,7 +52,7 @@ class TextConvWrapper : public editeng::HangulHanjaConversion
// from SvxSpellWrapper copied and modified
bool ConvNext_impl(); // former SpellNext
- bool FindConvText_impl(); // former FindSpellError
+ void FindConvText_impl(); // former FindSpellError
bool ConvMore_impl(); // former SpellMore
// from EditSpellWrapper copied and modified
diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index 6ede832f8e25..382a397217a1 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -222,7 +222,7 @@ namespace abp
}
- OUString& ODataSourceContext::disambiguate(OUString& _rDataSourceName)
+ void ODataSourceContext::disambiguate(OUString& _rDataSourceName)
{
OUString sCheck( _rDataSourceName );
StringBag::const_iterator aPos = m_pImpl->aDataSourceNames.find( sCheck );
@@ -237,7 +237,6 @@ namespace abp
}
_rDataSourceName = sCheck;
- return _rDataSourceName;
}
diff --git a/extensions/source/abpilot/datasourcehandling.hxx b/extensions/source/abpilot/datasourcehandling.hxx
index 230d1bfdb10b..96fed7569bb9 100644
--- a/extensions/source/abpilot/datasourcehandling.hxx
+++ b/extensions/source/abpilot/datasourcehandling.hxx
@@ -58,7 +58,7 @@ namespace abp
void getDataSourceNames( StringBag& _rNames ) const;
/// disambiguates the given name by appending successive numbers
- OUString& disambiguate(OUString& _rDataSourceName);
+ void disambiguate(OUString& _rDataSourceName);
/// creates a new MORK data source
ODataSource createNewMORK( const OUString& _rName );
diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx
index 17d268acd9bf..2aec531ede81 100644
--- a/extensions/source/propctrlr/pcrcommon.hxx
+++ b/extensions/source/propctrlr/pcrcommon.hxx
@@ -86,9 +86,6 @@ namespace pcr
inline StlSyntaxSequence( const ELEMENT* pElements, sal_Int32 len ) : UnoBase( pElements, len ) { }
explicit inline StlSyntaxSequence( sal_Int32 len ) : UnoBase( len ) { }
- operator const UnoBase&() const { return *this; }
- operator UnoBase&() { return *this; }
-
typedef const ELEMENT* const_iterator;
typedef ELEMENT* iterator;
diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx
index 83278bde93cb..095fd326da14 100644
--- a/extensions/source/propctrlr/propertyeditor.cxx
+++ b/extensions/source/propctrlr/propertyeditor.cxx
@@ -391,21 +391,19 @@ namespace pcr
}
- sal_uInt16 OPropertyEditor::InsertEntry( const OLineDescriptor& rData, sal_uInt16 _nPageId, sal_uInt16 nPos )
+ void OPropertyEditor::InsertEntry( const OLineDescriptor& rData, sal_uInt16 _nPageId, sal_uInt16 nPos )
{
// let the current page handle this
OBrowserPage* pPage = getPage( _nPageId );
DBG_ASSERT( pPage, "OPropertyEditor::InsertEntry: don't have such a page!" );
if ( !pPage )
- return EDITOR_LIST_ENTRY_NOTFOUND;
+ return;
- sal_uInt16 nEntry = pPage->getListBox().InsertEntry( rData, nPos );
+ pPage->getListBox().InsertEntry( rData, nPos );
OSL_ENSURE( m_aPropertyPageIds.find( rData.sName ) == m_aPropertyPageIds.end(),
"OPropertyEditor::InsertEntry: property already present in the map!" );
m_aPropertyPageIds.insert( MapStringToPageId::value_type( rData.sName, _nPageId ) );
-
- return nEntry;
}
diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx
index a57c526ad8a7..3a9bf85ca916 100644
--- a/extensions/source/propctrlr/propertyeditor.hxx
+++ b/extensions/source/propctrlr/propertyeditor.hxx
@@ -102,7 +102,7 @@ namespace pcr
void ShowPropertyPage( sal_uInt16 _nPageId, bool _bShow );
- sal_uInt16 InsertEntry( const OLineDescriptor&, sal_uInt16 _nPageId, sal_uInt16 nPos = EDITOR_LIST_APPEND );
+ void InsertEntry( const OLineDescriptor&, sal_uInt16 _nPageId, sal_uInt16 nPos = EDITOR_LIST_APPEND );
void RemoveEntry( const OUString& _rName );
void ChangeEntry( const OLineDescriptor& );
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 00138e56cf9b..38b136cf407f 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -1205,7 +1205,7 @@ namespace pcr
#define STD_HEIGHT 100
- bool DropDownEditControl::ShowDropDown( bool bShow )
+ void DropDownEditControl::ShowDropDown( bool bShow )
{
if (bShow)
{
@@ -1241,8 +1241,6 @@ namespace pcr
m_bDropdown = false;
m_pImplEdit->GrabFocus();
}
- return m_bDropdown;
-
}
diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx
index f5422f0f8eed..c3c83e283b87 100644
--- a/extensions/source/propctrlr/standardcontrol.hxx
+++ b/extensions/source/propctrlr/standardcontrol.hxx
@@ -391,7 +391,7 @@ namespace pcr
DECL_LINK_TYPED( ReturnHdl, FloatingWindow*, void );
DECL_LINK_TYPED( DropDownHdl, Button*, void );
- bool ShowDropDown( bool bShow );
+ void ShowDropDown( bool bShow );
};
diff --git a/extensions/source/propctrlr/unourl.hxx b/extensions/source/propctrlr/unourl.hxx
index 9d32c94e73a5..5dccb7a860da 100644
--- a/extensions/source/propctrlr/unourl.hxx
+++ b/extensions/source/propctrlr/unourl.hxx
@@ -42,8 +42,7 @@ namespace pcr
const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB
);
- inline operator const OUString& () const { return m_aURL.Complete; }
- inline operator const css::util::URL& () const { return m_aURL; }
+ inline operator const css::util::URL& () const { return m_aURL; }
private:
UnoURL(); // never implemented
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
index f5cb77f6839d..55bc53403b2e 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
@@ -498,19 +498,18 @@ namespace pcr
}
- bool XSDValidationPropertyHandler::implDoCloneCurrentDataType( const OUString& _rNewName )
+ void XSDValidationPropertyHandler::implDoCloneCurrentDataType( const OUString& _rNewName )
{
OSL_PRECOND( m_pHelper.get(), "XSDValidationPropertyHandler::implDoCloneCurrentDataType: this will crash!" );
::rtl::Reference< XSDDataType > pType = m_pHelper->getValidatingDataType();
if ( !pType.is() )
- return false;
+ return;
if ( !m_pHelper->cloneDataType( pType, _rNewName ) )
- return false;
+ return;
m_pHelper->setValidatingDataTypeByName( _rNewName );
- return true;
}
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx
index 204f452a8873..e4f2464e65d8 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx
@@ -77,7 +77,7 @@ namespace pcr
bool implDoRemoveCurrentDataType();
bool implPrepareCloneDataCurrentType( OUString& _rNewName );
- bool implDoCloneCurrentDataType( const OUString& _rNewName );
+ void implDoCloneCurrentDataType( const OUString& _rNewName );
/** retrieves the names of the data types which our introspectee can be validated against
*/
generated by cgit (git 2.34.1) at 2025-02-11 13:52:09 +0000