diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 18:16:42 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 08:18:05 +0000 |
| commit | a238b1f8d304bf1e2ffb357937f3ec888ee8ac89 (patch) | |
| tree | 083c0582d4bf80e313ed256ca476ba8f69c7f7a6 /editeng | |
| parent | 538f276ae0414ea34ede6090b5f56e8fecd6fc65 (diff) | |
Remove excess newlines
A ridiculously fast way of doing this is:
for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \
--exclude-dir=workdir --exclude-dir=instdir '^
{3,}' .)
do
perl -0777 -i -pe 's/^
{3,}/
/gm' $i
done
Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c
Reviewed-on: https://gerrit.libreoffice.org/22224
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'editeng')
44 files changed, 0 insertions, 532 deletions
diff --git a/editeng/source/accessibility/AccessibleComponentBase.cxx b/editeng/source/accessibility/AccessibleComponentBase.cxx index 61cb5833b741..5feb3d0a1286 100644 --- a/editeng/source/accessibility/AccessibleComponentBase.cxx +++ b/editeng/source/accessibility/AccessibleComponentBase.cxx @@ -41,8 +41,6 @@ AccessibleComponentBase::AccessibleComponentBase() } - - AccessibleComponentBase::~AccessibleComponentBase() { } @@ -61,8 +59,6 @@ sal_Bool SAL_CALL AccessibleComponentBase::containsPoint ( } - - uno::Reference<XAccessible > SAL_CALL AccessibleComponentBase::getAccessibleAtPoint ( const awt::Point& /*aPoint*/) @@ -72,8 +68,6 @@ uno::Reference<XAccessible > SAL_CALL } - - awt::Rectangle SAL_CALL AccessibleComponentBase::getBounds() throw (uno::RuntimeException, std::exception) { @@ -81,8 +75,6 @@ awt::Rectangle SAL_CALL AccessibleComponentBase::getBounds() } - - awt::Point SAL_CALL AccessibleComponentBase::getLocation() throw (css::uno::RuntimeException, std::exception) { @@ -91,8 +83,6 @@ awt::Point SAL_CALL AccessibleComponentBase::getLocation() } - - awt::Point SAL_CALL AccessibleComponentBase::getLocationOnScreen() throw (css::uno::RuntimeException, std::exception) { @@ -100,8 +90,6 @@ awt::Point SAL_CALL AccessibleComponentBase::getLocationOnScreen() } - - css::awt::Size SAL_CALL AccessibleComponentBase::getSize() throw (css::uno::RuntimeException, std::exception) { @@ -110,8 +98,6 @@ css::awt::Size SAL_CALL AccessibleComponentBase::getSize() } - - void SAL_CALL AccessibleComponentBase::addFocusListener ( const css::uno::Reference< css::awt::XFocusListener >& /*xListener*/) @@ -121,8 +107,6 @@ void SAL_CALL AccessibleComponentBase::addFocusListener ( } - - void SAL_CALL AccessibleComponentBase::removeFocusListener (const css::uno::Reference< css::awt::XFocusListener >& /*xListener*/ ) throw (css::uno::RuntimeException) @@ -131,8 +115,6 @@ void SAL_CALL AccessibleComponentBase::removeFocusListener (const css::uno::Refe } - - void SAL_CALL AccessibleComponentBase::grabFocus() throw (css::uno::RuntimeException, std::exception) { @@ -148,8 +130,6 @@ void SAL_CALL AccessibleComponentBase::grabFocus() } - - sal_Int32 SAL_CALL AccessibleComponentBase::getForeground() throw (css::uno::RuntimeException, std::exception) { @@ -157,8 +137,6 @@ sal_Int32 SAL_CALL AccessibleComponentBase::getForeground() } - - sal_Int32 SAL_CALL AccessibleComponentBase::getBackground() throw (css::uno::RuntimeException, std::exception) { @@ -166,8 +144,6 @@ sal_Int32 SAL_CALL AccessibleComponentBase::getBackground() } - - // XAccessibleExtendedComponent css::uno::Reference< css::awt::XFont > SAL_CALL @@ -178,8 +154,6 @@ css::uno::Reference< css::awt::XFont > SAL_CALL } - - OUString SAL_CALL AccessibleComponentBase::getTitledBorderText() throw (css::uno::RuntimeException, std::exception) { diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx index 3e5481f82d4b..019b1d136a47 100644 --- a/editeng/source/accessibility/AccessibleContextBase.cxx +++ b/editeng/source/accessibility/AccessibleContextBase.cxx @@ -107,8 +107,6 @@ bool AccessibleContextBase::SetState (sal_Int16 aState) } - - bool AccessibleContextBase::ResetState (sal_Int16 aState) { ::osl::ClearableMutexGuard aGuard (maMutex); @@ -133,8 +131,6 @@ bool AccessibleContextBase::ResetState (sal_Int16 aState) } - - bool AccessibleContextBase::GetState (sal_Int16 aState) { ::osl::MutexGuard aGuard (maMutex); @@ -148,8 +144,6 @@ bool AccessibleContextBase::GetState (sal_Int16 aState) } - - void AccessibleContextBase::SetRelationSet ( const uno::Reference<XAccessibleRelationSet>& rxNewRelationSet) throw (css::uno::RuntimeException) @@ -176,8 +170,6 @@ void AccessibleContextBase::SetRelationSet ( } - - // XAccessible uno::Reference< XAccessibleContext> SAL_CALL @@ -189,8 +181,6 @@ uno::Reference< XAccessibleContext> SAL_CALL } - - // XAccessibleContext /** No children. @@ -204,8 +194,6 @@ sal_Int32 SAL_CALL } - - /** Forward the request to the shape. Return the requested shape or throw an exception for a wrong index. */ @@ -220,8 +208,6 @@ uno::Reference<XAccessible> SAL_CALL } - - uno::Reference<XAccessible> SAL_CALL AccessibleContextBase::getAccessibleParent() throw (css::uno::RuntimeException, std::exception) @@ -231,8 +217,6 @@ uno::Reference<XAccessible> SAL_CALL } - - sal_Int32 SAL_CALL AccessibleContextBase::getAccessibleIndexInParent() throw (css::uno::RuntimeException, std::exception) @@ -267,8 +251,6 @@ sal_Int32 SAL_CALL } - - sal_Int16 SAL_CALL AccessibleContextBase::getAccessibleRole() throw (css::uno::RuntimeException, std::exception) @@ -278,8 +260,6 @@ sal_Int16 SAL_CALL } - - OUString SAL_CALL AccessibleContextBase::getAccessibleDescription() throw (css::uno::RuntimeException, std::exception) @@ -290,8 +270,6 @@ OUString SAL_CALL } - - OUString SAL_CALL AccessibleContextBase::getAccessibleName() throw (css::uno::RuntimeException, std::exception) @@ -310,8 +288,6 @@ OUString SAL_CALL } - - /** Return a copy of the relation set. */ uno::Reference<XAccessibleRelationSet> SAL_CALL @@ -333,8 +309,6 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL } - - /** Return a copy of the state set. Possible states are: ENABLED @@ -379,8 +353,6 @@ uno::Reference<XAccessibleStateSet> SAL_CALL } - - lang::Locale SAL_CALL AccessibleContextBase::getLocale() throw (IllegalAccessibleComponentStateException, @@ -402,8 +374,6 @@ lang::Locale SAL_CALL } - - // XAccessibleEventListener void SAL_CALL AccessibleContextBase::addAccessibleEventListener ( @@ -427,8 +397,6 @@ void SAL_CALL AccessibleContextBase::addAccessibleEventListener ( } - - void SAL_CALL AccessibleContextBase::removeAccessibleEventListener ( const uno::Reference<XAccessibleEventListener >& rxListener ) throw (uno::RuntimeException, std::exception) @@ -476,8 +444,6 @@ uno::Sequence< OUString > SAL_CALL } - - // XTypeProvider uno::Sequence< css::uno::Type> @@ -515,8 +481,6 @@ void SAL_CALL AccessibleContextBase::disposing() } - - void AccessibleContextBase::SetAccessibleDescription ( const OUString& rDescription, StringOrigin eDescriptionOrigin) @@ -540,8 +504,6 @@ void AccessibleContextBase::SetAccessibleDescription ( } - - void AccessibleContextBase::SetAccessibleName ( const OUString& rName, StringOrigin eNameOrigin) @@ -565,8 +527,6 @@ void AccessibleContextBase::SetAccessibleName ( } - - OUString AccessibleContextBase::CreateAccessibleDescription() throw (css::uno::RuntimeException, std::exception) { @@ -574,8 +534,6 @@ OUString AccessibleContextBase::CreateAccessibleDescription() } - - OUString AccessibleContextBase::CreateAccessibleName() throw (css::uno::RuntimeException, std::exception) { @@ -583,8 +541,6 @@ OUString AccessibleContextBase::CreateAccessibleName() } - - void AccessibleContextBase::CommitChange ( sal_Int16 nEventId, const uno::Any& rNewValue, @@ -606,8 +562,6 @@ void AccessibleContextBase::CommitChange ( } - - void AccessibleContextBase::FireEvent (const AccessibleEventObject& aEvent) { if (mnClientId) @@ -615,8 +569,6 @@ void AccessibleContextBase::FireEvent (const AccessibleEventObject& aEvent) } - - void AccessibleContextBase::ThrowIfDisposed() throw (css::lang::DisposedException) { @@ -629,14 +581,12 @@ void AccessibleContextBase::ThrowIfDisposed() } - bool AccessibleContextBase::IsDisposed() { return (rBHelper.bDisposed || rBHelper.bInDispose); } - void AccessibleContextBase::SetAccessibleRole( sal_Int16 _nRole ) { maRole = _nRole; diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index 7af42df8401a..a51fbbac7e2b 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -18,12 +18,9 @@ */ - - // Global header - #include <limits.h> #include <vector> #include <algorithm> @@ -56,11 +53,9 @@ #include <svl/intitem.hxx> - // Project-local header - #include <com/sun/star/beans/PropertyState.hpp> #include <editeng/unolingu.hxx> @@ -80,11 +75,9 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::accessibility; - // AccessibleEditableTextPara implementation - namespace accessibility { const SvxItemPropertySet* ImplGetSvxCharAndParaPropertiesSet() @@ -2840,5 +2833,4 @@ namespace accessibility } // end of namespace accessibility - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/accessibility/AccessibleHyperlink.cxx b/editeng/source/accessibility/AccessibleHyperlink.cxx index 3e73c05e4b04..0dddfcee9e10 100644 --- a/editeng/source/accessibility/AccessibleHyperlink.cxx +++ b/editeng/source/accessibility/AccessibleHyperlink.cxx @@ -30,12 +30,9 @@ using namespace ::com::sun::star; - - // AccessibleHyperlink implementation - namespace accessibility { @@ -131,5 +128,4 @@ namespace accessibility } // end of namespace accessibility - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/accessibility/AccessibleParaManager.cxx b/editeng/source/accessibility/AccessibleParaManager.cxx index f02a1dab8194..30fbdb56dd1b 100644 --- a/editeng/source/accessibility/AccessibleParaManager.cxx +++ b/editeng/source/accessibility/AccessibleParaManager.cxx @@ -18,8 +18,6 @@ */ - - // Global header @@ -30,11 +28,9 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> - // Project-local header - #include <editeng/unoedhlp.hxx> #include <editeng/unopracc.hxx> #include <editeng/unoedsrc.hxx> @@ -46,7 +42,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; - namespace accessibility { AccessibleParaManager::AccessibleParaManager() : @@ -330,7 +325,6 @@ namespace accessibility nEndPara >= nStartPara, "AccessibleParaManager::FireEvent: invalid index" ); - if( 0 <= nStartPara && 0 <= nEndPara && maChildren.size() > static_cast<size_t>(nStartPara) && maChildren.size() >= static_cast<size_t>(nEndPara) && @@ -392,5 +386,4 @@ namespace accessibility } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/accessibility/AccessibleSelectionBase.cxx b/editeng/source/accessibility/AccessibleSelectionBase.cxx index a5d2ed8b040c..900447fa8df5 100644 --- a/editeng/source/accessibility/AccessibleSelectionBase.cxx +++ b/editeng/source/accessibility/AccessibleSelectionBase.cxx @@ -34,13 +34,11 @@ namespace accessibility } - AccessibleSelectionBase::~AccessibleSelectionBase() { } - void SAL_CALL AccessibleSelectionBase::selectAccessibleChild( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( implGetMutex() ); @@ -48,7 +46,6 @@ namespace accessibility } - sal_Bool SAL_CALL AccessibleSelectionBase::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( implGetMutex() ); @@ -56,7 +53,6 @@ namespace accessibility } - void SAL_CALL AccessibleSelectionBase::clearAccessibleSelection( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( implGetMutex() ); @@ -64,7 +60,6 @@ namespace accessibility } - void SAL_CALL AccessibleSelectionBase::selectAllAccessibleChildren( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( implGetMutex() ); @@ -72,7 +67,6 @@ namespace accessibility } - sal_Int32 SAL_CALL AccessibleSelectionBase::getSelectedAccessibleChildCount( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( implGetMutex() ); @@ -80,7 +74,6 @@ namespace accessibility } - uno::Reference< XAccessible > SAL_CALL AccessibleSelectionBase::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( implGetMutex() ); @@ -88,7 +81,6 @@ namespace accessibility } - void SAL_CALL AccessibleSelectionBase::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( implGetMutex() ); diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx index f21f63a4d645..6b38bfaadee2 100644 --- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx +++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx @@ -18,12 +18,9 @@ */ - - // Global header - #include <limits.h> #include <utility> #include <vector> @@ -40,11 +37,9 @@ #include <com/sun/star/accessibility/AccessibleTextType.hpp> - // Project-local header - #include <editeng/editdata.hxx> #include <editeng/unopracc.hxx> #include "editeng/unoedprx.hxx" @@ -97,12 +92,9 @@ namespace accessibility } - // AccessibleStaticTextBase_Impl declaration - - /** AccessibleStaticTextBase_Impl This class implements the AccessibleStaticTextBase @@ -186,11 +178,9 @@ namespace accessibility }; - // AccessibleStaticTextBase_Impl implementation - AccessibleStaticTextBase_Impl::AccessibleStaticTextBase_Impl() : mxThis( nullptr ), mpTextParagraph( new AccessibleEditableTextPara(nullptr) ), @@ -999,5 +989,4 @@ namespace accessibility } // end of namespace accessibility - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/accessibility/AccessibleStringWrap.cxx b/editeng/source/accessibility/AccessibleStringWrap.cxx index ecddbd32a75f..d3e6f49dfef7 100644 --- a/editeng/source/accessibility/AccessibleStringWrap.cxx +++ b/editeng/source/accessibility/AccessibleStringWrap.cxx @@ -26,11 +26,9 @@ #include <editeng/AccessibleStringWrap.hxx> - // AccessibleStringWrap implementation - AccessibleStringWrap::AccessibleStringWrap( OutputDevice& rDev, SvxFont& rFont, const OUString& rText ) : mrDev( rDev ), mrFont( rFont ), diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx index acb3dfe97777..a274d8b3ffcf 100644 --- a/editeng/source/editeng/editattr.cxx +++ b/editeng/source/editeng/editattr.cxx @@ -49,7 +49,6 @@ #include "editattr.hxx" - // class EditCharAttrib EditCharAttrib::EditCharAttrib( const SfxPoolItem& rAttr, sal_uInt16 nS, sal_uInt16 nE ) : @@ -70,7 +69,6 @@ void EditCharAttrib::SetFont( SvxFont&, OutputDevice* ) } - // class EditCharAttribFont EditCharAttribFont::EditCharAttribFont( const SvxFontItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd ) diff --git a/editeng/source/editeng/editattr.hxx b/editeng/source/editeng/editattr.hxx index 4f0c87f44749..6db6fd6c0960 100644 --- a/editeng/source/editeng/editattr.hxx +++ b/editeng/source/editeng/editattr.hxx @@ -322,7 +322,6 @@ public: }; - // class EditCharAttribLanguage class EditCharAttribLanguage : public EditCharAttrib diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 6f026127967d..5db6b7683526 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -71,8 +71,6 @@ using namespace ::com::sun::star; - - sal_uInt16 GetScriptItemId( sal_uInt16 nItemId, SvtScriptType nScriptType ) { sal_uInt16 nId = nItemId; @@ -1004,7 +1002,6 @@ EditLine::~EditLine() } - EditLine* EditLine::Clone() const { EditLine* pL = new EditLine; @@ -1169,7 +1166,6 @@ EditPaM::EditPaM(const EditPaM& r) : pNode(r.pNode), nIndex(r.nIndex) {} EditPaM::EditPaM(ContentNode* p, sal_Int32 n) : pNode(p), nIndex(n) {} - void EditPaM::SetNode(ContentNode* p) { pNode = p; @@ -2885,7 +2881,6 @@ bool CharAttribList::HasAttrib( sal_Int32 nStartPos, sal_Int32 nEndPos ) const } - namespace { class FindByAddress : public std::unary_function<std::unique_ptr<EditCharAttrib>, bool> diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx index 0e3ad60b3674..089880d859cc 100644 --- a/editeng/source/editeng/editdoc.hxx +++ b/editeng/source/editeng/editdoc.hxx @@ -368,7 +368,6 @@ struct ExtraPortionInfo }; - // class TextPortion class TextPortion @@ -551,7 +550,6 @@ public: }; - // class LineList class EditLineList diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index 8ab97dfb3d47..77783c9b1e4a 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -60,8 +60,6 @@ using std::endl; using namespace com::sun::star; - - XEditAttribute* MakeXEditAttribute( SfxItemPool& rPool, const SfxPoolItem& rItem, sal_uInt16 nStart, sal_uInt16 nEnd ) { // Create thw new attribute in the pool @@ -662,7 +660,6 @@ void EditTextObjectImpl::DestroyAttrib( XEditAttribute* pAttr ) } - ContentInfo* EditTextObjectImpl::CreateAndInsertContent() { aContents.push_back(std::unique_ptr<ContentInfo>(new ContentInfo(*pPool))); diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx index 4182822047a0..ccc4e0f6661b 100644 --- a/editeng/source/editeng/edtspell.cxx +++ b/editeng/source/editeng/edtspell.cxx @@ -542,7 +542,6 @@ bool WrongList::DbgIsBuggy() const } - EdtAutoCorrDoc::EdtAutoCorrDoc( EditEngine* pE, ContentNode* pN, sal_Int32 nCrsr, sal_Unicode cIns) : mpEditEngine(pE), diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 1962b7e2427c..61f50d1d8573 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -1144,7 +1144,6 @@ inline short ImpEditEngine::GetXValue( short nXValue ) const } - inline long ImpEditEngine::GetXValue( long nXValue ) const { if ( !aStatus.DoStretch() || ( nStretchX == 100 ) ) diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 1aa89c41568f..f40a2b8d5839 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -1590,7 +1590,6 @@ static bool lcl_HasStrongLTR ( const OUString& rTxt, sal_Int32 nStart, sal_Int3 } - void ImpEditEngine::InitScriptTypes( sal_Int32 nPara ) { ParaPortion* pParaPortion = GetParaPortions().SafeGetObject( nPara ); diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 4426fdf0b20e..bde70dc0469a 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -269,7 +269,6 @@ static bool lcl_ConnectToPrev( sal_Unicode cCh, sal_Unicode cPrevCh ) // For Ka } - // class ImpEditEngine void ImpEditEngine::UpdateViews( EditView* pCurView ) @@ -710,7 +709,6 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ) } - // Search for line with InvalidPos, start one line before // Flag the line => do not remove it ! diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 6544d80e2f17..0abb8106031f 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -3107,7 +3107,6 @@ void ImpEditEngine::SetAddExtLeading( bool bExtLeading ) }; - bool ImpEditEngine::ImplHasText() const { return ( ( GetEditDoc().Count() > 1 ) || GetEditDoc().GetObject(0)->Len() ); diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx index 15f5618e1646..fd73733c8f12 100644 --- a/editeng/source/editeng/textconv.cxx +++ b/editeng/source/editeng/textconv.cxx @@ -40,7 +40,6 @@ using namespace com::sun::star::beans; using namespace com::sun::star::linguistic2; - TextConvWrapper::TextConvWrapper( vcl::Window* pWindow, const Reference< XComponentContext >& rxContext, const lang::Locale& rSourceLocale, @@ -554,5 +553,4 @@ bool TextConvWrapper::HasRubySupport() const } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx index ab1e9f852891..0c9f0c52b9d7 100644 --- a/editeng/source/items/borderline.cxx +++ b/editeng/source/items/borderline.cxx @@ -401,14 +401,12 @@ BorderWidthImpl SvxBorderLine::getWidthImpl( SvxBorderStyle nStyle ) } - SvxBorderLine::SvxBorderLine( const SvxBorderLine& r ) { *this = r; } - SvxBorderLine& SvxBorderLine::operator=( const SvxBorderLine& r ) { aColor = r.aColor; @@ -426,7 +424,6 @@ SvxBorderLine& SvxBorderLine::operator=( const SvxBorderLine& r ) } - void SvxBorderLine::ScaleMetrics( long nMult, long nDiv ) { m_nMult = nMult; @@ -536,7 +533,6 @@ sal_uInt16 SvxBorderLine::GetDistance() const } - bool SvxBorderLine::operator==( const SvxBorderLine& rCmp ) const { return ( ( aColor == rCmp.aColor ) && diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index 8599beab8005..ab3f87d323f6 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -29,10 +29,6 @@ #define BULITEM_VERSION ((sal_uInt16)2) - - - - void SvxBulletItem::StoreFont( SvStream& rStream, const vcl::Font& rFont ) { sal_uInt16 nTemp; @@ -59,7 +55,6 @@ void SvxBulletItem::StoreFont( SvStream& rStream, const vcl::Font& rFont ) } - vcl::Font SvxBulletItem::CreateFont( SvStream& rStream, sal_uInt16 nVer ) { vcl::Font aFont; @@ -98,8 +93,6 @@ vcl::Font SvxBulletItem::CreateFont( SvStream& rStream, sal_uInt16 nVer ) } - - SvxBulletItem::SvxBulletItem( sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich ) { SetDefaultFont_Impl(); @@ -177,28 +170,24 @@ SvxBulletItem::SvxBulletItem( const SvxBulletItem& rItem) : SfxPoolItem( rItem ) } - SvxBulletItem::~SvxBulletItem() { delete pGraphicObject; } - SfxPoolItem* SvxBulletItem::Clone( SfxItemPool * /*pPool*/ ) const { return new SvxBulletItem( *this ); } - SfxPoolItem* SvxBulletItem::Create( SvStream& rStrm, sal_uInt16 /*nVersion*/ ) const { return new SvxBulletItem( rStrm, Which() ); } - void SvxBulletItem::SetDefaultFont_Impl() { aFont = OutputDevice::GetDefaultFont( DefaultFontType::FIXED, LANGUAGE_SYSTEM, GetDefaultFontFlags::NONE ); @@ -207,7 +196,6 @@ void SvxBulletItem::SetDefaultFont_Impl() } - void SvxBulletItem::SetDefaults_Impl() { pGraphicObject = nullptr; @@ -219,14 +207,12 @@ void SvxBulletItem::SetDefaults_Impl() } - sal_uInt16 SvxBulletItem::GetVersion( sal_uInt16 /*nVersion*/ ) const { return BULITEM_VERSION; } - void SvxBulletItem::CopyValidProperties( const SvxBulletItem& rCopyFrom ) { vcl::Font _aFont = GetFont(); @@ -246,8 +232,6 @@ void SvxBulletItem::CopyValidProperties( const SvxBulletItem& rCopyFrom ) } - - bool SvxBulletItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT(dynamic_cast< const SvxBulletItem* >(&rItem) != nullptr,"operator==Types not matching"); @@ -283,7 +267,6 @@ bool SvxBulletItem::operator==( const SfxPoolItem& rItem ) const } - SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { // Correction for empty bitmap @@ -345,7 +328,6 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c } - OUString SvxBulletItem::GetFullText() const { OUStringBuffer aStr(aPrevText); @@ -355,7 +337,6 @@ OUString SvxBulletItem::GetFullText() const } - bool SvxBulletItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -369,7 +350,6 @@ bool SvxBulletItem::GetPresentation } - const GraphicObject& SvxBulletItem::GetGraphicObject() const { if( pGraphicObject ) @@ -382,7 +362,6 @@ const GraphicObject& SvxBulletItem::GetGraphicObject() const } - void SvxBulletItem::SetGraphicObject( const GraphicObject& rGraphicObject ) { if( ( GRAPHIC_NONE == rGraphicObject.GetType() ) || ( GRAPHIC_DEFAULT == rGraphicObject.GetType() ) ) diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index 6432cbbf41fb..a49f7c4489a7 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -224,26 +224,22 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe SV_IMPL_PERSIST1( SvxFieldData, SvPersistBase ); - SvxFieldData::SvxFieldData() { } - SvxFieldData::~SvxFieldData() { } - SvxFieldData* SvxFieldData::Clone() const { return new SvxFieldData; } - bool SvxFieldData::operator==( const SvxFieldData& rFld ) const { DBG_ASSERT( typeid(*this) == typeid(rFld), "==: Different Types" ); @@ -252,13 +248,11 @@ bool SvxFieldData::operator==( const SvxFieldData& rFld ) const } - void SvxFieldData::Load( SvPersistStream & /*rStm*/ ) { } - void SvxFieldData::Save( SvPersistStream & /*rStm*/ ) { } @@ -275,7 +269,6 @@ MetaAction* SvxFieldData::createEndComment() } - SvxFieldItem::SvxFieldItem( SvxFieldData* pFld, const sal_uInt16 nId ) : SfxPoolItem( nId ) { @@ -283,7 +276,6 @@ SvxFieldItem::SvxFieldItem( SvxFieldData* pFld, const sal_uInt16 nId ) : } - SvxFieldItem::SvxFieldItem( const SvxFieldData& rField, const sal_uInt16 nId ) : SfxPoolItem( nId ) { @@ -291,7 +283,6 @@ SvxFieldItem::SvxFieldItem( const SvxFieldData& rField, const sal_uInt16 nId ) : } - SvxFieldItem::SvxFieldItem( const SvxFieldItem& rItem ) : SfxPoolItem ( rItem ) { @@ -299,21 +290,18 @@ SvxFieldItem::SvxFieldItem( const SvxFieldItem& rItem ) : } - SvxFieldItem::~SvxFieldItem() { delete pField; } - SfxPoolItem* SvxFieldItem::Clone( SfxItemPool* ) const { return new SvxFieldItem(*this); } - SfxPoolItem* SvxFieldItem::Create( SvStream& rStrm, sal_uInt16 ) const { SvxFieldData* pData = nullptr; @@ -330,7 +318,6 @@ SfxPoolItem* SvxFieldItem::Create( SvStream& rStrm, sal_uInt16 ) const } - SvStream& SvxFieldItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { DBG_ASSERT( pField, "SvxFieldItem::Store: Field?!" ); @@ -351,7 +338,6 @@ SvStream& SvxFieldItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) co } - bool SvxFieldItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal which or type" ); @@ -372,7 +358,6 @@ bool SvxFieldItem::operator==( const SfxPoolItem& rItem ) const SV_IMPL_PERSIST1( SvxDateField, SvxFieldData ); - SvxDateField::SvxDateField() { nFixDate = Date( Date::SYSTEM ).GetDate(); @@ -381,7 +366,6 @@ SvxDateField::SvxDateField() } - SvxDateField::SvxDateField( const Date& rDate, SvxDateType eT, SvxDateFormat eF ) { nFixDate = rDate.GetDate(); @@ -390,14 +374,12 @@ SvxDateField::SvxDateField( const Date& rDate, SvxDateType eT, SvxDateFormat eF } - SvxFieldData* SvxDateField::Clone() const { return new SvxDateField( *this ); } - bool SvxDateField::operator==( const SvxFieldData& rOther ) const { if ( typeid(rOther) != typeid(*this) ) @@ -410,7 +392,6 @@ bool SvxDateField::operator==( const SvxFieldData& rOther ) const } - void SvxDateField::Load( SvPersistStream & rStm ) { sal_uInt16 nType, nFormat; @@ -424,7 +405,6 @@ void SvxDateField::Load( SvPersistStream & rStm ) } - void SvxDateField::Save( SvPersistStream & rStm ) { rStm.WriteUInt32( nFixDate ); @@ -433,7 +413,6 @@ void SvxDateField::Save( SvPersistStream & rStm ) } - OUString SvxDateField::GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLang ) const { Date aDate( Date::EMPTY ); @@ -513,14 +492,12 @@ MetaAction* SvxDateField::createBeginComment() const SV_IMPL_PERSIST1( SvxURLField, SvxFieldData ); - SvxURLField::SvxURLField() { eFormat = SVXURLFORMAT_URL; } - SvxURLField::SvxURLField( const OUString& rURL, const OUString& rRepres, SvxURLFormat eFmt ) : aURL( rURL ), aRepresentation( rRepres ) { @@ -528,14 +505,12 @@ SvxURLField::SvxURLField( const OUString& rURL, const OUString& rRepres, SvxURLF } - SvxFieldData* SvxURLField::Clone() const { return new SvxURLField( *this ); } - bool SvxURLField::operator==( const SvxFieldData& rOther ) const { if ( typeid(rOther) != typeid(*this) ) @@ -549,7 +524,6 @@ bool SvxURLField::operator==( const SvxFieldData& rOther ) const } - static void write_unicode( SvPersistStream & rStm, const OUString& rString ) { sal_uInt16 nL = sal::static_int_cast<sal_uInt16>(rString.getLength()); @@ -593,7 +567,6 @@ void SvxURLField::Load( SvPersistStream & rStm ) } - void SvxURLField::Save( SvPersistStream & rStm ) { rStm.WriteUInt16( eFormat ); @@ -788,7 +761,6 @@ void SvxTableField::Save( SvPersistStream & /*rStm*/ ) SV_IMPL_PERSIST1( SvxExtTimeField, SvxFieldData ); - SvxExtTimeField::SvxExtTimeField() : m_nFixTime( tools::Time(tools::Time::SYSTEM).GetTime() ) { @@ -797,7 +769,6 @@ SvxExtTimeField::SvxExtTimeField() } - SvxExtTimeField::SvxExtTimeField( const tools::Time& rTime, SvxTimeType eT, SvxTimeFormat eF ) : m_nFixTime( rTime.GetTime() ) { @@ -806,14 +777,12 @@ SvxExtTimeField::SvxExtTimeField( const tools::Time& rTime, SvxTimeType eT, SvxT } - SvxFieldData* SvxExtTimeField::Clone() const { return new SvxExtTimeField( *this ); } - bool SvxExtTimeField::operator==( const SvxFieldData& rOther ) const { if ( typeid(rOther) != typeid(*this) ) @@ -826,7 +795,6 @@ bool SvxExtTimeField::operator==( const SvxFieldData& rOther ) const } - void SvxExtTimeField::Load( SvPersistStream & rStm ) { sal_uInt16 nType, nFormat; @@ -840,7 +808,6 @@ void SvxExtTimeField::Load( SvPersistStream & rStm ) } - void SvxExtTimeField::Save( SvPersistStream & rStm ) { rStm.WriteInt64(m_nFixTime); @@ -849,7 +816,6 @@ void SvxExtTimeField::Save( SvPersistStream & rStm ) } - OUString SvxExtTimeField::GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLang ) const { tools::Time aTime( tools::Time::EMPTY ); @@ -933,7 +899,6 @@ MetaAction* SvxExtTimeField::createBeginComment() const SV_IMPL_PERSIST1( SvxExtFileField, SvxFieldData ); - SvxExtFileField::SvxExtFileField() { eType = SVXFILETYPE_VAR; @@ -941,7 +906,6 @@ SvxExtFileField::SvxExtFileField() } - SvxExtFileField::SvxExtFileField( const OUString& rStr, SvxFileType eT, SvxFileFormat eF ) { aFile = rStr; @@ -950,14 +914,12 @@ SvxExtFileField::SvxExtFileField( const OUString& rStr, SvxFileType eT, SvxFileF } - SvxFieldData* SvxExtFileField::Clone() const { return new SvxExtFileField( *this ); } - bool SvxExtFileField::operator==( const SvxFieldData& rOther ) const { if ( typeid(rOther) != typeid(*this) ) @@ -970,7 +932,6 @@ bool SvxExtFileField::operator==( const SvxFieldData& rOther ) const } - void SvxExtFileField::Load( SvPersistStream & rStm ) { sal_uInt16 nType, nFormat; @@ -986,7 +947,6 @@ void SvxExtFileField::Load( SvPersistStream & rStm ) } - void SvxExtFileField::Save( SvPersistStream & rStm ) { // UNICODE: rStm << aFile; @@ -997,7 +957,6 @@ void SvxExtFileField::Save( SvPersistStream & rStm ) } - OUString SvxExtFileField::GetFormatted() const { OUString aString; @@ -1080,7 +1039,6 @@ OUString SvxExtFileField::GetFormatted() const SV_IMPL_PERSIST1( SvxAuthorField, SvxFieldData ); - SvxAuthorField::SvxAuthorField() { eType = SVXAUTHORTYPE_VAR; @@ -1088,7 +1046,6 @@ SvxAuthorField::SvxAuthorField() } - SvxAuthorField::SvxAuthorField( const OUString& rFirstName, const OUString& rLastName, const OUString& rShortName, @@ -1102,14 +1059,12 @@ SvxAuthorField::SvxAuthorField( const OUString& rFirstName, } - SvxFieldData* SvxAuthorField::Clone() const { return new SvxAuthorField( *this ); } - bool SvxAuthorField::operator==( const SvxFieldData& rOther ) const { if ( typeid(rOther) != typeid(*this) ) @@ -1124,7 +1079,6 @@ bool SvxAuthorField::operator==( const SvxFieldData& rOther ) const } - void SvxAuthorField::Load( SvPersistStream & rStm ) { sal_uInt16 nType = 0, nFormat = 0; @@ -1141,7 +1095,6 @@ void SvxAuthorField::Load( SvPersistStream & rStm ) } - void SvxAuthorField::Save( SvPersistStream & rStm ) { write_unicode( rStm, aName ); @@ -1153,7 +1106,6 @@ void SvxAuthorField::Save( SvPersistStream & rStm ) } - OUString SvxAuthorField::GetFormatted() const { OUString aString; @@ -1201,7 +1153,6 @@ SvClassManager& SvxFieldItem::GetClassManager() } - SV_IMPL_PERSIST1( SvxHeaderField, SvxFieldData ); SvxHeaderField::SvxHeaderField() {} @@ -1225,7 +1176,6 @@ void SvxHeaderField::Save( SvPersistStream & /*rStm*/ ) } - SV_IMPL_PERSIST1( SvxFooterField, SvxFieldData ); SvxFooterField::SvxFooterField() {} @@ -1248,7 +1198,6 @@ void SvxFooterField::Save( SvPersistStream & /*rStm*/ ) } - SV_IMPL_PERSIST1( SvxDateTimeField, SvxFieldData ); SvxFieldData* SvxDateTimeField::Clone() const diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 46c74854f246..ee96b672e60f 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -1368,7 +1368,6 @@ bool SvxShadowItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } - bool SvxShadowItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -1380,14 +1379,12 @@ bool SvxShadowItem::operator==( const SfxPoolItem& rAttr ) const } - SfxPoolItem* SvxShadowItem::Clone( SfxItemPool* ) const { return new SvxShadowItem( *this ); } - sal_uInt16 SvxShadowItem::CalcShadowSpace( SvxShadowItemSide nShadow ) const { sal_uInt16 nSpace = 0; @@ -1425,7 +1422,6 @@ sal_uInt16 SvxShadowItem::CalcShadowSpace( SvxShadowItemSide nShadow ) const } - bool SvxShadowItem::GetPresentation ( SfxItemPresentation ePres, @@ -1475,7 +1471,6 @@ bool SvxShadowItem::GetPresentation } - SvStream& SvxShadowItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteSChar( GetLocation() ) @@ -1488,21 +1483,18 @@ SvStream& SvxShadowItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) } - void SvxShadowItem::ScaleMetrics( long nMult, long nDiv ) { nWidth = (sal_uInt16)Scale( nWidth, nMult, nDiv ); } - bool SvxShadowItem::HasMetrics() const { return true; } - SfxPoolItem* SvxShadowItem::Create( SvStream& rStrm, sal_uInt16 ) const { sal_Int8 cLoc; @@ -1520,14 +1512,12 @@ SfxPoolItem* SvxShadowItem::Create( SvStream& rStrm, sal_uInt16 ) const } - sal_uInt16 SvxShadowItem::GetValueCount() const { return SVX_SHADOW_END; // SVX_SHADOW_BOTTOMRIGHT + 1 } - OUString SvxShadowItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos < SVX_SHADOW_END, "enum overflow!" ); @@ -1535,14 +1525,12 @@ OUString SvxShadowItem::GetValueTextByPos( sal_uInt16 nPos ) const } - sal_uInt16 SvxShadowItem::GetEnumValue() const { return (sal_uInt16)GetLocation(); } - void SvxShadowItem::SetEnumValue( sal_uInt16 nVal ) { SetLocation( (const SvxShadowLocation)nVal ); @@ -1578,7 +1566,6 @@ SvxBoxItem::SvxBoxItem( const SvxBoxItem& rCpy ) : } - SvxBoxItem::SvxBoxItem( const sal_uInt16 nId ) : SfxPoolItem( nId ), @@ -1595,7 +1582,6 @@ SvxBoxItem::SvxBoxItem( const sal_uInt16 nId ) : } - SvxBoxItem::~SvxBoxItem() { delete pTop; @@ -1605,7 +1591,6 @@ SvxBoxItem::~SvxBoxItem() } - SvxBoxItem& SvxBoxItem::operator=( const SvxBoxItem& rBox ) { nTopDist = rBox.nTopDist; @@ -1621,7 +1606,6 @@ SvxBoxItem& SvxBoxItem::operator=( const SvxBoxItem& rBox ) } - inline bool CmpBrdLn( const SvxBorderLine* pBrd1, const SvxBorderLine* pBrd2 ) { if( pBrd1 == pBrd2 ) @@ -1632,7 +1616,6 @@ inline bool CmpBrdLn( const SvxBorderLine* pBrd1, const SvxBorderLine* pBrd2 ) } - bool SvxBoxItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -1796,7 +1779,6 @@ SvxBoxItem::LineToSvxLine(const css::table::BorderLine2& rLine, SvxBorderLine& r } - namespace { @@ -2035,14 +2017,12 @@ bool SvxBoxItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } - SfxPoolItem* SvxBoxItem::Clone( SfxItemPool* ) const { return new SvxBoxItem( *this ); } - bool SvxBoxItem::GetPresentation ( SfxItemPresentation ePres, @@ -2181,7 +2161,6 @@ bool SvxBoxItem::GetPresentation } - SvStream& SvxBoxItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const { rStrm.WriteUInt16( GetDistance() ); @@ -2223,7 +2202,6 @@ SvStream& SvxBoxItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const } - sal_uInt16 SvxBoxItem::GetVersion( sal_uInt16 nFFVer ) const { DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer || @@ -2235,7 +2213,6 @@ sal_uInt16 SvxBoxItem::GetVersion( sal_uInt16 nFFVer ) const } - void SvxBoxItem::ScaleMetrics( long nMult, long nDiv ) { if ( pTop ) pTop->ScaleMetrics( nMult, nDiv ); @@ -2249,14 +2226,12 @@ void SvxBoxItem::ScaleMetrics( long nMult, long nDiv ) } - bool SvxBoxItem::HasMetrics() const { return true; } - SfxPoolItem* SvxBoxItem::Create( SvStream& rStrm, sal_uInt16 nIVersion ) const { sal_uInt16 nDistance; @@ -2296,7 +2271,6 @@ SfxPoolItem* SvxBoxItem::Create( SvStream& rStrm, sal_uInt16 nIVersion ) const } - const SvxBorderLine *SvxBoxItem::GetLine( SvxBoxItemLine nLine ) const { const SvxBorderLine *pRet = nullptr; @@ -2324,7 +2298,6 @@ const SvxBorderLine *SvxBoxItem::GetLine( SvxBoxItemLine nLine ) const } - void SvxBoxItem::SetLine( const SvxBorderLine* pNew, SvxBoxItemLine nLine ) { SvxBorderLine* pTmp = pNew ? new SvxBorderLine( *pNew ) : nullptr; @@ -2354,7 +2327,6 @@ void SvxBoxItem::SetLine( const SvxBorderLine* pNew, SvxBoxItemLine nLine ) } - sal_uInt16 SvxBoxItem::GetDistance() const { // The smallest distance that is not 0 will be returned. @@ -2370,7 +2342,6 @@ sal_uInt16 SvxBoxItem::GetDistance() const } - sal_uInt16 SvxBoxItem::GetDistance( SvxBoxItemLine nLine ) const { sal_uInt16 nDist = 0; @@ -2396,7 +2367,6 @@ sal_uInt16 SvxBoxItem::GetDistance( SvxBoxItemLine nLine ) const } - void SvxBoxItem::SetDistance( sal_uInt16 nNew, SvxBoxItemLine nLine ) { switch ( nLine ) @@ -2419,7 +2389,6 @@ void SvxBoxItem::SetDistance( sal_uInt16 nNew, SvxBoxItemLine nLine ) } - sal_uInt16 SvxBoxItem::CalcLineSpace( SvxBoxItemLine nLine, bool bIgnoreLine ) const { SvxBorderLine* pTmp = nullptr; @@ -2470,7 +2439,6 @@ SvxBoxInfoItem::SvxBoxInfoItem( const sal_uInt16 nId ) : } - SvxBoxInfoItem::SvxBoxInfoItem( const SvxBoxInfoItem& rCpy ) : SfxPoolItem( rCpy ), mbEnableHor( rCpy.mbEnableHor ), @@ -2485,7 +2453,6 @@ SvxBoxInfoItem::SvxBoxInfoItem( const SvxBoxInfoItem& rCpy ) : } - SvxBoxInfoItem::~SvxBoxInfoItem() { delete pHori; @@ -2493,7 +2460,6 @@ SvxBoxInfoItem::~SvxBoxInfoItem() } - SvxBoxInfoItem &SvxBoxInfoItem::operator=( const SvxBoxInfoItem& rCpy ) { delete pHori; @@ -2510,7 +2476,6 @@ SvxBoxInfoItem &SvxBoxInfoItem::operator=( const SvxBoxInfoItem& rCpy ) } - bool SvxBoxInfoItem::operator==( const SfxPoolItem& rAttr ) const { const SvxBoxInfoItem& rBoxInfo = static_cast<const SvxBoxInfoItem&>(rAttr); @@ -2529,7 +2494,6 @@ bool SvxBoxInfoItem::operator==( const SfxPoolItem& rAttr ) const } - void SvxBoxInfoItem::SetLine( const SvxBorderLine* pNew, SvxBoxInfoItemLine nLine ) { SvxBorderLine* pTmp = pNew ? new SvxBorderLine( *pNew ) : nullptr; @@ -2552,14 +2516,12 @@ void SvxBoxInfoItem::SetLine( const SvxBorderLine* pNew, SvxBoxInfoItemLine nLin } - SfxPoolItem* SvxBoxInfoItem::Clone( SfxItemPool* ) const { return new SvxBoxInfoItem( *this ); } - bool SvxBoxInfoItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -2573,7 +2535,6 @@ bool SvxBoxInfoItem::GetPresentation } - SvStream& SvxBoxInfoItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { sal_Int8 cFlags = 0; @@ -2607,7 +2568,6 @@ SvStream& SvxBoxInfoItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) } - void SvxBoxInfoItem::ScaleMetrics( long nMult, long nDiv ) { if ( pHori ) pHori->ScaleMetrics( nMult, nDiv ); @@ -2616,14 +2576,12 @@ void SvxBoxInfoItem::ScaleMetrics( long nMult, long nDiv ) } - bool SvxBoxInfoItem::HasMetrics() const { return true; } - SfxPoolItem* SvxBoxInfoItem::Create( SvStream& rStrm, sal_uInt16 ) const { sal_Int8 cFlags; @@ -2660,7 +2618,6 @@ SfxPoolItem* SvxBoxInfoItem::Create( SvStream& rStrm, sal_uInt16 ) const } - void SvxBoxInfoItem::ResetFlags() { nValidFlags = static_cast<SvxBoxInfoItemValidFlags>(0x7F); // all valid except Disable @@ -2728,7 +2685,6 @@ bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const } - bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); @@ -2902,7 +2858,6 @@ bool SvxFormatBreakItem::operator==( const SfxPoolItem& rAttr ) const } - bool SvxFormatBreakItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -2916,7 +2871,6 @@ bool SvxFormatBreakItem::GetPresentation } - OUString SvxFormatBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos < SVX_BREAK_END, "enum overflow!" ); diff --git a/editeng/source/items/itemtype.cxx b/editeng/source/items/itemtype.cxx index c743afc58c46..dff82ee7ca44 100644 --- a/editeng/source/items/itemtype.cxx +++ b/editeng/source/items/itemtype.cxx @@ -26,7 +26,6 @@ #include <rtl/ustrbuf.hxx> - OUString GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, const IntlWrapper* pIntl ) { bool bNeg = false; @@ -129,14 +128,12 @@ OUString GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, co } - OUString GetSvxString( sal_uInt16 nId ) { return EE_RESSTR( nId ); } - OUString GetColorString( const Color& rCol ) { OUString sStr; @@ -171,7 +168,6 @@ OUString GetColorString( const Color& rCol ) } - sal_uInt16 GetMetricId( SfxMapUnit eUnit ) { sal_uInt16 nId = RID_SVXITEMS_METRIC_MM; diff --git a/editeng/source/items/justifyitem.cxx b/editeng/source/items/justifyitem.cxx index 32d50c745723..0aa568f3984a 100644 --- a/editeng/source/items/justifyitem.cxx +++ b/editeng/source/items/justifyitem.cxx @@ -31,14 +31,12 @@ #include <com/sun/star/style/VerticalAlignment.hpp> - SfxPoolItem* SvxHorJustifyItem::CreateDefault() { return new SvxHorJustifyItem(SVX_HOR_JUSTIFY_STANDARD, 0) ;} SfxPoolItem* SvxVerJustifyItem::CreateDefault() { return new SvxVerJustifyItem(SVX_VER_JUSTIFY_STANDARD, 0) ;} using namespace ::com::sun::star; - SvxHorJustifyItem::SvxHorJustifyItem( const sal_uInt16 nId ) : SfxEnumItem( nId, (sal_uInt16)SVX_HOR_JUSTIFY_STANDARD ) { diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx index 6677d8ea06a0..9feba60d5cda 100644 --- a/editeng/source/items/optitems.cxx +++ b/editeng/source/items/optitems.cxx @@ -42,7 +42,6 @@ SfxSpellCheckItem::SfxSpellCheckItem } - SfxSpellCheckItem::SfxSpellCheckItem( const SfxSpellCheckItem& rItem ) : SfxPoolItem( rItem ), @@ -51,7 +50,6 @@ SfxSpellCheckItem::SfxSpellCheckItem( const SfxSpellCheckItem& rItem ) : } - bool SfxSpellCheckItem::GetPresentation ( SfxItemPresentation , @@ -65,14 +63,12 @@ bool SfxSpellCheckItem::GetPresentation } - SfxPoolItem* SfxSpellCheckItem::Clone( SfxItemPool* ) const { return new SfxSpellCheckItem( *this ); } - bool SfxSpellCheckItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==(rItem), "unequal types" ); @@ -89,7 +85,6 @@ SfxHyphenRegionItem::SfxHyphenRegionItem( const sal_uInt16 nId ) : } - SfxHyphenRegionItem::SfxHyphenRegionItem( const SfxHyphenRegionItem& rItem ) : SfxPoolItem ( rItem ), @@ -100,7 +95,6 @@ SfxHyphenRegionItem::SfxHyphenRegionItem( const SfxHyphenRegionItem& rItem ) : } - bool SfxHyphenRegionItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -110,14 +104,12 @@ bool SfxHyphenRegionItem::operator==( const SfxPoolItem& rAttr ) const } - SfxPoolItem* SfxHyphenRegionItem::Clone( SfxItemPool* ) const { return new SfxHyphenRegionItem( *this ); } - bool SfxHyphenRegionItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -135,7 +127,6 @@ bool SfxHyphenRegionItem::GetPresentation } - SfxPoolItem* SfxHyphenRegionItem::Create(SvStream& rStrm, sal_uInt16 ) const { sal_uInt8 _nMinLead, _nMinTrail; @@ -147,7 +138,6 @@ SfxPoolItem* SfxHyphenRegionItem::Create(SvStream& rStrm, sal_uInt16 ) const } - SvStream& SfxHyphenRegionItem::Store( SvStream& rStrm, sal_uInt16 ) const { rStrm.WriteUChar( GetMinLead() ) diff --git a/editeng/source/items/paperinf.cxx b/editeng/source/items/paperinf.cxx index dd83f990647b..345bc6c8b61c 100644 --- a/editeng/source/items/paperinf.cxx +++ b/editeng/source/items/paperinf.cxx @@ -33,7 +33,6 @@ inline bool IsValidPrinter( const Printer* pPtr ) } - Size SvxPaperInfo::GetPaperSize( Paper ePaper, MapUnit eUnit ) { PaperInfo aInfo(ePaper); @@ -84,7 +83,6 @@ Size SvxPaperInfo::GetPaperSize( const Printer* pPrinter ) } - Paper SvxPaperInfo::GetSvxPaper( const Size &rSize, MapUnit eUnit, bool bSloppy ) { Size aSize(eUnit == MAP_100TH_MM ? rSize : OutputDevice::LogicToLogic(rSize, eUnit, MAP_100TH_MM)); @@ -95,7 +93,6 @@ Paper SvxPaperInfo::GetSvxPaper( const Size &rSize, MapUnit eUnit, bool bSloppy } - long SvxPaperInfo::GetSloppyPaperDimension( long nSize, MapUnit eUnit ) { nSize = eUnit == MAP_100TH_MM ? nSize : OutputDevice::LogicToLogic(nSize, eUnit, MAP_100TH_MM); @@ -104,7 +101,6 @@ long SvxPaperInfo::GetSloppyPaperDimension( long nSize, MapUnit eUnit ) } - Size SvxPaperInfo::GetDefaultPaperSize( MapUnit eUnit ) { PaperInfo aInfo(PaperInfo::getSystemDefaultPaper()); diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index 0b43f543bfde..6f5d4b52c295 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -79,7 +79,6 @@ SvxLineSpacingItem::SvxLineSpacingItem( sal_uInt16 nHeight, const sal_uInt16 nId } - bool SvxLineSpacingItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -212,14 +211,12 @@ bool SvxLineSpacingItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } - SfxPoolItem* SvxLineSpacingItem::Clone( SfxItemPool * ) const { return new SvxLineSpacingItem( *this ); } - bool SvxLineSpacingItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -237,7 +234,6 @@ bool SvxLineSpacingItem::GetPresentation } - SfxPoolItem* SvxLineSpacingItem::Create(SvStream& rStrm, sal_uInt16) const { sal_Int8 nPropSpace; @@ -260,7 +256,6 @@ SfxPoolItem* SvxLineSpacingItem::Create(SvStream& rStrm, sal_uInt16) const } - SvStream& SvxLineSpacingItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteSChar( GetPropLineSpace() ) @@ -272,14 +267,12 @@ SvStream& SvxLineSpacingItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion* } - sal_uInt16 SvxLineSpacingItem::GetValueCount() const { return SVX_LINESPACE_END; // SVX_LINESPACE_TWO_LINES + 1 } - OUString SvxLineSpacingItem::GetValueTextByPos( sal_uInt16 nPos ) const { //! load strings from resource @@ -303,7 +296,6 @@ OUString SvxLineSpacingItem::GetValueTextByPos( sal_uInt16 nPos ) const } - sal_uInt16 SvxLineSpacingItem::GetEnumValue() const { sal_uInt16 nVal; @@ -318,7 +310,6 @@ sal_uInt16 SvxLineSpacingItem::GetEnumValue() const } - void SvxLineSpacingItem::SetEnumValue( sal_uInt16 nVal ) { switch ( nVal ) @@ -339,7 +330,6 @@ SvxAdjustItem::SvxAdjustItem(const SvxAdjust eAdjst, const sal_uInt16 nId ) } - bool SvxAdjustItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -405,14 +395,12 @@ bool SvxAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } - SfxPoolItem* SvxAdjustItem::Clone( SfxItemPool * ) const { return new SvxAdjustItem( *this ); } - bool SvxAdjustItem::GetPresentation ( SfxItemPresentation ePres, @@ -433,14 +421,12 @@ bool SvxAdjustItem::GetPresentation } - sal_uInt16 SvxAdjustItem::GetValueCount() const { return SVX_ADJUST_END; // SVX_ADJUST_BLOCKLINE + 1 } - OUString SvxAdjustItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos <= (sal_uInt16)SVX_ADJUST_BLOCKLINE, "enum overflow!" ); @@ -448,21 +434,18 @@ OUString SvxAdjustItem::GetValueTextByPos( sal_uInt16 nPos ) const } - sal_uInt16 SvxAdjustItem::GetEnumValue() const { return (sal_uInt16)GetAdjust(); } - void SvxAdjustItem::SetEnumValue( sal_uInt16 nVal ) { SetAdjust( (const SvxAdjust)nVal ); } - sal_uInt16 SvxAdjustItem::GetVersion( sal_uInt16 nFileVersion ) const { return (nFileVersion == SOFFICE_FILEFORMAT_31) @@ -470,7 +453,6 @@ sal_uInt16 SvxAdjustItem::GetVersion( sal_uInt16 nFileVersion ) const } - SfxPoolItem* SvxAdjustItem::Create(SvStream& rStrm, sal_uInt16 nVersion) const { char eAdjustment; @@ -488,7 +470,6 @@ SfxPoolItem* SvxAdjustItem::Create(SvStream& rStrm, sal_uInt16 nVersion) const } - SvStream& SvxAdjustItem::Store( SvStream& rStrm, sal_uInt16 nItemVersion ) const { rStrm.WriteChar( (char)GetAdjust() ); @@ -514,14 +495,12 @@ SvxWidowsItem::SvxWidowsItem(const sal_uInt8 nL, const sal_uInt16 nId ) : } - SfxPoolItem* SvxWidowsItem::Clone( SfxItemPool * ) const { return new SvxWidowsItem( *this ); } - SfxPoolItem* SvxWidowsItem::Create(SvStream& rStrm, sal_uInt16) const { sal_Int8 nLines; @@ -530,7 +509,6 @@ SfxPoolItem* SvxWidowsItem::Create(SvStream& rStrm, sal_uInt16) const } - SvStream& SvxWidowsItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteSChar( GetValue() ); @@ -538,7 +516,6 @@ SvStream& SvxWidowsItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c } - bool SvxWidowsItem::GetPresentation ( SfxItemPresentation ePres, @@ -579,14 +556,12 @@ SvxOrphansItem::SvxOrphansItem(const sal_uInt8 nL, const sal_uInt16 nId ) : } - SfxPoolItem* SvxOrphansItem::Clone( SfxItemPool * ) const { return new SvxOrphansItem( *this ); } - SfxPoolItem* SvxOrphansItem::Create(SvStream& rStrm, sal_uInt16) const { sal_Int8 nLines; @@ -595,7 +570,6 @@ SfxPoolItem* SvxOrphansItem::Create(SvStream& rStrm, sal_uInt16) const } - SvStream& SvxOrphansItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteSChar( GetValue() ); @@ -603,7 +577,6 @@ SvStream& SvxOrphansItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) } - bool SvxOrphansItem::GetPresentation ( SfxItemPresentation ePres, @@ -697,7 +670,6 @@ bool SvxHyphenZoneItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } - bool SvxHyphenZoneItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -711,14 +683,12 @@ bool SvxHyphenZoneItem::operator==( const SfxPoolItem& rAttr ) const } - SfxPoolItem* SvxHyphenZoneItem::Clone( SfxItemPool * ) const { return new SvxHyphenZoneItem( *this ); } - bool SvxHyphenZoneItem::GetPresentation ( SfxItemPresentation ePres, @@ -774,7 +744,6 @@ bool SvxHyphenZoneItem::GetPresentation } - SfxPoolItem* SvxHyphenZoneItem::Create(SvStream& rStrm, sal_uInt16) const { sal_Int8 _bHyphen, _bHyphenPageEnd; @@ -790,7 +759,6 @@ SfxPoolItem* SvxHyphenZoneItem::Create(SvStream& rStrm, sal_uInt16) const } - SvStream& SvxHyphenZoneItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteSChar( (sal_Int8) IsHyphen() ) @@ -812,7 +780,6 @@ SvxTabStop::SvxTabStop() } - SvxTabStop::SvxTabStop( const sal_Int32 nPos, const SvxTabAdjust eAdjst, const sal_Unicode cDec, const sal_Unicode cFil ) { @@ -846,7 +813,6 @@ SvxTabStopItem::SvxTabStopItem( sal_uInt16 _nWhich ) : } - SvxTabStopItem::SvxTabStopItem( const sal_uInt16 nTabs, const sal_uInt16 nDist, const SvxTabAdjust eAdjst, @@ -862,7 +828,6 @@ SvxTabStopItem::SvxTabStopItem( const sal_uInt16 nTabs, } - SvxTabStopItem::SvxTabStopItem( const SvxTabStopItem& rTSI ) : SfxPoolItem( rTSI.Which() ), maTabStops( rTSI.maTabStops ) @@ -870,7 +835,6 @@ SvxTabStopItem::SvxTabStopItem( const SvxTabStopItem& rTSI ) : } - sal_uInt16 SvxTabStopItem::GetPos( const SvxTabStop& rTab ) const { SvxTabStopArr::const_iterator it = maTabStops.find( rTab ); @@ -878,7 +842,6 @@ sal_uInt16 SvxTabStopItem::GetPos( const SvxTabStop& rTab ) const } - sal_uInt16 SvxTabStopItem::GetPos( const sal_Int32 nPos ) const { SvxTabStopArr::const_iterator it = maTabStops.find( SvxTabStop( nPos ) ); @@ -886,7 +849,6 @@ sal_uInt16 SvxTabStopItem::GetPos( const sal_Int32 nPos ) const } - SvxTabStopItem& SvxTabStopItem::operator=( const SvxTabStopItem& rTSI ) { maTabStops = rTSI.maTabStops; @@ -1046,14 +1008,12 @@ bool SvxTabStopItem::operator==( const SfxPoolItem& rAttr ) const } - SfxPoolItem* SvxTabStopItem::Clone( SfxItemPool * ) const { return new SvxTabStopItem( *this ); } - bool SvxTabStopItem::GetPresentation ( SfxItemPresentation ePres, @@ -1085,7 +1045,6 @@ bool SvxTabStopItem::GetPresentation } - SfxPoolItem* SvxTabStopItem::Create( SvStream& rStrm, sal_uInt16 ) const { sal_Int8 nTabs; @@ -1107,7 +1066,6 @@ SfxPoolItem* SvxTabStopItem::Create( SvStream& rStrm, sal_uInt16 ) const } - SvStream& SvxTabStopItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { // Default-Tabs are only expanded for the default Attribute. For complete @@ -1189,7 +1147,6 @@ void SvxTabStopItem::Insert( const SvxTabStopItem* pTabs, sal_uInt16 nStart, } - // class SvxFormatSplitItem ------------------------------------------------- SvxFormatSplitItem::~SvxFormatSplitItem() { @@ -1201,7 +1158,6 @@ SfxPoolItem* SvxFormatSplitItem::Clone( SfxItemPool * ) const } - SvStream& SvxFormatSplitItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteSChar( (sal_Int8)GetValue() ); @@ -1209,7 +1165,6 @@ SvStream& SvxFormatSplitItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion* } - SfxPoolItem* SvxFormatSplitItem::Create( SvStream& rStrm, sal_uInt16 ) const { sal_Int8 bIsSplit; @@ -1218,7 +1173,6 @@ SfxPoolItem* SvxFormatSplitItem::Create( SvStream& rStrm, sal_uInt16 ) const } - bool SvxFormatSplitItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -1236,14 +1190,12 @@ bool SvxFormatSplitItem::GetPresentation } - SfxPoolItem* SvxPageModelItem::Clone( SfxItemPool* ) const { return new SvxPageModelItem( *this ); } - bool SvxPageModelItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; @@ -1311,7 +1263,6 @@ bool SvxPageModelItem::GetPresentation } - SvxScriptSpaceItem::SvxScriptSpaceItem( bool bOn, const sal_uInt16 nId ) : SfxBoolItem( nId, bOn ) { @@ -1351,7 +1302,6 @@ bool SvxScriptSpaceItem::GetPresentation( } - SvxHangingPunctuationItem::SvxHangingPunctuationItem( bool bOn, const sal_uInt16 nId ) : SfxBoolItem( nId, bOn ) diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 218cb2b6def9..ec4c7beabc3b 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -154,7 +154,6 @@ SvxFontListItem::SvxFontListItem( const FontList* pFontLst, } - SvxFontListItem::SvxFontListItem( const SvxFontListItem& rItem ) : SfxPoolItem( rItem ), @@ -164,14 +163,12 @@ SvxFontListItem::SvxFontListItem( const SvxFontListItem& rItem ) : } - SfxPoolItem* SvxFontListItem::Clone( SfxItemPool* ) const { return new SvxFontListItem( *this ); } - bool SvxFontListItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -186,7 +183,6 @@ bool SvxFontListItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) } - bool SvxFontListItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -210,7 +206,6 @@ SvxFontItem::SvxFontItem( const sal_uInt16 nId ) : } - SvxFontItem::SvxFontItem( const FontFamily eFam, const OUString& aName, const OUString& aStName, const FontPitch eFontPitch, const rtl_TextEncoding eFontTextEncoding, const sal_uInt16 nId ) : @@ -329,7 +324,6 @@ bool SvxFontItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId) } - bool SvxFontItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -352,14 +346,12 @@ bool SvxFontItem::operator==( const SfxPoolItem& rAttr ) const } - SfxPoolItem* SvxFontItem::Clone( SfxItemPool * ) const { return new SvxFontItem( *this ); } - SvStream& SvxFontItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { bool bToBats = IsStarSymbol( GetFamilyName() ); @@ -386,7 +378,6 @@ SvStream& SvxFontItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) co } - SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt8 _eFamily, eFontPitch, eFontTextEncoding; @@ -423,13 +414,11 @@ SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, sal_uInt16) const } - return new SvxFontItem( (FontFamily)_eFamily, aName, aStyle, (FontPitch)eFontPitch, (rtl_TextEncoding)eFontTextEncoding, Which() ); } - bool SvxFontItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -443,7 +432,6 @@ bool SvxFontItem::GetPresentation } - void SvxFontItem::EnableStoreUnicodeNames( bool bEnable ) { bEnableStoreUnicodeNames = bEnable; @@ -469,21 +457,18 @@ SvxPostureItem::SvxPostureItem( const FontItalic ePosture, const sal_uInt16 nId } - SfxPoolItem* SvxPostureItem::Clone( SfxItemPool * ) const { return new SvxPostureItem( *this ); } - sal_uInt16 SvxPostureItem::GetValueCount() const { return ITALIC_NORMAL + 1; // ITALIC_NONE also belongs here } - SvStream& SvxPostureItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteUChar( GetValue() ); @@ -491,7 +476,6 @@ SvStream& SvxPostureItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) } - SfxPoolItem* SvxPostureItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt8 nPosture; @@ -500,7 +484,6 @@ SfxPoolItem* SvxPostureItem::Create(SvStream& rStrm, sal_uInt16) const } - bool SvxPostureItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -514,7 +497,6 @@ bool SvxPostureItem::GetPresentation } - OUString SvxPostureItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos <= (sal_uInt16)ITALIC_NORMAL, "enum overflow!" ); @@ -580,14 +562,12 @@ bool SvxPostureItem::HasBoolValue() const } - bool SvxPostureItem::GetBoolValue() const { return ( (FontItalic)GetValue() >= ITALIC_OBLIQUE ); } - void SvxPostureItem::SetBoolValue( bool bVal ) { SetValue( (sal_uInt16)(bVal ? ITALIC_NORMAL : ITALIC_NONE) ); @@ -610,44 +590,36 @@ SvxWeightItem::SvxWeightItem( const FontWeight eWght, const sal_uInt16 nId ) : } - - - bool SvxWeightItem::HasBoolValue() const { return true; } - bool SvxWeightItem::GetBoolValue() const { return (FontWeight)GetValue() >= WEIGHT_BOLD; } - void SvxWeightItem::SetBoolValue( bool bVal ) { SetValue( (sal_uInt16)(bVal ? WEIGHT_BOLD : WEIGHT_NORMAL) ); } - sal_uInt16 SvxWeightItem::GetValueCount() const { return WEIGHT_BLACK; // WEIGHT_DONTKNOW does not belong } - SfxPoolItem* SvxWeightItem::Clone( SfxItemPool * ) const { return new SvxWeightItem( *this ); } - SvStream& SvxWeightItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteUChar( GetValue() ); @@ -655,7 +627,6 @@ SvStream& SvxWeightItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) } - SfxPoolItem* SvxWeightItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt8 nWeight; @@ -664,7 +635,6 @@ SfxPoolItem* SvxWeightItem::Create(SvStream& rStrm, sal_uInt16) const } - bool SvxWeightItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -678,7 +648,6 @@ bool SvxWeightItem::GetPresentation } - OUString SvxWeightItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos <= (sal_uInt16)WEIGHT_BLACK, "enum overflow!" ); @@ -747,14 +716,12 @@ SvxFontHeightItem::SvxFontHeightItem( const sal_uLong nSz, } - SfxPoolItem* SvxFontHeightItem::Clone( SfxItemPool * ) const { return new SvxFontHeightItem( *this ); } - SvStream& SvxFontHeightItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const { rStrm.WriteUInt16( GetHeight() ); @@ -774,7 +741,6 @@ SvStream& SvxFontHeightItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) } - SfxPoolItem* SvxFontHeightItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const { @@ -800,7 +766,6 @@ SfxPoolItem* SvxFontHeightItem::Create( SvStream& rStrm, } - bool SvxFontHeightItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); @@ -1033,7 +998,6 @@ bool SvxFontHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } - bool SvxFontHeightItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -1061,7 +1025,6 @@ bool SvxFontHeightItem::GetPresentation } - sal_uInt16 SvxFontHeightItem::GetVersion(sal_uInt16 nFileVersion) const { return (nFileVersion <= SOFFICE_FILEFORMAT_40) @@ -1070,14 +1033,12 @@ sal_uInt16 SvxFontHeightItem::GetVersion(sal_uInt16 nFileVersion) const } - void SvxFontHeightItem::ScaleMetrics( long nMult, long nDiv ) { nHeight = (sal_uInt32)Scale( nHeight, nMult, nDiv ); } - bool SvxFontHeightItem::HasMetrics() const { return true; @@ -1139,14 +1100,12 @@ SvxFontWidthItem::SvxFontWidthItem( const sal_uInt16 nSz, const sal_uInt16 nPrp, } - SfxPoolItem* SvxFontWidthItem::Clone( SfxItemPool * ) const { return new SvxFontWidthItem( *this ); } - SvStream& SvxFontWidthItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteUInt16( GetWidth() ).WriteUInt16( GetProp() ); @@ -1154,21 +1113,18 @@ SvStream& SvxFontWidthItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ } - void SvxFontWidthItem::ScaleMetrics( long nMult, long nDiv ) { nWidth = (sal_uInt16)Scale( nWidth, nMult, nDiv ); } - bool SvxFontWidthItem::HasMetrics() const { return true; } - SfxPoolItem* SvxFontWidthItem::Create( SvStream& rStrm, sal_uInt16 /*nVersion*/ ) const { @@ -1183,7 +1139,6 @@ SfxPoolItem* SvxFontWidthItem::Create( SvStream& rStrm, } - bool SvxFontWidthItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); @@ -1228,7 +1183,6 @@ bool SvxFontWidthItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } - bool SvxFontWidthItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -1256,28 +1210,24 @@ SvxTextLineItem::SvxTextLineItem( const FontLineStyle eSt, const sal_uInt16 nId } - bool SvxTextLineItem::HasBoolValue() const { return true; } - bool SvxTextLineItem::GetBoolValue() const { return (FontLineStyle)GetValue() != LINESTYLE_NONE; } - void SvxTextLineItem::SetBoolValue( bool bVal ) { SetValue( (sal_uInt16)(bVal ? LINESTYLE_SINGLE : LINESTYLE_NONE) ); } - SfxPoolItem* SvxTextLineItem::Clone( SfxItemPool * ) const { SvxTextLineItem* pNew = new SvxTextLineItem( *this ); @@ -1286,14 +1236,12 @@ SfxPoolItem* SvxTextLineItem::Clone( SfxItemPool * ) const } - sal_uInt16 SvxTextLineItem::GetValueCount() const { return LINESTYLE_DOTTED + 1; // LINESTYLE_NONE also belongs here } - SvStream& SvxTextLineItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteUChar( GetValue() ); @@ -1301,7 +1249,6 @@ SvStream& SvxTextLineItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ } - SfxPoolItem* SvxTextLineItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt8 nState; @@ -1310,7 +1257,6 @@ SfxPoolItem* SvxTextLineItem::Create(SvStream& rStrm, sal_uInt16) const } - bool SvxTextLineItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -1326,7 +1272,6 @@ bool SvxTextLineItem::GetPresentation } - OUString SvxTextLineItem::GetValueTextByPos( sal_uInt16 /*nPos*/ ) const { OSL_FAIL("SvxTextLineItem::GetValueTextByPos: Pure virtual method"); @@ -1410,7 +1355,6 @@ SvxUnderlineItem::SvxUnderlineItem( const FontLineStyle eSt, const sal_uInt16 nI } - SfxPoolItem* SvxUnderlineItem::Clone( SfxItemPool * ) const { SvxUnderlineItem* pNew = new SvxUnderlineItem( *this ); @@ -1419,7 +1363,6 @@ SfxPoolItem* SvxUnderlineItem::Clone( SfxItemPool * ) const } - SfxPoolItem* SvxUnderlineItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt8 nState; @@ -1428,7 +1371,6 @@ SfxPoolItem* SvxUnderlineItem::Create(SvStream& rStrm, sal_uInt16) const } - OUString SvxUnderlineItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos <= (sal_uInt16)LINESTYLE_BOLDWAVE, "enum overflow!" ); @@ -1443,7 +1385,6 @@ SvxOverlineItem::SvxOverlineItem( const FontLineStyle eSt, const sal_uInt16 nId } - SfxPoolItem* SvxOverlineItem::Clone( SfxItemPool * ) const { SvxOverlineItem* pNew = new SvxOverlineItem( *this ); @@ -1452,7 +1393,6 @@ SfxPoolItem* SvxOverlineItem::Clone( SfxItemPool * ) const } - SfxPoolItem* SvxOverlineItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt8 nState; @@ -1461,7 +1401,6 @@ SfxPoolItem* SvxOverlineItem::Create(SvStream& rStrm, sal_uInt16) const } - OUString SvxOverlineItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos <= (sal_uInt16)LINESTYLE_BOLDWAVE, "enum overflow!" ); @@ -1476,42 +1415,36 @@ SvxCrossedOutItem::SvxCrossedOutItem( const FontStrikeout eSt, const sal_uInt16 } - bool SvxCrossedOutItem::HasBoolValue() const { return true; } - bool SvxCrossedOutItem::GetBoolValue() const { return (FontStrikeout)GetValue() != STRIKEOUT_NONE; } - void SvxCrossedOutItem::SetBoolValue( bool bVal ) { SetValue( (sal_uInt16)(bVal ? STRIKEOUT_SINGLE : STRIKEOUT_NONE) ); } - sal_uInt16 SvxCrossedOutItem::GetValueCount() const { return STRIKEOUT_DOUBLE + 1; // STRIKEOUT_NONE belongs also here } - SfxPoolItem* SvxCrossedOutItem::Clone( SfxItemPool * ) const { return new SvxCrossedOutItem( *this ); } - SvStream& SvxCrossedOutItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteUChar( GetValue() ); @@ -1519,7 +1452,6 @@ SvStream& SvxCrossedOutItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion* } - SfxPoolItem* SvxCrossedOutItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt8 eCross; @@ -1528,7 +1460,6 @@ SfxPoolItem* SvxCrossedOutItem::Create(SvStream& rStrm, sal_uInt16) const } - bool SvxCrossedOutItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -1542,7 +1473,6 @@ bool SvxCrossedOutItem::GetPresentation } - OUString SvxCrossedOutItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos <= (sal_uInt16)STRIKEOUT_X, "enum overflow!" ); @@ -1591,14 +1521,12 @@ SvxShadowedItem::SvxShadowedItem( const bool bShadowed, const sal_uInt16 nId ) : } - SfxPoolItem* SvxShadowedItem::Clone( SfxItemPool * ) const { return new SvxShadowedItem( *this ); } - SvStream& SvxShadowedItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteBool( GetValue() ); @@ -1606,7 +1534,6 @@ SvStream& SvxShadowedItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ } - SfxPoolItem* SvxShadowedItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt8 nState; @@ -1615,7 +1542,6 @@ SfxPoolItem* SvxShadowedItem::Create(SvStream& rStrm, sal_uInt16) const } - bool SvxShadowedItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -1640,14 +1566,12 @@ SvxAutoKernItem::SvxAutoKernItem( const bool bAutoKern, const sal_uInt16 nId ) : } - SfxPoolItem* SvxAutoKernItem::Clone( SfxItemPool * ) const { return new SvxAutoKernItem( *this ); } - SvStream& SvxAutoKernItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteBool( GetValue() ); @@ -1655,7 +1579,6 @@ SvStream& SvxAutoKernItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ } - SfxPoolItem* SvxAutoKernItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt8 nState; @@ -1664,7 +1587,6 @@ SfxPoolItem* SvxAutoKernItem::Create(SvStream& rStrm, sal_uInt16) const } - bool SvxAutoKernItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -1690,14 +1612,12 @@ SvxWordLineModeItem::SvxWordLineModeItem( const bool bWordLineMode, } - SfxPoolItem* SvxWordLineModeItem::Clone( SfxItemPool * ) const { return new SvxWordLineModeItem( *this ); } - SvStream& SvxWordLineModeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteBool( GetValue() ); @@ -1705,7 +1625,6 @@ SvStream& SvxWordLineModeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersio } - SfxPoolItem* SvxWordLineModeItem::Create(SvStream& rStrm, sal_uInt16) const { bool bValue; @@ -1714,7 +1633,6 @@ SfxPoolItem* SvxWordLineModeItem::Create(SvStream& rStrm, sal_uInt16) const } - bool SvxWordLineModeItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -1739,14 +1657,12 @@ SvxContourItem::SvxContourItem( const bool bContoured, const sal_uInt16 nId ) : } - SfxPoolItem* SvxContourItem::Clone( SfxItemPool * ) const { return new SvxContourItem( *this ); } - SvStream& SvxContourItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteBool( GetValue() ); @@ -1754,7 +1670,6 @@ SvStream& SvxContourItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) } - SfxPoolItem* SvxContourItem::Create(SvStream& rStrm, sal_uInt16) const { bool bValue; @@ -1763,7 +1678,6 @@ SfxPoolItem* SvxContourItem::Create(SvStream& rStrm, sal_uInt16) const } - bool SvxContourItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -1788,14 +1702,12 @@ SvxPropSizeItem::SvxPropSizeItem( const sal_uInt16 nPercent, const sal_uInt16 nI } - SfxPoolItem* SvxPropSizeItem::Clone( SfxItemPool * ) const { return new SvxPropSizeItem( *this ); } - SvStream& SvxPropSizeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteUInt16( GetValue() ); @@ -1803,7 +1715,6 @@ SvStream& SvxPropSizeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ } - SfxPoolItem* SvxPropSizeItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt16 nSize; @@ -1812,7 +1723,6 @@ SfxPoolItem* SvxPropSizeItem::Create(SvStream& rStrm, sal_uInt16) const } - bool SvxPropSizeItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -1833,7 +1743,6 @@ SvxBackgroundColorItem::SvxBackgroundColorItem( const sal_uInt16 nId ) : } - SvxBackgroundColorItem::SvxBackgroundColorItem( const Color& rCol, const sal_uInt16 nId ) : SvxColorItem( rCol, nId ) @@ -2011,7 +1920,6 @@ bool SvxColorItem::GetPresentation } - void SvxColorItem::SetValue( const Color& rNewCol ) { mColor = rNewCol; @@ -2027,7 +1935,6 @@ SvxCharSetColorItem::SvxCharSetColorItem( const sal_uInt16 nId ) : } - SvxCharSetColorItem::SvxCharSetColorItem( const Color& rCol, const rtl_TextEncoding _eFrom, const sal_uInt16 nId ) : @@ -2038,15 +1945,12 @@ SvxCharSetColorItem::SvxCharSetColorItem( const Color& rCol, } - - SfxPoolItem* SvxCharSetColorItem::Clone( SfxItemPool * ) const { return new SvxCharSetColorItem( *this ); } - SvStream& SvxCharSetColorItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteUChar( GetSOStoreTextEncoding(GetCharSet()) ); @@ -2055,7 +1959,6 @@ SvStream& SvxCharSetColorItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersio } - SfxPoolItem* SvxCharSetColorItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt8 cSet; @@ -2066,7 +1969,6 @@ SfxPoolItem* SvxCharSetColorItem::Create(SvStream& rStrm, sal_uInt16) const } - bool SvxCharSetColorItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -2087,14 +1989,12 @@ SvxKerningItem::SvxKerningItem( const short nKern, const sal_uInt16 nId ) : } - SfxPoolItem* SvxKerningItem::Clone( SfxItemPool * ) const { return new SvxKerningItem( *this ); } - SvStream& SvxKerningItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteInt16( GetValue() ); @@ -2102,21 +2002,18 @@ SvStream& SvxKerningItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) } - void SvxKerningItem::ScaleMetrics( long nMult, long nDiv ) { SetValue( (sal_Int16)Scale( GetValue(), nMult, nDiv ) ); } - bool SvxKerningItem::HasMetrics() const { return true; } - SfxPoolItem* SvxKerningItem::Create(SvStream& rStrm, sal_uInt16) const { short nValue; @@ -2125,7 +2022,6 @@ SfxPoolItem* SvxKerningItem::Create(SvStream& rStrm, sal_uInt16) const } - bool SvxKerningItem::GetPresentation ( SfxItemPresentation ePres, @@ -2190,21 +2086,18 @@ SvxCaseMapItem::SvxCaseMapItem( const SvxCaseMap eMap, const sal_uInt16 nId ) : } - sal_uInt16 SvxCaseMapItem::GetValueCount() const { return SVX_CASEMAP_END; // SVX_CASEMAP_KAPITAELCHEN + 1 } - SfxPoolItem* SvxCaseMapItem::Clone( SfxItemPool * ) const { return new SvxCaseMapItem( *this ); } - SvStream& SvxCaseMapItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteUChar( GetValue() ); @@ -2212,7 +2105,6 @@ SvStream& SvxCaseMapItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) } - SfxPoolItem* SvxCaseMapItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt8 cMap; @@ -2221,7 +2113,6 @@ SfxPoolItem* SvxCaseMapItem::Create(SvStream& rStrm, sal_uInt16) const } - bool SvxCaseMapItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -2235,7 +2126,6 @@ bool SvxCaseMapItem::GetPresentation } - OUString SvxCaseMapItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos < (sal_uInt16)SVX_CASEMAP_END, "enum overflow!" ); @@ -2285,7 +2175,6 @@ SvxEscapementItem::SvxEscapementItem( const sal_uInt16 nId ) : } - SvxEscapementItem::SvxEscapementItem( const SvxEscapement eEscape, const sal_uInt16 nId ) : SfxEnumItemInterface( nId ), @@ -2297,7 +2186,6 @@ SvxEscapementItem::SvxEscapementItem( const SvxEscapement eEscape, } - SvxEscapementItem::SvxEscapementItem( const short _nEsc, const sal_uInt8 _nProp, const sal_uInt16 nId ) : @@ -2308,7 +2196,6 @@ SvxEscapementItem::SvxEscapementItem( const short _nEsc, } - bool SvxEscapementItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -2318,14 +2205,12 @@ bool SvxEscapementItem::operator==( const SfxPoolItem& rAttr ) const } - SfxPoolItem* SvxEscapementItem::Clone( SfxItemPool * ) const { return new SvxEscapementItem( *this ); } - SvStream& SvxEscapementItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { short _nEsc = GetEsc(); @@ -2342,7 +2227,6 @@ SvStream& SvxEscapementItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion* } - SfxPoolItem* SvxEscapementItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt8 _nProp; @@ -2352,14 +2236,12 @@ SfxPoolItem* SvxEscapementItem::Create(SvStream& rStrm, sal_uInt16) const } - sal_uInt16 SvxEscapementItem::GetValueCount() const { return SVX_ESCAPEMENT_END; // SVX_ESCAPEMENT_SUBSCRIPT + 1 } - bool SvxEscapementItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -2381,7 +2263,6 @@ bool SvxEscapementItem::GetPresentation } - OUString SvxEscapementItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos < (sal_uInt16)SVX_ESCAPEMENT_END, "enum overflow!" ); @@ -2389,7 +2270,6 @@ OUString SvxEscapementItem::GetValueTextByPos( sal_uInt16 nPos ) const } - sal_uInt16 SvxEscapementItem::GetEnumValue() const { if ( nEsc < 0 ) @@ -2400,7 +2280,6 @@ sal_uInt16 SvxEscapementItem::GetEnumValue() const } - void SvxEscapementItem::SetEnumValue( sal_uInt16 nVal ) { SetEscapement( (const SvxEscapement)nVal ); @@ -2476,7 +2355,6 @@ SvxLanguageItem::SvxLanguageItem( const LanguageType eLang, const sal_uInt16 nId } - sal_uInt16 SvxLanguageItem::GetValueCount() const { // #i50205# got rid of class International @@ -2487,14 +2365,12 @@ sal_uInt16 SvxLanguageItem::GetValueCount() const } - SfxPoolItem* SvxLanguageItem::Clone( SfxItemPool * ) const { return new SvxLanguageItem( *this ); } - SvStream& SvxLanguageItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteUInt16( GetValue() ); @@ -2502,7 +2378,6 @@ SvStream& SvxLanguageItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ } - SfxPoolItem* SvxLanguageItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt16 nValue; @@ -2511,7 +2386,6 @@ SfxPoolItem* SvxLanguageItem::Create(SvStream& rStrm, sal_uInt16) const } - bool SvxLanguageItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -2574,14 +2448,12 @@ SvxNoLinebreakItem::SvxNoLinebreakItem( const bool bBreak, const sal_uInt16 nId } - SfxPoolItem* SvxNoLinebreakItem::Clone( SfxItemPool* ) const { return new SvxNoLinebreakItem( *this ); } - SvStream& SvxNoLinebreakItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteBool( GetValue() ); @@ -2589,7 +2461,6 @@ SvStream& SvxNoLinebreakItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion } - SfxPoolItem* SvxNoLinebreakItem::Create(SvStream& rStrm, sal_uInt16) const { bool bValue; @@ -2598,7 +2469,6 @@ SfxPoolItem* SvxNoLinebreakItem::Create(SvStream& rStrm, sal_uInt16) const } - bool SvxNoLinebreakItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -2619,14 +2489,12 @@ SvxNoHyphenItem::SvxNoHyphenItem( const bool bHyphen, const sal_uInt16 nId ) : } - SfxPoolItem* SvxNoHyphenItem::Clone( SfxItemPool* ) const { return new SvxNoHyphenItem( *this ); } - SvStream& SvxNoHyphenItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteBool( GetValue() ); @@ -2634,7 +2502,6 @@ SvStream& SvxNoHyphenItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ } - SfxPoolItem* SvxNoHyphenItem::Create( SvStream& rStrm, sal_uInt16 ) const { bool bValue; @@ -2643,7 +2510,6 @@ SfxPoolItem* SvxNoHyphenItem::Create( SvStream& rStrm, sal_uInt16 ) const } - bool SvxNoHyphenItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -2671,20 +2537,17 @@ SvxLineColorItem::SvxLineColorItem( const sal_uInt16 nId ) : } - SvxLineColorItem::SvxLineColorItem( const SvxLineColorItem &rCopy ) : SvxColorItem( rCopy ) { } - SvxLineColorItem::~SvxLineColorItem() { } - bool SvxLineColorItem::GetPresentation ( SfxItemPresentation ePres, @@ -2707,14 +2570,12 @@ SvxBlinkItem::SvxBlinkItem( const bool bBlink, const sal_uInt16 nId ) : } - SfxPoolItem* SvxBlinkItem::Clone( SfxItemPool * ) const { return new SvxBlinkItem( *this ); } - SvStream& SvxBlinkItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteBool( GetValue() ); @@ -2722,7 +2583,6 @@ SvStream& SvxBlinkItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) c } - SfxPoolItem* SvxBlinkItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt8 nState; @@ -2731,7 +2591,6 @@ SfxPoolItem* SvxBlinkItem::Create(SvStream& rStrm, sal_uInt16) const } - bool SvxBlinkItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -2757,14 +2616,12 @@ SvxEmphasisMarkItem::SvxEmphasisMarkItem( const FontEmphasisMark nValue, } - SfxPoolItem* SvxEmphasisMarkItem::Clone( SfxItemPool * ) const { return new SvxEmphasisMarkItem( *this ); } - SvStream& SvxEmphasisMarkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { @@ -2773,7 +2630,6 @@ SvStream& SvxEmphasisMarkItem::Store( SvStream& rStrm, } - SfxPoolItem* SvxEmphasisMarkItem::Create( SvStream& rStrm, sal_uInt16 ) const { sal_uInt16 nValue; @@ -2782,7 +2638,6 @@ SfxPoolItem* SvxEmphasisMarkItem::Create( SvStream& rStrm, sal_uInt16 ) const } - bool SvxEmphasisMarkItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -2806,7 +2661,6 @@ bool SvxEmphasisMarkItem::GetPresentation } - bool SvxEmphasisMarkItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx index a5c271326f23..86c260a559bb 100644 --- a/editeng/source/items/writingmodeitem.cxx +++ b/editeng/source/items/writingmodeitem.cxx @@ -25,7 +25,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; - SfxPoolItem* SvxWritingModeItem::CreateDefault() { return new SvxWritingModeItem(css::text::WritingMode_LR_TB, 0);} SvxWritingModeItem::SvxWritingModeItem( WritingMode eValue, sal_uInt16 _nWhich ) diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx index 1b100b55dde7..0fe0bcedd360 100644 --- a/editeng/source/items/xmlcnitm.cxx +++ b/editeng/source/items/xmlcnitm.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::xml; - SvXMLAttrContainerItem::SvXMLAttrContainerItem( sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich ) { diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx index 9ea4d8e6db7d..8881c08dc095 100644 --- a/editeng/source/misc/splwrap.cxx +++ b/editeng/source/misc/splwrap.cxx @@ -164,7 +164,6 @@ SvxSpellWrapper::SvxSpellWrapper( vcl::Window* pWn, } - SvxSpellWrapper::SvxSpellWrapper( vcl::Window* pWn, Reference< XHyphenator > &xHyphenator, const bool bStart, const bool bOther ) : @@ -184,7 +183,6 @@ SvxSpellWrapper::SvxSpellWrapper( vcl::Window* pWn, } - sal_Int16 SvxSpellWrapper::CheckSpellLang( Reference< XSpellChecker1 > xSpell, sal_Int16 nLang) { @@ -236,31 +234,23 @@ sal_Int16 SvxSpellWrapper::CheckHyphLang( } - - void SvxSpellWrapper::SpellStart( SvxSpellArea /*eSpell*/ ) { // Here, the necessary preparations be made for SpellContinue in the } // given area. - - bool SvxSpellWrapper::HasOtherCnt() { return false; // Is there a special area? } - - bool SvxSpellWrapper::SpellMore() { return false; // Should additional documents be examined? } - - void SvxSpellWrapper::SpellEnd() { // Area is complete, tidy up if necessary @@ -409,7 +399,6 @@ bool SvxSpellWrapper::SpellNext( ) } - Reference< XDictionary > SvxSpellWrapper::GetAllRightDic() { Reference< XDictionary > xDic; @@ -453,7 +442,6 @@ Reference< XDictionary > SvxSpellWrapper::GetAllRightDic() } - bool SvxSpellWrapper::FindSpellError() { ShowLanguageErrors(); @@ -512,5 +500,4 @@ bool SvxSpellWrapper::FindSpellError() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx index 6240c0f2d1b2..25740cf1611e 100644 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx @@ -48,7 +48,6 @@ using namespace ::com::sun::star; - OutlinerView::OutlinerView( Outliner* pOut, vcl::Window* pWin ) { pOwner = pOut; @@ -671,7 +670,6 @@ void OutlinerView::InsertText( const OutlinerParaObject& rParaObj ) } - void OutlinerView::Cut() { if ( !ImpCalcSelectedPages( false ) || pOwner->ImpCanDeleteSelectedPages( this ) ) { @@ -1195,12 +1193,9 @@ void OutlinerView::RemoveAttribs( bool bRemoveParaAttribs, sal_uInt16 nWhich, bo } - - // ====================== Simple pass-through ======================= - void OutlinerView::InsertText( const OUString& rNew, bool bSelect ) { if( pOwner->bFirstParaIsEmpty ) diff --git a/editeng/source/outliner/overflowingtxt.cxx b/editeng/source/outliner/overflowingtxt.cxx index ac88a3e4e966..fd565a4df953 100644 --- a/editeng/source/outliner/overflowingtxt.cxx +++ b/editeng/source/outliner/overflowingtxt.cxx @@ -64,7 +64,6 @@ OutlinerParaObject *TextChainingUtils::JuxtaposeParaObject( } - return pOutl->CreateParaObject(); } diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx index 54ba22c91cc4..56ac073e79c2 100644 --- a/editeng/source/rtf/rtfitem.cxx +++ b/editeng/source/rtf/rtfitem.cxx @@ -200,7 +200,6 @@ void SvxRTFParser::SetScriptAttr( RTF_CharTypeDef eType, SfxItemSet& rSet, } - void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet ) { DBG_ASSERT( pSet, "A SfxItemSet has to be provided as argument!" ); diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx index ada29d736e07..3d83bf8fa7c4 100644 --- a/editeng/source/uno/unoedprx.cxx +++ b/editeng/source/uno/unoedprx.cxx @@ -18,12 +18,9 @@ */ - - // Global header - #include <limits.h> #include <utility> #include <vector> @@ -35,7 +32,6 @@ #include <com/sun/star/uno/Reference.hxx> - // Project-local header @@ -300,7 +296,6 @@ bool SvxAccessibleTextIndex::IsEditableRange( const SvxAccessibleTextIndex& rEnd } - SvxEditSourceAdapter::SvxEditSourceAdapter() : mbEditSourceValid( false ) { } diff --git a/editeng/source/uno/unoedsrc.cxx b/editeng/source/uno/unoedsrc.cxx index f638ecd23ced..4e48ffa1d10b 100644 --- a/editeng/source/uno/unoedsrc.cxx +++ b/editeng/source/uno/unoedsrc.cxx @@ -29,13 +29,11 @@ void SvxEditSource::addRange( SvxUnoTextRangeBase* ) } - void SvxEditSource::removeRange( SvxUnoTextRangeBase* ) { } - const SvxUnoTextRangeBaseList& SvxEditSource::getRanges() const { static SvxUnoTextRangeBaseList gList; @@ -43,19 +41,16 @@ const SvxUnoTextRangeBaseList& SvxEditSource::getRanges() const } - SvxTextForwarder::~SvxTextForwarder() { } - SvxViewForwarder::~SvxViewForwarder() { } - SvxEditSource::~SvxEditSource() { } diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx index cf387b1bce88..69d08901322f 100644 --- a/editeng/source/uno/unofdesc.cxx +++ b/editeng/source/uno/unofdesc.cxx @@ -227,5 +227,4 @@ uno::Any SvxUnoFontDescriptor::getPropertyDefault( SfxItemPool* pPool ) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx index b3ab33dcad53..793f979a55fa 100644 --- a/editeng/source/uno/unofored.cxx +++ b/editeng/source/uno/unofored.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star; - SvxEditEngineForwarder::SvxEditEngineForwarder( EditEngine& rEngine ) : rEditEngine( rEngine ) { @@ -502,5 +501,4 @@ void SvxEditEngineForwarder::CopyText(const SvxTextForwarder& rSource) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx index d36cacbdc3d0..d3be942fe710 100644 --- a/editeng/source/uno/unoforou.cxx +++ b/editeng/source/uno/unoforou.cxx @@ -39,7 +39,6 @@ using namespace ::com::sun::star; - SvxOutlinerForwarder::SvxOutlinerForwarder( Outliner& rOutl, bool bOutlText /* = false */ ) : rOutliner( rOutl ), bOutlinerText( bOutlText ), @@ -577,8 +576,6 @@ void SvxOutlinerForwarder::CopyText(const SvxTextForwarder& rSource) } - - sal_Int32 SvxTextForwarder::GetNumberingStartValue( sal_Int32 ) { return -1; @@ -598,5 +595,4 @@ void SvxTextForwarder::SetParaIsNumberingRestart( sal_Int32, bool ) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx index 0034b3ebcb1b..4c369844ccf6 100644 --- a/editeng/source/uno/unoipset.cxx +++ b/editeng/source/uno/unoipset.cxx @@ -74,7 +74,6 @@ void SvxItemPropertySet::AddUsrAnyForID(const uno::Any& rAny, sal_uInt16 nWID) } - void SvxItemPropertySet::ClearAllUsrAny() { for ( size_t i = 0, n = aCombineList.size(); i < n; ++i ) @@ -83,7 +82,6 @@ void SvxItemPropertySet::ClearAllUsrAny() } - bool SvxUnoCheckForPositiveValue( const uno::Any& rVal ) { bool bConvert = true; // the default is that all metric items must be converted @@ -94,7 +92,6 @@ bool SvxUnoCheckForPositiveValue( const uno::Any& rVal ) } - uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet, bool bSearchInParent, bool bDontConvertNegativeValues ) { uno::Any aVal; @@ -248,7 +245,6 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* } - void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const uno::Any& rVal ) const { uno::Any* pUsrAny = GetUsrAnyForID(pMap->nWID); @@ -259,14 +255,12 @@ void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMa } - const SfxItemPropertySimpleEntry* SvxItemPropertySet::getPropertyMapEntry(const OUString &rName) const { return m_aPropertyMap.getByName( rName ); } - uno::Reference< beans::XPropertySetInfo > SvxItemPropertySet::getPropertySetInfo() const { if( !m_xInfo.is() ) @@ -275,7 +269,6 @@ uno::Reference< beans::XPropertySetInfo > SvxItemPropertySet::getPropertySetInf } - #ifndef TWIPS_TO_MM #define TWIPS_TO_MM(val) ((val * 127 + 36) / 72) #endif @@ -321,7 +314,6 @@ void SvxUnoConvertToMM( const SfxMapUnit eSourceMapUnit, uno::Any & rMetric ) th } - /** converts the given any with a metric from 100th/mm to the given metric if needed */ void SvxUnoConvertFromMM( const SfxMapUnit eDestinationMapUnit, uno::Any & rMetric ) throw() { diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index 73a44640b1b7..181ff4a4d9ff 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -2365,8 +2365,6 @@ sal_Int64 SAL_CALL SvxUnoText::getSomething( const uno::Sequence< sal_Int8 >& rI } - - SvxDummyTextSource::~SvxDummyTextSource() { }; diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx index 7b7fc46b56cd..08312ac708b6 100644 --- a/editeng/source/xml/xmltxtexp.cxx +++ b/editeng/source/xml/xmltxtexp.cxx @@ -138,7 +138,6 @@ SvxTextForwarder* SvxEditEngineSource::GetTextForwarder() } - void SvxEditEngineSource::UpdateData() { } @@ -312,7 +311,6 @@ void SAL_CALL SvxSimpleUnoModel::removeEventListener( const css::uno::Reference< } - class SvxXMLTextExportComponent : public SvXMLExport { public: @@ -335,7 +333,6 @@ private: }; - SvxXMLTextExportComponent::SvxXMLTextExportComponent( const css::uno::Reference< css::uno::XComponentContext >& xContext, EditEngine* pEditEngine, diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx index 53ea51b4d18f..8cedcbc3a8e9 100644 --- a/editeng/source/xml/xmltxtimp.cxx +++ b/editeng/source/xml/xmltxtimp.cxx @@ -52,8 +52,6 @@ using namespace cppu; using namespace xmloff::token; - - class SvxXMLTextImportContext : public SvXMLImportContext { public: @@ -69,7 +67,6 @@ private: }; - SvxXMLTextImportContext::SvxXMLTextImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >&, const uno::Reference< XText >& xText ) : SvXMLImportContext( rImport, nPrfx, rLName ), mxText( xText ) { @@ -104,7 +101,6 @@ SvXMLImportContext *SvxXMLTextImportContext::CreateChildContext( sal_uInt16 nPre } - class SvxXMLXTextImportComponent : public SvXMLImport { public: @@ -119,7 +115,6 @@ private: }; - SvxXMLXTextImportComponent::SvxXMLXTextImportComponent( const css::uno::Reference< css::uno::XComponentContext >& xContext, const uno::Reference< XText > & xText ) |