[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sd/source
sd/source/ui/view/outlview.cxx |6 --
1 file changed, 6 deletions(-)
New commits:
commit 5b28f3488a033bd38b31071463b112df1713b64b
Author: Thorsten Behrens tbehr...@suse.com
Date: Wed Feb 15 16:51:52 2012 +0100
Fix fdo#45177 - avoid linked undo for the while.
While I try to wrap head around subtleties for linked undo in
Impress outline view, disable that here for the while. Better than
a crash for sure.
(cherry picked from commit 57e6f04066cfddfa79eb2b79cf5c45653c79eff3)
Conflicts:
sd/source/ui/view/outlview.cxx
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 53ebbb4..cdd442d 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -1672,12 +1672,6 @@ void OutlineView::EndModelChange()
DBG_ASSERT( bHasUndoActions ==
(mpOutliner-GetUndoManager().GetUndoActionCount() != 0),
sd::OutlineView::EndModelChange(), undo actions not in sync! );
-if( bHasUndoActions )
-{
-SfxLinkUndoAction* pLink = new SfxLinkUndoAction(pDocUndoMgr);
-mpOutliner-GetUndoManager().AddUndoAction(pLink);
-}
-
mpOutliner-GetUndoManager().LeaveListAction();
if( bHasUndoActions
mpOutliner-GetEditEngine().HasTriedMergeOnLastAddUndo() )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sd/source
sd/source/ui/unoidl/unopage.cxx | 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
New commits:
commit 6d49075a032191b4f7034b1b8c799d163d35a58c
Author: Muthu Subramanian sumu...@suse.com
Date: Wed Feb 1 18:01:17 2012 +0530
n#735533: Donot set duplicate master slide names.
Signed-off-by: David Tardon dtar...@redhat.com
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 84a76d3..2f441e9 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -3015,7 +3015,7 @@ void SdMasterPage::getBackground( Any rValue ) throw()
}
// XNamed
-void SAL_CALL SdMasterPage::setName( const OUString aName )
+void SAL_CALL SdMasterPage::setName( const OUString rName )
throw(uno::RuntimeException)
{
::SolarMutexGuard aGuard;
@@ -3024,11 +3024,18 @@ void SAL_CALL SdMasterPage::setName( const OUString
aName )
if(SvxFmDrawPage::mpPage GetPage()-GetPageKind() != PK_NOTES)
{
-String aNewName( aName );
+SdDrawDocument* pDoc = GetModel()-GetDoc();
+sal_Bool bOutDummy;
+String aNewName( rName );
+
+// Slide Name has to be unique
+if( pDoc pDoc-GetPageByName( aNewName, bOutDummy ) !=
SDRPAGE_NOTFOUND )
+return; // throw Exception ?
+
GetPage()-SetName( aNewName );
-if(GetModel()-GetDoc())
-
GetModel()-GetDoc()-RenameLayoutTemplate(GetPage()-GetLayoutName(),
aNewName);
+if( pDoc )
+pDoc-RenameLayoutTemplate( GetPage()-GetLayoutName(), aNewName );
// fake a mode change to repaint the page tab bar
::sd::DrawDocShell* pDocSh = GetModel()-GetDocShell();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sd/source
sd/source/ui/dlg/present.src |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 58174c2a1e9291cf8cef63dcd51fd6357233c797
Author: Ivan Timofeev timofeev@gmail.com
Date: Fri Jan 6 17:08:54 2012 +0400
fdo#44294: overlapped controls
diff --git a/sd/source/ui/dlg/present.src b/sd/source/ui/dlg/present.src
index b53facb..6ee3fd8 100644
--- a/sd/source/ui/dlg/present.src
+++ b/sd/source/ui/dlg/present.src
@@ -86,8 +86,8 @@ ModalDialog DLG_START_PRESENTATION
{
HelpID = sd:ListBox:DLG_START_PRESENTATION:LB_DIAS;
Border = TRUE ;
-Pos = MAP_APPFONT ( 82, 24 ) ;
-Size = MAP_APPFONT ( 111, 80 ) ;
+Pos = MAP_APPFONT ( 96, 24 ) ;
+Size = MAP_APPFONT ( 97, 80 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
//DDExtraWidth = TRUE;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sd/source
sd/source/ui/animations/SlideTransitionPane.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 418dcec256481791721fb13fd4cdfe07074403fb Author: Ivan Timofeev timofeev@gmail.com Date: Mon Dec 19 10:01:29 2011 +0400 impress: slide transition pane: use proper control width diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index bff23fe..6e7862d 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -714,7 +714,7 @@ void SlideTransitionPane::updateLayout() aCtrlSize = maFT_SOUND.GetSizePixel(); if( bStack ) aUpperLeft.setY( aUpperLeft.getY() - aCtrlSize.getHeight()); -aCtrlSize.setWidth( nFTSoundWidth ); +aCtrlSize.setWidth( nFTSoundWidth - 2 * nOffsetX ); maFT_SOUND.SetPosSizePixel( aUpperLeft, aCtrlSize ); aUpperLeft.setX( nIndent ); @@ -728,7 +728,7 @@ void SlideTransitionPane::updateLayout() aCtrlSize = maFT_SPEED.GetSizePixel(); if( bStack ) aUpperLeft.setY( aUpperLeft.getY() - aCtrlSize.getHeight()); -aCtrlSize.setWidth( nFTSpeedWidth ); +aCtrlSize.setWidth( nFTSpeedWidth - 2 * nOffsetX ); maFT_SPEED.SetPosSizePixel( aUpperLeft, aCtrlSize ); // fixed line Modify Transition ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sd/source
sd/source/ui/dlg/navigatr.cxx |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) New commits: commit 8c763915fbb11a261dbbf64280cabeefb7ca6c6a Author: Ivan Timofeev timofeev@gmail.com Date: Fri Dec 9 21:23:50 2011 +0400 fdo#39528: do not lose height of tree list box in Navigator diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index bb5bf26..3fb63a9 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -555,10 +555,11 @@ void SdNavigatorWin::Resize() maToolbox.SetOutputSizePixel( aObjSize ); // Umgroessern der TreeLB -aObjSize = maTlbObjects.Control::GetOutputSizePixel(); +aObjSize = maTlbObjects.GetSizePixel(); aObjSize.Width() += aDiffSize.Width(); -aObjSize.Height() += aDiffSize.Height(); -maTlbObjects.SetOutputSizePixel( aObjSize ); +aObjSize.Height() = maLbDocs.GetPosPixel().Y() + aDiffSize.Height() - +maTlbObjects.GetPosPixel().Y() - 4; +maTlbObjects.SetSizePixel( aObjSize ); Point aPt( 0, aDiffSize.Height() ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
