default_images/framework/res/backing.png |binary default_images/framework/res/backing_hc.png |binary default_images/framework/res/backing_right.png |binary default_images/framework/res/backing_right_hc.png |binary default_images/framework/res/backing_rtl_left.png |binary default_images/framework/res/backing_rtl_left_hc.png |binary default_images/framework/res/backing_rtl_right.png |binary default_images/framework/res/backing_rtl_right_hc.png |binary default_images/introabout/about.png |binary default_images/introabout/intro.png |binary instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp |binary instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp |binary instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp |binary instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp |binary instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp |binary instsetoo_native/res/nologoinstall.bmp |binary odk/index.html | 2 - sc/inc/drwlayer.hxx | 2 - sc/source/core/data/documen9.cxx | 2 - sc/source/core/data/drwlayer.cxx | 5 +- sc/source/ui/docshell/dbdocfun.cxx | 2 - sc/source/ui/docshell/docfunc.cxx | 18 +++++----- sc/source/ui/drawfunc/futext3.cxx | 12 ++++-- sc/source/ui/view/drawview.cxx | 2 - sc/source/ui/view/viewfun6.cxx | 2 - setup_native/source/mac/ooo/osxdndinstall.png |binary setup_native/source/mac/ooo/osxdndinstall_lang.png |binary setup_native/source/mac/ooo/osxdndinstall_nologo.png |binary setup_native/source/mac/sdk/osxdndinstall_sdk.png |binary setup_native/source/win32/nsis/ooobanner.bmp |binary setup_native/source/win32/nsis/ooobitmap.bmp |binary setup_native/source/win32/nsis/ooosdkbanner.bmp |binary svtools/source/table/tablecontrol_impl.cxx | 7 +++ svx/inc/svx/svdmodel.hxx | 4 ++ svx/source/svdraw/svdedxv.cxx | 4 +- svx/source/svdraw/svdmodel.cxx | 2 - svx/source/svdraw/svdundo.cxx | 2 - 37 files changed, 41 insertions(+), 25 deletions(-)
New commits: commit 00fca2ceeb6338462a5022587bc18b57f768e877 Author: Rob Weir <[email protected]> Date: Thu Jun 27 11:50:42 2013 +0000 Check in logo image updates Patch by: Kevin Grignon diff --git a/default_images/framework/res/backing.png b/default_images/framework/res/backing.png old mode 100644 new mode 100755 index 0f118ba..8a7499d Binary files a/default_images/framework/res/backing.png and b/default_images/framework/res/backing.png differ diff --git a/default_images/framework/res/backing_hc.png b/default_images/framework/res/backing_hc.png old mode 100644 new mode 100755 index 1a4b8d0..f109b81 Binary files a/default_images/framework/res/backing_hc.png and b/default_images/framework/res/backing_hc.png differ diff --git a/default_images/framework/res/backing_right.png b/default_images/framework/res/backing_right.png old mode 100644 new mode 100755 index 56d9d88..245645d4 Binary files a/default_images/framework/res/backing_right.png and b/default_images/framework/res/backing_right.png differ diff --git a/default_images/framework/res/backing_right_hc.png b/default_images/framework/res/backing_right_hc.png old mode 100644 new mode 100755 index 9a15143..8f0300f Binary files a/default_images/framework/res/backing_right_hc.png and b/default_images/framework/res/backing_right_hc.png differ diff --git a/default_images/framework/res/backing_rtl_left.png b/default_images/framework/res/backing_rtl_left.png old mode 100644 new mode 100755 index 04e34e0..1441fef Binary files a/default_images/framework/res/backing_rtl_left.png and b/default_images/framework/res/backing_rtl_left.png differ diff --git a/default_images/framework/res/backing_rtl_left_hc.png b/default_images/framework/res/backing_rtl_left_hc.png old mode 100644 new mode 100755 index c6b7096..7387f38 Binary files a/default_images/framework/res/backing_rtl_left_hc.png and b/default_images/framework/res/backing_rtl_left_hc.png differ diff --git a/default_images/framework/res/backing_rtl_right.png b/default_images/framework/res/backing_rtl_right.png old mode 100644 new mode 100755 index 56d9d88..245645d4 Binary files a/default_images/framework/res/backing_rtl_right.png and b/default_images/framework/res/backing_rtl_right.png differ diff --git a/default_images/framework/res/backing_rtl_right_hc.png b/default_images/framework/res/backing_rtl_right_hc.png old mode 100644 new mode 100755 index f2c12cc..8f0300f Binary files a/default_images/framework/res/backing_rtl_right_hc.png and b/default_images/framework/res/backing_rtl_right_hc.png differ diff --git a/default_images/introabout/about.png b/default_images/introabout/about.png index fb8f41c..c1a5464 100755 Binary files a/default_images/introabout/about.png and b/default_images/introabout/about.png differ diff --git a/default_images/introabout/intro.png b/default_images/introabout/intro.png index db31876..80266b4 100755 Binary files a/default_images/introabout/intro.png and b/default_images/introabout/intro.png differ diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp old mode 100644 new mode 100755 index 3af7218..24b76f5 Binary files a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp and b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp differ diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp old mode 100644 new mode 100755 index 8fc53c5..97097ec Binary files a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp and b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp differ diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp old mode 100644 new mode 100755 index 3af7218..24b76f5 Binary files a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp and b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp differ diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp old mode 100644 new mode 100755 index 8fc53c5..97097ec Binary files a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp and b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp differ diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp old mode 100644 new mode 100755 index 3af7218..24b76f5 Binary files a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp and b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp differ diff --git a/instsetoo_native/res/nologoinstall.bmp b/instsetoo_native/res/nologoinstall.bmp old mode 100644 new mode 100755 index 66807c1..2c08bfb Binary files a/instsetoo_native/res/nologoinstall.bmp and b/instsetoo_native/res/nologoinstall.bmp differ diff --git a/setup_native/source/mac/ooo/osxdndinstall.png b/setup_native/source/mac/ooo/osxdndinstall.png old mode 100644 new mode 100755 index b7ac9d3..ebb1000 Binary files a/setup_native/source/mac/ooo/osxdndinstall.png and b/setup_native/source/mac/ooo/osxdndinstall.png differ diff --git a/setup_native/source/mac/ooo/osxdndinstall_lang.png b/setup_native/source/mac/ooo/osxdndinstall_lang.png old mode 100644 new mode 100755 index bbb99a3..bc4985e Binary files a/setup_native/source/mac/ooo/osxdndinstall_lang.png and b/setup_native/source/mac/ooo/osxdndinstall_lang.png differ diff --git a/setup_native/source/mac/ooo/osxdndinstall_nologo.png b/setup_native/source/mac/ooo/osxdndinstall_nologo.png old mode 100644 new mode 100755 index 33cf3b9..648d8b2 Binary files a/setup_native/source/mac/ooo/osxdndinstall_nologo.png and b/setup_native/source/mac/ooo/osxdndinstall_nologo.png differ diff --git a/setup_native/source/mac/sdk/osxdndinstall_sdk.png b/setup_native/source/mac/sdk/osxdndinstall_sdk.png old mode 100644 new mode 100755 index bbb99a3..bc4985e Binary files a/setup_native/source/mac/sdk/osxdndinstall_sdk.png and b/setup_native/source/mac/sdk/osxdndinstall_sdk.png differ diff --git a/setup_native/source/win32/nsis/ooobanner.bmp b/setup_native/source/win32/nsis/ooobanner.bmp old mode 100644 new mode 100755 index d094241..f697d5d Binary files a/setup_native/source/win32/nsis/ooobanner.bmp and b/setup_native/source/win32/nsis/ooobanner.bmp differ diff --git a/setup_native/source/win32/nsis/ooobitmap.bmp b/setup_native/source/win32/nsis/ooobitmap.bmp old mode 100644 new mode 100755 index 951e2ab..6d142dc Binary files a/setup_native/source/win32/nsis/ooobitmap.bmp and b/setup_native/source/win32/nsis/ooobitmap.bmp differ diff --git a/setup_native/source/win32/nsis/ooosdkbanner.bmp b/setup_native/source/win32/nsis/ooosdkbanner.bmp old mode 100644 new mode 100755 index 3af7218..24b76f5 Binary files a/setup_native/source/win32/nsis/ooosdkbanner.bmp and b/setup_native/source/win32/nsis/ooosdkbanner.bmp differ commit e6e39deca7a612966dd63051023a870be8146891 Author: Rob Weir <[email protected]> Date: Thu Jun 27 11:11:46 2013 +0000 Update copyright diff --git a/odk/index.html b/odk/index.html index 485a015..3882f02 100644 --- a/odk/index.html +++ b/odk/index.html @@ -207,7 +207,7 @@ <td colspan="3"> <div class="centertext"> <p><img class="apachelogo" src="docs/images/odk-footer-logo.gif" title="Apache Feather" alt="Apache Feather" /> - Copyright © 2011 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, Apache OpenOffice and OpenOffice.org are trademarks of The Apache Software Foundation. Other names may be trademarks of their respective owners.<p> + Copyright © 2013 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, Apache OpenOffice and OpenOffice.org are trademarks of The Apache Software Foundation. Other names may be trademarks of their respective owners.<p> </div> </td> </tr> commit febd0946e8c2686f0a679d3f32fbb39f5ef1c295 Author: Jürgen Schmidt <[email protected]> Date: Thu Jun 27 10:57:58 2013 +0000 #122586# recalcuate width when scrolling to last column diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx index ab7da4f..d096400 100644 --- a/svtools/source/table/tablecontrol_impl.cxx +++ b/svtools/source/table/tablecontrol_impl.cxx @@ -2072,6 +2072,7 @@ namespace svt { namespace table case TableAreaAll: m_pDataWindow->Invalidate(); + m_pDataWindow->GetParent()->Invalidate( INVALIDATE_TRANSPARENT ); break; } } @@ -2346,7 +2347,10 @@ namespace svt { namespace table m_pDataWindow->Scroll( 0, (long)-nPixelDelta, aDataArea, SCROLL_CLIP | SCROLL_UPDATE | SCROLL_CHILDREN); } else + { m_pDataWindow->Invalidate( INVALIDATE_UPDATE ); + m_pDataWindow->GetParent()->Invalidate( INVALIDATE_TRANSPARENT ); + } // update the position at the vertical scrollbar if ( m_pVScroll != NULL ) @@ -2423,7 +2427,10 @@ namespace svt { namespace table m_pDataWindow->Scroll( nPixelDelta, 0, aDataArea, SCROLL_CLIP | SCROLL_UPDATE ); } else + { m_pDataWindow->Invalidate( INVALIDATE_UPDATE ); + m_pDataWindow->GetParent()->Invalidate( INVALIDATE_TRANSPARENT ); + } // update the position at the horizontal scrollbar if ( m_pHScroll != NULL ) commit fb1dc1d963e192e588731cce3a3ba20996c4e589 Author: Armin Le Grand <[email protected]> Date: Thu Jun 27 10:23:24 2013 +0000 i121008 corrected calc cell comment stuff diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx index 86d0cc2..7bfe56b 100644 --- a/sc/inc/drwlayer.hxx +++ b/sc/inc/drwlayer.hxx @@ -146,7 +146,7 @@ public: void EnableAdjust( sal_Bool bSet = sal_True ) { bAdjustEnabled = bSet; } - void BeginCalcUndo(); + void BeginCalcUndo(bool bDisableTextEditUsesCommonUndoManager); SdrUndoGroup* GetCalcUndo(); sal_Bool IsRecording() const { return bRecording; } void AddCalcUndo( SdrUndoAction* pUndo ); diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx index 9c788ea..882af4c 100644 --- a/sc/source/core/data/documen9.cxx +++ b/sc/source/core/data/documen9.cxx @@ -75,7 +75,7 @@ SfxBroadcaster* ScDocument::GetDrawBroadcaster() void ScDocument::BeginDrawUndo() { if (pDrawLayer) - pDrawLayer->BeginCalcUndo(); + pDrawLayer->BeginCalcUndo(false); } sal_Bool ScDocument::IsDrawRecording() const diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index 8a0a5fb..4bd47f9 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -860,10 +860,10 @@ void ScDrawLayer::AddCalcUndo( SdrUndoAction* pUndo ) delete pUndo; } -void ScDrawLayer::BeginCalcUndo() +void ScDrawLayer::BeginCalcUndo(bool bDisableTextEditUsesCommonUndoManager) { //! DBG_ASSERT( !bRecording, "BeginCalcUndo ohne GetCalcUndo" ); - + SetDisableTextEditUsesCommonUndoManager(bDisableTextEditUsesCommonUndoManager); DELETEZ(pUndoGroup); bRecording = sal_True; } @@ -875,6 +875,7 @@ SdrUndoGroup* ScDrawLayer::GetCalcUndo() SdrUndoGroup* pRet = pUndoGroup; pUndoGroup = NULL; bRecording = sal_False; + SetDisableTextEditUsesCommonUndoManager(false); return pRet; } diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index 921d127..40be175 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -541,7 +541,7 @@ sal_Bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, // #i59745# collect all drawing undo actions affecting cell note captions if( pDrawLayer ) - pDrawLayer->BeginCalcUndo(); + pDrawLayer->BeginCalcUndo(false); } if ( bCopy ) diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 15d4f71..16c9ce3 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -190,7 +190,7 @@ sal_Bool ScDocFunc::DetectiveAddPred(const ScAddress& rPos) SCTAB nTab = rPos.Tab(); if (bUndo) - pModel->BeginCalcUndo(); + pModel->BeginCalcUndo(false); sal_Bool bDone = ScDetectiveFunc( pDoc,nTab ).ShowPred( nCol, nRow ); SdrUndoGroup* pUndo = NULL; if (bUndo) @@ -231,7 +231,7 @@ sal_Bool ScDocFunc::DetectiveDelPred(const ScAddress& rPos) SCTAB nTab = rPos.Tab(); if (bUndo) - pModel->BeginCalcUndo(); + pModel->BeginCalcUndo(false); sal_Bool bDone = ScDetectiveFunc( pDoc,nTab ).DeletePred( nCol, nRow ); SdrUndoGroup* pUndo = NULL; if (bUndo) @@ -270,7 +270,7 @@ sal_Bool ScDocFunc::DetectiveAddSucc(const ScAddress& rPos) SCTAB nTab = rPos.Tab(); if (bUndo) - pModel->BeginCalcUndo(); + pModel->BeginCalcUndo(false); sal_Bool bDone = ScDetectiveFunc( pDoc,nTab ).ShowSucc( nCol, nRow ); SdrUndoGroup* pUndo = NULL; if (bUndo) @@ -311,7 +311,7 @@ sal_Bool ScDocFunc::DetectiveDelSucc(const ScAddress& rPos) SCTAB nTab = rPos.Tab(); if (bUndo) - pModel->BeginCalcUndo(); + pModel->BeginCalcUndo(false); sal_Bool bDone = ScDetectiveFunc( pDoc,nTab ).DeleteSucc( nCol, nRow ); SdrUndoGroup* pUndo = NULL; if (bUndo) @@ -350,7 +350,7 @@ sal_Bool ScDocFunc::DetectiveAddError(const ScAddress& rPos) SCTAB nTab = rPos.Tab(); if (bUndo) - pModel->BeginCalcUndo(); + pModel->BeginCalcUndo(false); sal_Bool bDone = ScDetectiveFunc( pDoc,nTab ).ShowError( nCol, nRow ); SdrUndoGroup* pUndo = NULL; if (bUndo) @@ -389,7 +389,7 @@ sal_Bool ScDocFunc::DetectiveMarkInvalid(SCTAB nTab) if (pWaitWin) pWaitWin->EnterWait(); if (bUndo) - pModel->BeginCalcUndo(); + pModel->BeginCalcUndo(false); sal_Bool bOverflow; sal_Bool bDone = ScDetectiveFunc( pDoc,nTab ).MarkInvalid( bOverflow ); SdrUndoGroup* pUndo = NULL; @@ -429,7 +429,7 @@ sal_Bool ScDocFunc::DetectiveDelAll(SCTAB nTab) ScDocShellModificator aModificator( rDocShell ); if (bUndo) - pModel->BeginCalcUndo(); + pModel->BeginCalcUndo(false); sal_Bool bDone = ScDetectiveFunc( pDoc,nTab ).DeleteAll( SC_DET_DETECTIVE ); SdrUndoGroup* pUndo = NULL; if (bUndo) @@ -471,7 +471,7 @@ sal_Bool ScDocFunc::DetectiveRefresh( sal_Bool bAutomatic ) rDocShell.MakeDrawLayer(); ScDrawLayer* pModel = pDoc->GetDrawLayer(); if (bUndo) - pModel->BeginCalcUndo(); + pModel->BeginCalcUndo(false); // Loeschen auf allen Tabellen @@ -1147,7 +1147,7 @@ bool ScDocFunc::ReplaceNote( const ScAddress& rPos, const String& rNoteText, con // collect drawing undo actions for deleting/inserting caption obejcts if( pUndoMgr ) - pDrawLayer->BeginCalcUndo(); + pDrawLayer->BeginCalcUndo(false); // delete the note (creates drawing undo action for the caption object) delete pOldNote; diff --git a/sc/source/ui/drawfunc/futext3.cxx b/sc/source/ui/drawfunc/futext3.cxx index 2fdfffe..1137c37 100644 --- a/sc/source/ui/drawfunc/futext3.cxx +++ b/sc/source/ui/drawfunc/futext3.cxx @@ -87,14 +87,18 @@ void FuText::StopEditMode(sal_Bool /*bTextDirection*/) { /* Put all undo actions already collected (e.g. create caption object) and all following undo actions (text changed) together into a ListAction. */ - String aUndoStr = ScGlobal::GetRscString( STR_UNDO_EDITNOTE ); - pUndoMgr->EnterListAction( aUndoStr, aUndoStr ); - if( SdrUndoGroup* pCalcUndo = pDrawLayer->GetCalcUndo() ) + SdrUndoGroup* pCalcUndo = pDrawLayer->GetCalcUndo(); + + if(pCalcUndo) { + const String aUndoStr = ScGlobal::GetRscString( STR_UNDO_EDITNOTE ); + pUndoMgr->EnterListAction( aUndoStr, aUndoStr ); + /* Note has been created before editing, if first undo action is an insert action. Needed below to decide whether to drop the undo if editing a new note has been cancelled. */ bNewNote = (pCalcUndo->GetActionCount() > 0) && pCalcUndo->GetAction( 0 )->ISA( SdrUndoNewObj ); + // create a "insert note" undo action if needed if( bNewNote ) pUndoMgr->AddUndoAction( new ScUndoReplaceNote( *pDocShell, aNotePos, pNote->GetNoteData(), true, pCalcUndo ) ); @@ -140,7 +144,7 @@ void FuText::StopEditMode(sal_Bool /*bTextDirection*/) if( pUndoMgr ) { // collect the "remove object" drawing undo action created by DeleteNote() - pDrawLayer->BeginCalcUndo(); + pDrawLayer->BeginCalcUndo(false); // rescue note data before deletion ScNoteData aNoteData( pNote->GetNoteData() ); // delete note from document (removes caption, but does not delete it) diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index e38779f..1aafc0c 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -835,7 +835,7 @@ void ScDrawView::DeleteMarked() DBG_ASSERT( aNoteData.mpCaption == pCaptObj, "ScDrawView::DeleteMarked - caption object does not match" ); // collect the drawing undo action created while deleting the note if( bUndo ) - pDrawLayer->BeginCalcUndo(); + pDrawLayer->BeginCalcUndo(false); // delete the note (already removed from document above) delete pNote; // add the undo action for the note diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx index 0b1deb8..f463b89 100644 --- a/sc/source/ui/view/viewfun6.cxx +++ b/sc/source/ui/view/viewfun6.cxx @@ -159,7 +159,7 @@ void ScViewFunc::EditNote() // start drawing undo to catch undo action for insertion of the caption object pDocSh->MakeDrawLayer(); ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer(); - pDrawLayer->BeginCalcUndo(); + pDrawLayer->BeginCalcUndo(true); // generated undo action is processed in FuText::StopEditMode // get existing note or create a new note (including caption drawing object) diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx index 3394c8d..fbd2a10 100644 --- a/svx/inc/svx/svdmodel.hxx +++ b/svx/inc/svx/svdmodel.hxx @@ -219,6 +219,7 @@ protected: sal_uInt32 nMaxUndoCount; FASTBOOL bSaveNative; sal_Bool bStarDrawPreviewMode; + bool mbDisableTextEditUsesCommonUndoManager; ////////////////////////////////////////////////////////////////////////////// @@ -671,6 +672,9 @@ public: void SetStarDrawPreviewMode(sal_Bool bPreview); sal_Bool IsStarDrawPreviewMode() { return bStarDrawPreviewMode; } + bool GetDisableTextEditUsesCommonUndoManager() const { return mbDisableTextEditUsesCommonUndoManager; } + void SetDisableTextEditUsesCommonUndoManager(bool bNew) { mbDisableTextEditUsesCommonUndoManager = bNew; } + SotStorage* GetModelStorage() const { return pModelStorage; } void SetModelStorage( SotStorage* pStor ) { pModelStorage = pStor; } diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 1aa6d18..d4b65df 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -768,7 +768,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit( if( mxSelectionController.is() ) mxSelectionController->onSelectionHasChanged(); - if(IsUndoEnabled()) + if(IsUndoEnabled() && GetModel() && !GetModel()->GetDisableTextEditUsesCommonUndoManager()) { SdrUndoManager* pSdrUndoManager = getSdrUndoManagerForEnhancedTextEdit(); @@ -854,7 +854,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally) SdrUndoManager* pUndoEditUndoManager = 0; bool bNeedToUndoSavedRedoTextEdit(false); - if(IsUndoEnabled() && GetModel() && pTEObj && pTEOutliner) + if(IsUndoEnabled() && GetModel() && pTEObj && pTEOutliner && !GetModel()->GetDisableTextEditUsesCommonUndoManager()) { // change back the UndoManager to the remembered original one ::svl::IUndoManager* pOriginal = pTEOutliner->SetUndoManager(mpOldTextEditUndoManager); diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index d528111..4fb282a 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -171,7 +171,7 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe mbKernAsianPunctuation = sal_False; mbAddExtLeading = sal_False; mnHandoutPageCount = 0; - + mbDisableTextEditUsesCommonUndoManager = false; SvxAsianConfig aAsian; mnCharCompressType = aAsian.GetCharDistanceCompression(); diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 2d8adb4..8cfe431 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -1164,7 +1164,7 @@ void SdrUndoObjSetText::Undo() SdrText* pText = static_cast< SdrTextObj*>( pObj )->getText(mnText); if( pText ) - pText->SetOutlinerParaObject(pText1); + static_cast< SdrTextObj* >( pObj )->NbcSetOutlinerParaObjectForText( pText1, pText ); pObj->SetEmptyPresObj( bEmptyPresObj ); pObj->ActionChanged();
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
