diff options
author | Mathias Bauer <mba@openoffice.org> | 2011-02-03 15:53:56 +0100 |
---|---|---|
committer | Mathias Bauer <mba@openoffice.org> | 2011-02-03 15:53:56 +0100 |
commit | 2e913ff4d61087475ddf3d15455a652cb50c0549 (patch) | |
tree | 9fc661cdf6462f6d245cd92ac2a20c747e1f9cd9 /svtools/source | |
parent | fd66c3fb05c8aa2031e6f859f6cfaef0ee7bfa87 (diff) | |
parent | 99ff7a9fb521895d6ba18ca4ca92d7eb0c3524fd (diff) |
CWS gnumake3: resync to m99
Diffstat (limited to 'svtools/source')
-rw-r--r-- | svtools/source/contnr/svtreebx.cxx | 4 | ||||
-rwxr-xr-x | svtools/source/control/inettbc.cxx | 3 | ||||
-rw-r--r-- | svtools/source/edit/texteng.cxx | 16 | ||||
-rw-r--r-- | svtools/source/edit/textundo.cxx | 29 | ||||
-rw-r--r-- | svtools/source/edit/textundo.hxx | 8 | ||||
-rw-r--r-- | svtools/source/edit/textview.cxx | 32 | ||||
-rw-r--r-- | svtools/source/edit/xtextedt.cxx | 8 | ||||
-rw-r--r-- | svtools/source/misc/templatefoldercache.cxx | 11 | ||||
-rw-r--r-- | svtools/source/uno/unoiface.cxx | 2 |
9 files changed, 55 insertions, 58 deletions
diff --git a/svtools/source/contnr/svtreebx.cxx b/svtools/source/contnr/svtreebx.cxx index 9d6bc78caff9..5a59dcc3900f 100644 --- a/svtools/source/contnr/svtreebx.cxx +++ b/svtools/source/contnr/svtreebx.cxx @@ -1146,9 +1146,11 @@ void SvTreeListBox::ModelIsRemoving( SvListEntry* pEntry ) NotifyRemoving( (SvLBoxEntry*)pEntry ); } -void SvTreeListBox::ModelHasRemoved( SvListEntry* /* pEntry */ ) +void SvTreeListBox::ModelHasRemoved( SvListEntry* pEntry ) { DBG_CHKTHIS(SvTreeListBox,0); + if ( pEntry == pHdlEntry) + pHdlEntry = NULL; pImp->EntryRemoved(); } diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 574f2bde4e1e..593065c0ac0c 100755 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -847,7 +847,8 @@ void SvtURLBox::ImplInit() { pImp = new SvtURLBox_Impl(); - SetHelpId( ".uno:OpenURL" ); + if ( GetHelpId().getLength() == 0 ) + SetHelpId( ".uno:OpenURL" ); EnableAutocomplete( FALSE ); SetText( String() ); diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx index e0e136089d78..c0afe8962009 100644 --- a/svtools/source/edit/texteng.cxx +++ b/svtools/source/edit/texteng.cxx @@ -763,7 +763,7 @@ TextPaM TextEngine::ImpInsertText( sal_Unicode c, const TextSelection& rCurSel, BOOL bUndoAction = ( rCurSel.HasRange() || bDoOverwrite ); if ( bUndoAction ) - UndoActionStart( TEXTUNDO_INSERT ); + UndoActionStart(); if ( rCurSel.HasRange() ) { @@ -847,7 +847,7 @@ TextPaM TextEngine::ImpInsertText( sal_Unicode c, const TextSelection& rCurSel, TextModified(); if ( bUndoAction ) - UndoActionEnd( TEXTUNDO_INSERT ); + UndoActionEnd(); } return aPaM; @@ -856,7 +856,7 @@ TextPaM TextEngine::ImpInsertText( sal_Unicode c, const TextSelection& rCurSel, TextPaM TextEngine::ImpInsertText( const TextSelection& rCurSel, const XubString& rStr ) { - UndoActionStart( TEXTUNDO_INSERT ); + UndoActionStart(); TextPaM aPaM; @@ -908,7 +908,7 @@ TextPaM TextEngine::ImpInsertText( const TextSelection& rCurSel, const XubString break; } - UndoActionEnd( TEXTUNDO_INSERT ); + UndoActionEnd(); TextModified(); return aPaM; @@ -1430,7 +1430,7 @@ void TextEngine::EnableUndo( BOOL bEnable ) mbUndoEnabled = bEnable; } -SfxUndoManager& TextEngine::GetUndoManager() +::svl::IUndoManager& TextEngine::GetUndoManager() { if ( !mpUndoManager ) mpUndoManager = new TextUndoManager( this ); @@ -1447,7 +1447,7 @@ void TextEngine::UndoActionStart( USHORT nId ) } } -void TextEngine::UndoActionEnd( USHORT ) +void TextEngine::UndoActionEnd() { if ( IsUndoEnabled() && !IsInUndo() ) GetUndoManager().LeaveListAction(); @@ -2640,7 +2640,7 @@ BOOL TextEngine::Read( SvStream& rInput, const TextSelection* pSel ) BOOL bUpdate = GetUpdateMode(); SetUpdateMode( FALSE ); - UndoActionStart( TEXTUNDO_READ ); + UndoActionStart(); TextSelection aSel; if ( pSel ) aSel = *pSel; @@ -2666,7 +2666,7 @@ BOOL TextEngine::Read( SvStream& rInput, const TextSelection* pSel ) aSel = ImpInsertParaBreak( aSel.GetEnd() ); } - UndoActionEnd( TEXTUNDO_READ ); + UndoActionEnd(); TextSelection aNewSel( aSel.GetEnd(), aSel.GetEnd() ); diff --git a/svtools/source/edit/textundo.cxx b/svtools/source/edit/textundo.cxx index 4c243de16c31..2ad5e318e92f 100644 --- a/svtools/source/edit/textundo.cxx +++ b/svtools/source/edit/textundo.cxx @@ -54,7 +54,7 @@ TextUndoManager::~TextUndoManager() { } -BOOL __EXPORT TextUndoManager::Undo( USHORT nCount ) +BOOL __EXPORT TextUndoManager::Undo() { if ( GetUndoActionCount() == 0 ) return FALSE; @@ -62,7 +62,7 @@ BOOL __EXPORT TextUndoManager::Undo( USHORT nCount ) UndoRedoStart(); mpTextEngine->SetIsInUndo( TRUE ); - BOOL bDone = SfxUndoManager::Undo( nCount ); + BOOL bDone = SfxUndoManager::Undo(); mpTextEngine->SetIsInUndo( FALSE ); UndoRedoEnd(); @@ -70,7 +70,7 @@ BOOL __EXPORT TextUndoManager::Undo( USHORT nCount ) return bDone; } -BOOL __EXPORT TextUndoManager::Redo( USHORT nCount ) +BOOL __EXPORT TextUndoManager::Redo() { if ( GetRedoActionCount() == 0 ) return FALSE; @@ -79,7 +79,7 @@ BOOL __EXPORT TextUndoManager::Redo( USHORT nCount ) UndoRedoStart(); mpTextEngine->SetIsInUndo( TRUE ); - BOOL bDone = SfxUndoManager::Redo( nCount ); + BOOL bDone = SfxUndoManager::Redo(); mpTextEngine->SetIsInUndo( FALSE ); UndoRedoEnd(); @@ -110,9 +110,8 @@ void TextUndoManager::UndoRedoEnd() } -TextUndo::TextUndo( USHORT nI, TextEngine* p ) +TextUndo::TextUndo( TextEngine* p ) { - mnId = nI; mpTextEngine = p; } @@ -120,12 +119,6 @@ TextUndo::~TextUndo() { } -USHORT __EXPORT TextUndo::GetId() const -{ - //nId sollte mal entfallen => GetId ueberall ueberladen... - return mnId; -} - XubString __EXPORT TextUndo::GetComment() const { // return mpTextEngine->GetUndoComment( this ); @@ -140,7 +133,7 @@ void TextUndo::SetSelection( const TextSelection& rSel ) TextUndoDelPara::TextUndoDelPara( TextEngine* pTextEngine, TextNode* pNode, ULONG nPara ) - : TextUndo( TEXTUNDO_DELCONTENT, pTextEngine ) + : TextUndo( pTextEngine ) { mpNode = pNode; mnPara = nPara; @@ -191,7 +184,7 @@ void __EXPORT TextUndoDelPara::Redo() // TextUndoConnectParas // ------------------------------------------------------------------------ TextUndoConnectParas::TextUndoConnectParas( TextEngine* pTextEngine, ULONG nPara, USHORT nPos ) - : TextUndo( TEXTUNDO_CONNECTPARAS, pTextEngine ) + : TextUndo( pTextEngine ) { mnPara = nPara; mnSepPos = nPos; @@ -215,7 +208,7 @@ void __EXPORT TextUndoConnectParas::Redo() TextUndoSplitPara::TextUndoSplitPara( TextEngine* pTextEngine, ULONG nPara, USHORT nPos ) - : TextUndo( TEXTUNDO_SPLITPARA, pTextEngine ) + : TextUndo( pTextEngine ) { mnPara = nPara; mnSepPos = nPos; @@ -239,7 +232,7 @@ void __EXPORT TextUndoSplitPara::Redo() TextUndoInsertChars::TextUndoInsertChars( TextEngine* pTextEngine, const TextPaM& rTextPaM, const XubString& rStr ) - : TextUndo( TEXTUNDO_INSERTCHARS, pTextEngine ), + : TextUndo( pTextEngine ), maTextPaM( rTextPaM ), maText( rStr ) { } @@ -281,7 +274,7 @@ BOOL __EXPORT TextUndoInsertChars::Merge( SfxUndoAction* pNextAction ) TextUndoRemoveChars::TextUndoRemoveChars( TextEngine* pTextEngine, const TextPaM& rTextPaM, const XubString& rStr ) - : TextUndo( TEXTUNDO_REMOVECHARS, pTextEngine ), + : TextUndo( pTextEngine ), maTextPaM( rTextPaM ), maText( rStr ) { } @@ -304,7 +297,7 @@ void __EXPORT TextUndoRemoveChars::Redo() TextUndoSetAttribs::TextUndoSetAttribs( TextEngine* pTextEngine, const TextSelection& rSel ) - : TextUndo( TEXTUNDO_ATTRIBS, pTextEngine ), maSelection( rSel ) + : TextUndo( pTextEngine ), maSelection( rSel ) { maSelection.Justify(); // aNewAttribs.Set( rNewItems ); diff --git a/svtools/source/edit/textundo.hxx b/svtools/source/edit/textundo.hxx index cc26c0b51ef6..69b5fc393744 100644 --- a/svtools/source/edit/textundo.hxx +++ b/svtools/source/edit/textundo.hxx @@ -47,16 +47,15 @@ public: ~TextUndoManager(); using SfxUndoManager::Undo; - virtual BOOL Undo( USHORT nCount=1 ); + virtual BOOL Undo(); using SfxUndoManager::Redo; - virtual BOOL Redo( USHORT nCount=1 ); + virtual BOOL Redo(); }; class TextUndo : public SfxUndoAction { private: - USHORT mnId; TextEngine* mpTextEngine; protected: @@ -69,7 +68,7 @@ protected: public: TYPEINFO(); - TextUndo( USHORT nId, TextEngine* pTextEngine ); + TextUndo( TextEngine* pTextEngine ); virtual ~TextUndo(); TextEngine* GetTextEngine() const { return mpTextEngine; } @@ -78,7 +77,6 @@ public: virtual void Redo() = 0; virtual XubString GetComment() const; - virtual USHORT GetId() const; }; #endif // _TEXTUNDO_HXX diff --git a/svtools/source/edit/textview.cxx b/svtools/source/edit/textview.cxx index 48cd23bdcc6f..64c6470be1e8 100644 --- a/svtools/source/edit/textview.cxx +++ b/svtools/source/edit/textview.cxx @@ -311,9 +311,9 @@ void TextView::DeleteSelected() { // HideSelection(); - mpImpl->mpTextEngine->UndoActionStart( TEXTUNDO_DELETE ); + mpImpl->mpTextEngine->UndoActionStart(); TextPaM aPaM = mpImpl->mpTextEngine->ImpDeleteText( mpImpl->maSelection ); - mpImpl->mpTextEngine->UndoActionEnd( TEXTUNDO_DELETE ); + mpImpl->mpTextEngine->UndoActionEnd(); ImpSetSelection( aPaM ); mpImpl->mpTextEngine->FormatAndUpdate( this ); @@ -695,7 +695,7 @@ BOOL TextView::KeyInput( const KeyEvent& rKeyEvent ) default: break; } - mpImpl->mpTextEngine->UndoActionStart( TEXTUNDO_DELETE ); + mpImpl->mpTextEngine->UndoActionStart(); if(mpImpl->mbSupportProtectAttribute) { //expand selection to include all protected content - if there is any @@ -717,7 +717,7 @@ BOOL TextView::KeyInput( const KeyEvent& rKeyEvent ) } } aCurSel = ImpDelete( nDel, nMode ); - mpImpl->mpTextEngine->UndoActionEnd( TEXTUNDO_DELETE ); + mpImpl->mpTextEngine->UndoActionEnd(); bModified = TRUE; bAllowIdle = FALSE; } @@ -745,7 +745,7 @@ BOOL TextView::KeyInput( const KeyEvent& rKeyEvent ) if ( !mpImpl->mbReadOnly && !rKeyEvent.GetKeyCode().IsMod1() && !rKeyEvent.GetKeyCode().IsMod2() && ImplCheckTextLen( 'x' ) ) { - mpImpl->mpTextEngine->UndoActionStart( TEXTUNDO_INSERT ); + mpImpl->mpTextEngine->UndoActionStart(); aCurSel = mpImpl->mpTextEngine->ImpInsertParaBreak( aCurSel ); if ( mpImpl->mbAutoIndent ) { @@ -760,7 +760,7 @@ BOOL TextView::KeyInput( const KeyEvent& rKeyEvent ) if ( n ) aCurSel = mpImpl->mpTextEngine->ImpInsertText( aCurSel, pPrev->GetText().Copy( 0, n ) ); } - mpImpl->mpTextEngine->UndoActionEnd( TEXTUNDO_INSERT ); + mpImpl->mpTextEngine->UndoActionEnd(); bModified = TRUE; } else @@ -1122,21 +1122,21 @@ void TextView::Scroll( long ndX, long ndY ) void TextView::Undo() { mpImpl->mpTextEngine->SetActiveView( this ); - mpImpl->mpTextEngine->GetUndoManager().Undo( 1 ); + mpImpl->mpTextEngine->GetUndoManager().Undo(); } void TextView::Redo() { mpImpl->mpTextEngine->SetActiveView( this ); - mpImpl->mpTextEngine->GetUndoManager().Redo( 0 ); + mpImpl->mpTextEngine->GetUndoManager().Redo(); } void TextView::Cut() { - mpImpl->mpTextEngine->UndoActionStart( TEXTUNDO_CUT ); + mpImpl->mpTextEngine->UndoActionStart(); Copy(); DeleteSelected(); - mpImpl->mpTextEngine->UndoActionEnd( TEXTUNDO_CUT ); + mpImpl->mpTextEngine->UndoActionEnd(); } void TextView::Copy( uno::Reference< datatransfer::clipboard::XClipboard >& rxClipboard ) @@ -1370,7 +1370,7 @@ void TextView::InsertText( const XubString& rStr, BOOL bSelect ) void TextView::InsertNewText( const rtl::OUString& rStr, BOOL bSelect ) { // HideSelection(); - mpImpl->mpTextEngine->UndoActionStart( TEXTUNDO_INSERT ); + mpImpl->mpTextEngine->UndoActionStart(); /* #i87633# break inserted text into chunks that fit into the underlying String @@ -1405,7 +1405,7 @@ void TextView::InsertNewText( const rtl::OUString& rStr, BOOL bSelect ) nLen -= nChunkLen; nPos += nChunkLen; } - mpImpl->mpTextEngine->UndoActionEnd( TEXTUNDO_INSERT ); + mpImpl->mpTextEngine->UndoActionEnd(); mpImpl->mpTextEngine->FormatAndUpdate( this ); } @@ -1417,9 +1417,9 @@ void TextView::InsertText( const XubString& rStr, BOOL bSelect ) TextSelection aNewSel( mpImpl->maSelection ); - mpImpl->mpTextEngine->UndoActionStart( TEXTUNDO_INSERT ); + mpImpl->mpTextEngine->UndoActionStart(); TextPaM aPaM = mpImpl->mpTextEngine->ImpInsertText( mpImpl->maSelection, rStr ); - mpImpl->mpTextEngine->UndoActionEnd( TEXTUNDO_INSERT ); + mpImpl->mpTextEngine->UndoActionEnd(); if ( bSelect ) { @@ -2169,7 +2169,7 @@ void TextView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEv HideSelection(); ImpSetSelection( mpImpl->mpDDInfo->maDropPos ); - mpImpl->mpTextEngine->UndoActionStart( TEXTUNDO_DRAGANDDROP ); + mpImpl->mpTextEngine->UndoActionStart(); String aText; uno::Reference< datatransfer::XTransferable > xDataObj = rDTDE.Transferable; @@ -2247,7 +2247,7 @@ void TextView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEv mpImpl->mpTextEngine->ImpDeleteText( aPrevSel ); } - mpImpl->mpTextEngine->UndoActionEnd( TEXTUNDO_DRAGANDDROP ); + mpImpl->mpTextEngine->UndoActionEnd(); delete mpImpl->mpDDInfo; mpImpl->mpDDInfo = 0; diff --git a/svtools/source/edit/xtextedt.cxx b/svtools/source/edit/xtextedt.cxx index 0a4907edcadd..10e05a58676a 100644 --- a/svtools/source/edit/xtextedt.cxx +++ b/svtools/source/edit/xtextedt.cxx @@ -327,7 +327,7 @@ USHORT ExtTextView::Replace( const util::SearchOptions& rSearchOptions, BOOL bAl BOOL bFound = pTextEngine->Search( aSel, rSearchOptions, TRUE ); if ( bFound ) - pTextEngine->UndoActionStart( XTEXTUNDO_REPLACEALL ); + pTextEngine->UndoActionStart(); while ( bFound ) { nFound++; @@ -341,7 +341,7 @@ USHORT ExtTextView::Replace( const util::SearchOptions& rSearchOptions, BOOL bAl { SetSelection( aSel.GetStart() ); pTextEngine->FormatAndUpdate( this ); - pTextEngine->UndoActionEnd( XTEXTUNDO_REPLACEALL ); + pTextEngine->UndoActionEnd(); } } return nFound; @@ -355,7 +355,7 @@ BOOL ExtTextView::ImpIndentBlock( BOOL bRight ) aSel.Justify(); HideSelection(); - GetTextEngine()->UndoActionStart( bRight ? XTEXTUNDO_INDENTBLOCK : XTEXTUNDO_UNINDENTBLOCK ); + GetTextEngine()->UndoActionStart(); ULONG nStartPara = aSel.GetStart().GetPara(); ULONG nEndPara = aSel.GetEnd().GetPara(); @@ -386,7 +386,7 @@ BOOL ExtTextView::ImpIndentBlock( BOOL bRight ) } } - GetTextEngine()->UndoActionEnd( bRight ? XTEXTUNDO_INDENTBLOCK : XTEXTUNDO_UNINDENTBLOCK ); + GetTextEngine()->UndoActionEnd(); BOOL bRange = aSel.HasRange(); if ( bRight ) diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index a6c3617b50a7..3c118445c6f4 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -116,8 +116,8 @@ namespace svt //===================================================================== struct TemplateContent; typedef ::std::vector< ::vos::ORef< TemplateContent > > TemplateFolderContent; - typedef TemplateFolderContent::const_iterator ConstFolderIterator; - typedef TemplateFolderContent::iterator FolderIterator; + typedef TemplateFolderContent::const_iterator ConstFolderIterator; + typedef TemplateFolderContent::iterator FolderIterator; /** a struct describing one content in one of the template dirs (or at least it's relevant aspects) */ @@ -706,15 +706,18 @@ namespace svt m_aCurrentState.swap( aTemplateFolderContent ); // the template directories from the config - String aDirs = SvtPathOptions().GetTemplatePath(); + const SvtPathOptions aPathOptions; + String aDirs = aPathOptions.GetTemplatePath(); sal_uInt16 nDirs = aDirs.GetTokenCount( ';' ); m_aCurrentState.reserve( nDirs ); // loop through all the root-level template folders for ( sal_uInt16 i=0; i<nDirs; ++i) { + String sTemplatePath( aDirs.GetToken( i, ';' ) ); + sTemplatePath = aPathOptions.ExpandMacros( sTemplatePath ); // create a new entry - m_aCurrentState.push_back( new TemplateContent( INetURLObject( aDirs.GetToken( i, ';' ) ) ) ); + m_aCurrentState.push_back( new TemplateContent( INetURLObject( sTemplatePath ) ) ); TemplateFolderContent::iterator aCurrentRoot = m_aCurrentState.end(); --aCurrentRoot; diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index 9ff37fbc2af4..bc5627d2fab6 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -1650,7 +1650,7 @@ void SVTXRoadmap::ImplSetNewImage() { OSL_PRECOND( GetWindow(), "SVTXRoadmap::ImplSetNewImage: window is required to be not-NULL!" ); ::svt::ORoadmap* pButton = static_cast< ::svt::ORoadmap* >( GetWindow() ); - pButton->SetRoadmapBitmap( GetBitmap() ); + pButton->SetRoadmapBitmap( GetImage().GetBitmapEx() ); } void SVTXRoadmap::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) |