diff options
| -rw-r--r-- | include/svtools/roadmapwizard.hxx | 6 | ||||
| -rw-r--r-- | include/svx/PaletteManager.hxx | 1 | ||||
| -rw-r--r-- | svtools/source/dialogs/roadmapwizard.cxx | 35 | ||||
| -rw-r--r-- | svx/source/tbxctrls/PaletteManager.cxx | 10 | ||||
| -rw-r--r-- | unusedcode.easy | 1 |
5 files changed, 1 insertions, 52 deletions
diff --git a/include/svtools/roadmapwizard.hxx b/include/svtools/roadmapwizard.hxx index 876b199681f7..7abcd48c05e8 100644 --- a/include/svtools/roadmapwizard.hxx +++ b/include/svtools/roadmapwizard.hxx @@ -214,12 +214,6 @@ protected: */ void updateRoadmapItemLabel( WizardState _nState ); - protected: -#ifdef DBG_UTIL - const sal_Char* checkInvariants() const; - friend const char* CheckInvariants( const void* pVoid ); -#endif - private: DECL_DLLPRIVATE_LINK( OnRoadmapItemSelected, void* ); diff --git a/include/svx/PaletteManager.hxx b/include/svx/PaletteManager.hxx index 7070bc1f503b..bde6a7795c1e 100644 --- a/include/svx/PaletteManager.hxx +++ b/include/svx/PaletteManager.hxx @@ -60,7 +60,6 @@ public: long GetColorCount(); long GetRecentColorCount(); - OUString GetPaletteName(); const Color& GetLastColor(); void SetLastColor(const Color& rLastColor); diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx index 6e83474555ec..bb2881445435 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/svtools/source/dialogs/roadmapwizard.cxx @@ -118,41 +118,6 @@ namespace svt } //= RoadmapWizard -#ifdef DBG_UTIL - const sal_Char* RoadmapWizard::checkInvariants() const - { - // all paths have to start with the same state - WizardState nSharedFirstState = WZS_INVALID_STATE; - for ( Paths::const_iterator aPath = m_pImpl->aPaths.begin(); - aPath != m_pImpl->aPaths.end(); - ++aPath - ) - { - if ( aPath->second.empty() ) - return "RoadmapWizard::checkInvariants: paths should not be empty!"; - - if ( nSharedFirstState == WZS_INVALID_STATE ) - // first path - nSharedFirstState = aPath->second[ 0 ]; - else - if ( nSharedFirstState != aPath->second[ 0 ] ) - return "RoadmapWizard::checkInvariants: alls paths must start with the same state!"; - } - - if ( !m_pImpl->aPaths.empty() ) - { - Paths::const_iterator aCurrentPathPos = m_pImpl->aPaths.find( m_pImpl->nActivePath ); - if ( aCurrentPathPos == m_pImpl->aPaths.end() ) - return "RoadmapWizard::checkInvariants: invalid active path!"; - - if ( -1 == m_pImpl->getStateIndexInPath( getCurrentState(), m_pImpl->nActivePath ) ) - return "RoadmapWizard::checkInvariants: the current state is not part of the current path!"; - } - - return NULL; - } -#endif - RoadmapWizard::RoadmapWizard( Window* _pParent, const WinBits i_nStyle, sal_uInt32 _nButtonFlags ) :OWizardMachine( _pParent, i_nStyle, _nButtonFlags ) ,m_pImpl( new RoadmapWizardImpl ) diff --git a/svx/source/tbxctrls/PaletteManager.cxx b/svx/source/tbxctrls/PaletteManager.cxx index df4c4b898255..b104fe9095af 100644 --- a/svx/source/tbxctrls/PaletteManager.cxx +++ b/svx/source/tbxctrls/PaletteManager.cxx @@ -166,16 +166,6 @@ long PaletteManager::GetRecentColorCount() return maRecentColors.size(); } -OUString PaletteManager::GetPaletteName() -{ - if( mnCurrentPalette == 0 ) - return OUString( STR_DEFAULT_PAL ); - else if( mnCurrentPalette == mnNumOfPalettes - 1 ) - return OUString( STR_DOC_COLORS ); - else - return maPalettes[mnCurrentPalette - 1].GetName(); -} - const Color& PaletteManager::GetLastColor() { return mLastColor; diff --git a/unusedcode.easy b/unusedcode.easy index ee2ddaf369e9..60aee14a33a8 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -18,6 +18,7 @@ OutputDevice::LogicToPixel(Region const&, MapMode const&) const OutputDevice::LogicToPixel(basegfx::B2DPolygon const&) const OutputDevice::LogicToPixel(basegfx::B2DPolygon const&, MapMode const&) const OutputDevice::PixelToLogic(Region const&, MapMode const&) const +PaletteManager::GetPaletteName() Primitive2dXmlDump::filterActionType(unsigned short, bool) Primitive2dXmlDump::filterAllActionTypes() SalGraphics::drawTransformedBitmap(basegfx::B2DPoint const&, basegfx::B2DPoint const&, basegfx::B2DPoint const&, SalBitmap const&, SalBitmap const*) |