canvas/inc/canvas/elapsedtime.hxx | 4 - canvas/source/tools/elapsedtime.cxx | 5 -- editeng/source/editeng/editdbg.cxx | 2 editeng/source/editeng/editview.cxx | 2 editeng/source/editeng/impedit.cxx | 2 editeng/source/rtf/svxrtf.cxx | 2 hwpfilter/source/grammar.cxx | 6 +- sc/source/filter/excel/xlpivot.cxx | 5 -- sc/source/filter/inc/xlpivot.hxx | 2 sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx | 2 sd/source/ui/slidesorter/model/SlsVisualState.cxx | 37 ------------------ svtools/source/edit/textdoc.cxx | 8 +-- svtools/source/edit/texteng.cxx | 2 svtools/source/edit/textundo.cxx | 2 svtools/source/edit/xtextedt.cxx | 4 - svtools/source/inc/unoiface.hxx | 2 svx/workben/edittest.cxx | 2 sw/source/filter/rtf/swparrtf.cxx | 2 unusedcode.easy | 3 - vcl/source/control/ilstbox.cxx | 6 +- 20 files changed, 20 insertions(+), 80 deletions(-)
New commits: commit 30fb54aca35c744517ad697f2d299481b02d457f Author: Thomas Arnhold <tho...@arnhold.org> Date: Thu Apr 12 12:35:21 2012 +0200 remove formfeeds diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx index c1ef702..af2e37f 100644 --- a/editeng/source/editeng/editdbg.cxx +++ b/editeng/source/editeng/editdbg.cxx @@ -429,7 +429,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool bInfoBox ) if ( pEE->pImpEditEngine->GetStyleSheetPool() ) { sal_uLong nStyles = pEE->pImpEditEngine->GetStyleSheetPool() ? pEE->pImpEditEngine->GetStyleSheetPool()->Count() : 0; - fprintf( fp, "\n\n ================================================================================" ); + fprintf( fp, "\n\n================================================================================" ); fprintf( fp, "\n================== Stylesheets =============================================" ); fprintf( fp, "\n================================================================================" ); fprintf( fp, "\n#Template: %lu\n", nStyles ); diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 9bf11c0..81f0284 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -162,7 +162,7 @@ LanguageType lcl_CheckLanguage( } -// ---------------------------------------------------------------------- +// ---------------------------------------------------------------------- // class EditView // ---------------------------------------------------------------------- EditView::EditView( EditEngine* pEng, Window* pWindow ) diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index d3268ce..252da7c 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -71,7 +71,7 @@ inline void lcl_AllignToPixel( Point& rPoint, OutputDevice* pOutDev, short nDiff rPoint = pOutDev->PixelToLogic( rPoint ); } -// ---------------------------------------------------------------------- +// ---------------------------------------------------------------------- // class ImpEditView // ---------------------------------------------------------------------- ImpEditView::ImpEditView( EditView* pView, EditEngine* pEng, Window* pWindow ) : diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx index 91b68e8..45fd74b 100644 --- a/editeng/source/rtf/svxrtf.cxx +++ b/editeng/source/rtf/svxrtf.cxx @@ -1150,7 +1150,6 @@ const SfxItemSet& SvxRTFParser::GetRTFDefaults() return *pRTFDefaults; } -/**/ SvxRTFStyleType::SvxRTFStyleType( SfxItemPool& rPool, const sal_uInt16* pWhichRange ) : aAttrSet( rPool, pWhichRange ) @@ -1356,7 +1355,6 @@ void SvxRTFItemStackType::SetRTFDefaults( const SfxItemSet& rDefaults ) } } -/**/ RTFPlainAttrMapIds::RTFPlainAttrMapIds( const SfxItemPool& rPool ) { diff --git a/hwpfilter/source/grammar.cxx b/hwpfilter/source/grammar.cxx index 99c2f3c..1b76cbb 100644 --- a/hwpfilter/source/grammar.cxx +++ b/hwpfilter/source/grammar.cxx @@ -534,7 +534,7 @@ int yydebug; /* nonzero means print parse trace */ #ifndef YYMAXDEPTH #define YYMAXDEPTH 10000 #endif - + /* Define __yy_memcpy. Note that the size argument should be passed with type unsigned int, because that is what the non-GCC definitions require. With GCC, __builtin_memcpy takes an arg @@ -578,7 +578,7 @@ __yy_memcpy (char *to, char *from, unsigned int count) #endif #endif - + #line 217 "/usr/lib/bison.simple" /* The user can define YYPARSE_PARAM as the name of an argument to be passed @@ -1199,7 +1199,7 @@ case 72: } /* the action file gets copied in in place of this dollarsign */ #line 543 "/usr/lib/bison.simple" - + yyvsp -= yylen; yyssp -= yylen; #ifdef YYLSP_NEEDED diff --git a/svtools/source/edit/textdoc.cxx b/svtools/source/edit/textdoc.cxx index efa5c08..eadeefb 100644 --- a/svtools/source/edit/textdoc.cxx +++ b/svtools/source/edit/textdoc.cxx @@ -47,7 +47,7 @@ int SAL_CALL CompareStart( const void* pFirst, const void* pSecond ) } } -// ------------------------------------------------------------------------- +// ------------------------------------------------------------------------- // (+) class TextCharAttrib // ------------------------------------------------------------------------- TextCharAttrib::TextCharAttrib( const TextAttrib& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd ) @@ -69,7 +69,7 @@ TextCharAttrib::~TextCharAttrib() delete mpAttr; } -// ------------------------------------------------------------------------- +// ------------------------------------------------------------------------- // (+) class TextCharAttribList // ------------------------------------------------------------------------- @@ -214,7 +214,7 @@ void TextCharAttribList::DeleteEmptyAttribs() mbHasEmptyAttribs = sal_False; } -// ------------------------------------------------------------------------- +// ------------------------------------------------------------------------- // (+) class TextNode // ------------------------------------------------------------------------- @@ -470,7 +470,7 @@ void TextNode::Append( const TextNode& rNode ) } } -// ------------------------------------------------------------------------- +// ------------------------------------------------------------------------- // (+) class TextDoc // ------------------------------------------------------------------------- diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx index 3b4ffcc..bc6a47b 100644 --- a/svtools/source/edit/texteng.cxx +++ b/svtools/source/edit/texteng.cxx @@ -78,7 +78,7 @@ SV_DECL_PTRARR( TextViews, TextViewPtr, 0 ) #define SCRLRANGE 20 // 1/20 der Breite/Hoehe scrollen, wenn im QueryDrop -// ------------------------------------------------------------------------- +// ------------------------------------------------------------------------- // (-) class TextEngine // ------------------------------------------------------------------------- TextEngine::TextEngine() diff --git a/svtools/source/edit/textundo.cxx b/svtools/source/edit/textundo.cxx index ab5b2db..2de942f 100644 --- a/svtools/source/edit/textundo.cxx +++ b/svtools/source/edit/textundo.cxx @@ -178,7 +178,7 @@ void TextUndoDelPara::Redo() SetSelection( aPaM ); } -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- // TextUndoConnectParas // ------------------------------------------------------------------------ TextUndoConnectParas::TextUndoConnectParas( TextEngine* pTextEngine, sal_uLong nPara, sal_uInt16 nPos ) diff --git a/svtools/source/edit/xtextedt.cxx b/svtools/source/edit/xtextedt.cxx index 8a30ba6..60aa25f 100644 --- a/svtools/source/edit/xtextedt.cxx +++ b/svtools/source/edit/xtextedt.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star; -// ------------------------------------------------------------------------- +// ------------------------------------------------------------------------- // class ExtTextEngine // ------------------------------------------------------------------------- ExtTextEngine::ExtTextEngine() : maGroupChars( String::CreateFromAscii( "(){}[]", 6 ) ) @@ -236,7 +236,7 @@ sal_Bool ExtTextEngine::Search( TextSelection& rSel, const util::SearchOptions& } -// ------------------------------------------------------------------------- +// ------------------------------------------------------------------------- // class ExtTextView // ------------------------------------------------------------------------- ExtTextView::ExtTextView( ExtTextEngine* pEng, Window* pWindow ) diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx index c8ff4b0..a0f439d 100644 --- a/svtools/source/inc/unoiface.hxx +++ b/svtools/source/inc/unoiface.hxx @@ -337,7 +337,7 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- +// ---------------------------------------------------- // class VCLXCurrencyField // ---------------------------------------------------- class SVTXCurrencyField : public ::com::sun::star::awt::XCurrencyField, public SVTXFormattedField diff --git a/svx/workben/edittest.cxx b/svx/workben/edittest.cxx index 68f45bb..f204a94 100644 --- a/svx/workben/edittest.cxx +++ b/svx/workben/edittest.cxx @@ -306,7 +306,7 @@ void __EXPORT MyView::Resize() pEditView->ShowCursor(); } -// --- MyView::KeyInput() -------------------------------------- +// --- MyView::KeyInput() -------------------------------------- void __EXPORT MyView::KeyInput( const KeyEvent& rKEvt ) { pEditView->PostKeyEvent( rKEvt ); diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx index 8367a4a..30263be 100644 --- a/sw/source/filter/rtf/swparrtf.cxx +++ b/sw/source/filter/rtf/swparrtf.cxx @@ -4316,7 +4316,7 @@ void SwRTFParser::RestoreState() } #endif -/**/ +/**/ BookmarkPosition::BookmarkPosition(const SwPaM &rPaM) : maMkNode(rPaM.GetMark()->nNode), diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index f6236b5..ee6aa79 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -541,7 +541,7 @@ sal_uInt16 ImplEntryList::FindFirstSelectable( sal_uInt16 nPos, bool bForward /* } // ======================================================================= - + ImplListBoxWindow::ImplListBoxWindow( Window* pParent, WinBits nWinStyle ) : Control( pParent, 0 ), maQuickSelectionEngine( *this ) @@ -2242,7 +2242,7 @@ sal_uInt16 ImplListBoxWindow::ImplGetTextStyle() const } // ======================================================================= - + ImplListBox::ImplListBox( Window* pParent, WinBits nWinStyle ) : Control( pParent, nWinStyle ), maLBWindow( this, nWinStyle&(~WB_BORDER) ) @@ -2742,7 +2742,7 @@ rtl::OUString ImplListBox::GetMRUEntries( sal_Unicode cSep ) const } // ======================================================================= - + ImplWin::ImplWin( Window* pParent, WinBits nWinStyle ) : Control ( pParent, nWinStyle ) { commit 7a18848e143933ccdb75bdfc8713da4f7f02efe4 Author: Thomas Arnhold <tho...@arnhold.org> Date: Thu Apr 12 12:07:43 2012 +0200 unusedcode.easy: remove various methods diff --git a/canvas/inc/canvas/elapsedtime.hxx b/canvas/inc/canvas/elapsedtime.hxx index ccce419..ea2a94c 100644 --- a/canvas/inc/canvas/elapsedtime.hxx +++ b/canvas/inc/canvas/elapsedtime.hxx @@ -68,10 +68,6 @@ namespace canvas */ ElapsedTime( ::boost::shared_ptr<ElapsedTime> const & pTimeBase ); - /** Gets this timer's base timer. - */ - ::boost::shared_ptr<ElapsedTime> const & getTimeBase() const; - /** Reset the time The instance of the reset() call starts the time diff --git a/canvas/source/tools/elapsedtime.cxx b/canvas/source/tools/elapsedtime.cxx index c75d57e..906950a 100644 --- a/canvas/source/tools/elapsedtime.cxx +++ b/canvas/source/tools/elapsedtime.cxx @@ -140,11 +140,6 @@ ElapsedTime::ElapsedTime( { } -boost::shared_ptr<ElapsedTime> const & ElapsedTime::getTimeBase() const -{ - return m_pTimeBase; -} - void ElapsedTime::reset() { m_fLastQueriedTime = 0.0; diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx index 854c580..ddfdff0 100644 --- a/sc/source/filter/excel/xlpivot.cxx +++ b/sc/source/filter/excel/xlpivot.cxx @@ -323,11 +323,6 @@ bool XclPCField::IsGroupChildField() const return (meFieldType == EXC_PCFIELD_STDGROUP) || (meFieldType == EXC_PCFIELD_DATECHILD); } -sal_uInt16 XclPCField::GetBaseFieldIndex() const -{ - return IsGroupChildField() ? maFieldInfo.mnGroupBase : mnFieldIdx; -} - bool XclPCField::HasOrigItems() const { return IsSupportedField() && ((maFieldInfo.mnOrigItems > 0) || HasPostponedItems()); diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx index 74aef36..d640aa4 100644 --- a/sc/source/filter/inc/xlpivot.hxx +++ b/sc/source/filter/inc/xlpivot.hxx @@ -509,8 +509,6 @@ public: bool IsGroupBaseField() const; /** Returns true, if this field is a child field in a grouping (it has a base field). */ bool IsGroupChildField() const; - /** Returns the index of the base field, if exists, otherwise the own index. */ - sal_uInt16 GetBaseFieldIndex() const; /** Returns true, if the field is based on a column in the source data area. */ bool HasOrigItems() const; diff --git a/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx b/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx index bfc05fd..98f26db 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx @@ -55,7 +55,6 @@ public: ~VisualState (void); void SetVisualState (const State eState); - void SetVisualStateBlend (const double nBlend); void UpdateVisualState (const PageDescriptor& rDescriptor); @@ -76,7 +75,6 @@ public: private: State meCurrentVisualState; State meOldVisualState; - double mnVisualStateBlend; sal_Int32 mnStateAnimationId; bool mbOldMouseOverState; bool mbCurrentMouseOverState; diff --git a/sd/source/ui/slidesorter/model/SlsVisualState.cxx b/sd/source/ui/slidesorter/model/SlsVisualState.cxx index e854cba..4cbafc0 100644 --- a/sd/source/ui/slidesorter/model/SlsVisualState.cxx +++ b/sd/source/ui/slidesorter/model/SlsVisualState.cxx @@ -26,7 +26,6 @@ * ************************************************************************/ - #include "model/SlsVisualState.hxx" #include "model/SlsPageDescriptor.hxx" #include "controller/SlsAnimator.hxx" @@ -37,7 +36,6 @@ VisualState::VisualState (const sal_Int32 nPageId) : mnPageId(nPageId), meCurrentVisualState(VS_None), meOldVisualState(VS_None), - mnVisualStateBlend(1.0), mnStateAnimationId(controller::Animator::NotAnAnimationId), maLocationOffset(0,0), mnLocationAnimationId(controller::Animator::NotAnAnimationId), @@ -47,9 +45,6 @@ VisualState::VisualState (const sal_Int32 nPageId) { } - - - VisualState::~VisualState (void) { if (mnStateAnimationId != controller::Animator::NotAnAnimationId @@ -60,27 +55,13 @@ VisualState::~VisualState (void) } } - - - void VisualState::SetVisualState (const State eState) { meOldVisualState = meCurrentVisualState; meCurrentVisualState = eState; - mnVisualStateBlend = 1.0; } - - -void VisualState::SetVisualStateBlend (const double nBlend) -{ - mnVisualStateBlend = nBlend; -} - - - - void VisualState::UpdateVisualState (const PageDescriptor& rDescriptor) { if (rDescriptor.HasState(PageDescriptor::ST_Excluded)) @@ -98,8 +79,6 @@ void VisualState::UpdateVisualState (const PageDescriptor& rDescriptor) } - - void VisualState::SetMouseOverState (const bool bIsMouseOver) { mbOldMouseOverState = mbCurrentMouseOverState; @@ -107,16 +86,12 @@ void VisualState::SetMouseOverState (const bool bIsMouseOver) } - - Point VisualState::GetLocationOffset (void) const { return maLocationOffset; } - - bool VisualState::SetLocationOffset (const Point& rOffset) { if (maLocationOffset != rOffset) @@ -129,48 +104,36 @@ bool VisualState::SetLocationOffset (const Point& rOffset) } - - double VisualState::GetButtonAlpha (void) const { return mnButtonAlpha; } - - void VisualState::SetButtonAlpha (const double nAlpha) { mnButtonAlpha = nAlpha; } - - double VisualState::GetButtonBarAlpha (void) const { return mnButtonBarAlpha; } - - void VisualState::SetButtonBarAlpha (const double nAlpha) { mnButtonBarAlpha = nAlpha; } - - sal_Int32 VisualState::GetButtonAlphaAnimationId (void) const { return mnButtonAlphaAnimationId; } - - void VisualState::SetButtonAlphaAnimationId (const sal_Int32 nAnimationId) { mnButtonAlphaAnimationId = nAnimationId; diff --git a/unusedcode.easy b/unusedcode.easy index c619945..91e77f2 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -318,7 +318,6 @@ XMLTextListAutoStylePoolNames_Impl::Remove(rtl::OUString*) XMLTextListAutoStylePool_Impl::GetPos(XMLTextListAutoStylePoolEntry_Impl const*) const XMLTextListAutoStylePool_Impl::Remove(XMLTextListAutoStylePoolEntry_Impl*) XclExpPivotCache::GetFieldAcc(rtl::OUString const&) -XclPCField::GetBaseFieldIndex() const _CpyTabFrms::Insert(_CpyTabFrm const&, unsigned short&) _CpyTabFrms::Insert(_CpyTabFrm const*, unsigned short) _CpyTabFrms::Insert(_CpyTabFrms const*, unsigned short, unsigned short) @@ -704,7 +703,6 @@ cairocanvas::SpriteDeviceHelper::getSurface() cairocanvas::TextLayout::draw(_cairo*) canvas::PropertySetHelper::PropertySetHelper(std::__debug::vector<canvas::tools::ValueMap<canvas::PropertySetHelper::Callbacks>::MapEntry, std::allocator<canvas::tools::ValueMap<canvas::PropertySetHelper::Callbacks>::MapEntry> > const&) canvas::createSurfaceProxyManager(boost::shared_ptr<canvas::IRenderModule> const&) -canvas::tools::ElapsedTime::getTimeBase() const canvas::tools::clipBlit(basegfx::B2IRange&, basegfx::B2IPoint&, basegfx::B2IRange const&, basegfx::B2IRange const&) cmis::Content::exchangeIdentity(com::sun::star::uno::Reference<com::sun::star::ucb::XContentIdentifier> const&) cmis::Content::queryChildren(std::__debug::list<rtl::Reference<cmis::Content>, std::allocator<rtl::Reference<cmis::Content> > >&) @@ -828,7 +826,6 @@ sd::LeftImpressPaneShell::RegisterInterface(SfxModule*) sd::ToolPanelPaneShell::RegisterInterface(SfxModule*) sd::ViewShellBase::RegisterFactory(unsigned short) sd::slidesorter::controller::SelectionFunction::EventDescriptor::EventDescriptor(KeyEvent const&, sd::slidesorter::SlideSorter&) -sd::slidesorter::model::VisualState::SetVisualStateBlend(double) sd::slidesorter::view::Button::IsDown() const sd::slidesorter::view::FontProvider::GetFont(OutputDevice const&) sdext::presenter::PresenterAnimation::PresenterAnimation(unsigned long, unsigned long, unsigned long) _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits