[Libreoffice-commits] .: 54 commits - sd/source slideshow/source
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Mar 23 09:25:19 PDT 2011
sd/source/core/stlpool.cxx | 3 +
sd/source/ui/framework/module/ModuleController.cxx | 4 ++
sd/source/ui/func/fuhhconv.cxx | 10 ++---
sd/source/ui/presenter/PresenterTextView.cxx | 2 -
sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 5 ++
sd/source/ui/toolpanel/TaskPaneFocusManager.cxx | 19 ++++++----
sd/source/ui/toolpanel/TaskPaneFocusManager.hxx | 1
sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx | 2 -
slideshow/source/engine/animationnodes/basenode.hxx | 2 -
slideshow/source/engine/debug.cxx | 2 -
slideshow/source/engine/shapes/drawshape.hxx | 2 -
slideshow/source/engine/shapes/gdimtftools.cxx | 5 +-
slideshow/source/engine/slide/slideimpl.cxx | 2 -
13 files changed, 39 insertions(+), 20 deletions(-)
New commits:
commit a174eb0de60459378fa412c90ea6c1ff1a2ab5ba
Merge: 8d1fb80... 23698a0...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Mar 23 17:13:34 2011 +0100
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/impress
commit 8d1fb80cc730188e3018c827f8186bdff9aac099
Merge: 7a4a8d0... 9e9aa18...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Mar 23 16:59:19 2011 +0100
Merge commit 'ooo/DEV300_m103'
Conflicts:
sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
slideshow/source/engine/debug.cxx
slideshow/source/engine/transitions/randomwipe.cxx
diff --cc sd/source/core/stlpool.cxx
index b01ea67,babe957..d1bee44
mode 100644,100755..100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
diff --cc sd/source/ui/framework/module/ModuleController.cxx
index 645d4a0,1838a49..d153346
mode 100644,100755..100644
--- a/sd/source/ui/framework/module/ModuleController.cxx
+++ b/sd/source/ui/framework/module/ModuleController.cxx
diff --cc sd/source/ui/presenter/PresenterTextView.cxx
index cb81df9,1f8882b..f593384
mode 100644,100755..100644
--- a/sd/source/ui/presenter/PresenterTextView.cxx
+++ b/sd/source/ui/presenter/PresenterTextView.cxx
diff --cc sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index 6b75243,b920b90..984d016
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@@ -373,7 -372,12 +373,12 @@@ bool SlideSorterController::Command
{
bool bEventHasBeenHandled = false;
+ if (pWindow == NULL)
+ return false;
-
++
ViewShell* pViewShell = mrSlideSorter.GetViewShell();
+ if (pViewShell == NULL)
+ return false;
switch (rEvent.GetCommand())
{
diff --cc sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
index bb8718f,37e5668..eef81be
mode 100644,100755..100755
--- a/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
+++ b/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
@@@ -32,10 -31,10 +32,10 @@@
#include "TaskPaneFocusManager.hxx"
#include <vcl/window.hxx>
- #include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/event.hxx>
+ #include <rtl/instance.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
namespace {
diff --cc sd/source/ui/toolpanel/TaskPaneFocusManager.hxx
index 1472198,acbe347..a3102dc
mode 100644,100755..100755
--- a/sd/source/ui/toolpanel/TaskPaneFocusManager.hxx
+++ b/sd/source/ui/toolpanel/TaskPaneFocusManager.hxx
commit 9e9aa18e20614a3e173323def7d7f7058d937fc4
Merge: 1882d8f... 7528fb4...
Author: obo <obo at openoffice.org>
Date: Wed Mar 16 08:29:30 2011 +0100
CWS-TOOLING: integrate CWS debuglevels
commit 7528fb4313cb2859cd0d0303c137c09fddf0348d
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Mon Mar 14 15:46:16 2011 +0100
debuglevels: removed conflicting fix for a leaking WorkWindow - both changes together cause a crash
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index f23a685..f612950 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -50,7 +50,6 @@
#include <sfx2/viewfrm.hxx>
#include <vcl/wrkwin.hxx>
#include <toolkit/helper/vclunohelper.hxx>
-#include <tools/diagnose_ex.h>
#include <boost/bind.hpp>
@@ -154,20 +153,6 @@ BasicViewFactory::BasicViewFactory (
BasicViewFactory::~BasicViewFactory (void)
{
- mpViewCache.reset();
-
- Reference< awt::XWindow > xLocalPaneWindow( mxLocalPane->getWindow() );
- try
- {
- const Reference< XComponent > xLocalPaneComponent( mxLocalPane, UNO_QUERY_THROW );
- xLocalPaneComponent->dispose();
- const Reference< XComponent > xWindowComponent( xLocalPaneWindow, UNO_QUERY_THROW );
- xWindowComponent->dispose();
- }
- catch( const Exception& )
- {
- DBG_UNHANDLED_EXCEPTION();
- }
}
commit 1b86c6e1654a4587acf87ecdd69dabe4eb7759e3
Merge: b60b592... 1882d8f...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Mon Mar 14 09:47:56 2011 +0100
debuglevels: pulled and merged DEV300.m102
diff --cc sd/source/ui/framework/factories/BasicViewFactory.cxx
index 232f52b,f612950..f23a685
mode 100755,100644..100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
commit 1882d8fc773ae999cfadc3555743a7578fada0ea
Merge: 3d95ec9... 5875e0d...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Mon Mar 7 16:51:11 2011 +0100
CWS-TOOLING: integrate CWS os150
commit 3d95ec9405222815f493f1adc61d5ea90913a839
Merge: cb45944... 244d6fc...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Wed Mar 2 12:10:39 2011 +0100
CWS-TOOLING: integrate CWS mhu21
commit cb45944bb08d32ca6199fe5d55075bb2b8759de4
Merge: 2f679d3... 8ca9aec...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Mon Feb 28 17:12:48 2011 +0100
CWS-TOOLING: integrate CWS impress195
diff --cc sd/source/ui/framework/factories/BasicViewFactory.cxx
index 5570d3a,605b6c3..f612950
mode 100755,100644..100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
commit 2f679d31d97d64910c193341d595d132ff00c7ee
Merge: da90406... 0ad054d...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Mon Feb 28 16:55:36 2011 +0100
CWS-TOOLING: integrate CWS sw34bf03
commit 5875e0db8c4358f0dbf1347935c7fabd156e6fce
Merge: dd4c864... da90406...
Author: os <os at openoffice.org>
Date: Thu Feb 24 11:56:18 2011 +0100
os150: m101 merged
commit 244d6fc5c1a7862eba140a295dd32a9985f6adba
Merge: 734aa40... da90406...
Author: Matthias Huetsch [mhu] <matthias.huetsch at oracle.com>
Date: Wed Feb 23 21:03:15 2011 +0100
Update from master repository (DEV300_m100).
commit b60b5928c4c92dc3db8becce23981cef906a9c59
Merge: 09701e1... da90406...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Wed Feb 23 12:42:39 2011 +0100
debuglevels: pulled and merged latest changes from DEV300_next
commit 09701e1e68b420d6f9377732260265b584c55254
Merge: 07368c4... 598d1f9...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Wed Feb 23 09:58:44 2011 +0100
debuglevels: merged to-be-m101
commit dd4c864918948274eab291d72ec47009193e3563
Author: os <os at openoffice.org>
Date: Fri Feb 18 10:06:26 2011 +0100
os150: SvxFontItem member access changed to Set<member>-methods
diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx
index 99dacf7..ce28b1e 100755
--- a/sd/source/ui/func/fuhhconv.cxx
+++ b/sd/source/ui/func/fuhhconv.cxx
@@ -203,11 +203,11 @@ void FuHangulHanjaConversion::ConvertStyles( sal_Int16 nTargetLanguage, const Fo
{
// set new font attribute
SvxFontItem aFontItem( (SvxFontItem&) rSet.Get( EE_CHAR_FONTINFO_CJK ) );
- aFontItem.GetFamilyName() = pTargetFont->GetName();
- aFontItem.GetFamily() = pTargetFont->GetFamily();
- aFontItem.GetStyleName() = pTargetFont->GetStyleName();
- aFontItem.GetPitch() = pTargetFont->GetPitch();
- aFontItem.GetCharSet() = pTargetFont->GetCharSet();
+ aFontItem.SetFamilyName( pTargetFont->GetName());
+ aFontItem.SetFamily( pTargetFont->GetFamily());
+ aFontItem.SetStyleName( pTargetFont->GetStyleName());
+ aFontItem.SetPitch( pTargetFont->GetPitch());
+ aFontItem.SetCharSet( pTargetFont->GetCharSet());
rSet.Put( aFontItem );
}
diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx
index 296769d..1f8882b 100755
--- a/sd/source/ui/presenter/PresenterTextView.cxx
+++ b/sd/source/ui/presenter/PresenterTextView.cxx
@@ -498,7 +498,7 @@ void PresenterTextView::Implementation::SetFontDescriptor (
mpEditEngineItemPool->SetPoolDefaultItem( aFontHeight);
SvxFontItem aSvxFontItem (EE_CHAR_FONTINFO);
- aSvxFontItem.GetFamilyName() = rFontDescriptor.Name;
+ aSvxFontItem.SetFamilyName( rFontDescriptor.Name );
mpEditEngineItemPool->SetPoolDefaultItem(aSvxFontItem);
mnTotalHeight = -1;
commit 07368c41ff1c9c5887a79cb21e7f44a4ab9fd969
Merge: bcfa709... 93ad80f...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Mon Feb 14 23:26:54 2011 +0100
debuglevels: pulled and merged DEV300.m100
commit 0ad054d91f373de4f1a0bc543e70f3fac76bea9d
Author: Michael Stahl <mst at openoffice.org>
Date: Mon Feb 14 14:06:49 2011 +0100
sw34bf03: stlpool.cxx: fix stupid typo
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 3a27ffb..babe957 100755
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -1061,8 +1061,8 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet,
SvxNumberFormat aFrmt( pDefaultRule->GetLevel(i) );
aFrmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
// #i93908# clear suffix for bullet lists
- aFmt.SetPrefix(::rtl::OUString());
- aFmt.SetSuffix(::rtl::OUString());
+ aFrmt.SetPrefix(::rtl::OUString());
+ aFrmt.SetSuffix(::rtl::OUString());
aFrmt.SetStart(1);
aFrmt.SetBulletRelSize(45);
aFrmt.SetBulletChar( 0x25CF ); // StarBats: 0xF000 + 34
commit e6232f1c41b3a105c3265b8e92199135d4e94dbb
Merge: 2e9f5f9... 93ad80f...
Author: Michael Stahl <mst at openoffice.org>
Date: Fri Feb 11 15:41:40 2011 +0100
sw34bf03: merge to-be-m100 DEV300_next
commit 734aa40c3cee8e19270553ca0ee1e5623421856b
Merge: 61c45a4... 4de9a23...
Author: Matthias Huetsch [mhu] <matthias.huetsch at oracle.com>
Date: Thu Jan 27 18:16:28 2011 +0100
Update from master repository (DEV300_m98).
diff --cc sd/source/filter/html/pubdlg.src
index cc57ab3,1c895e6..1c895e6
mode 100644,100644..100755
--- a/sd/source/filter/html/pubdlg.src
+++ b/sd/source/filter/html/pubdlg.src
diff --cc sd/source/ui/animations/CustomAnimationCreateDialog.src
index 162a1d6,8a57bfa..8a57bfa
mode 100644,100644..100755
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.src
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.src
diff --cc sd/source/ui/animations/CustomAnimationDialog.src
index 594bb7f,ac18e85..ac18e85
mode 100644,100644..100755
--- a/sd/source/ui/animations/CustomAnimationDialog.src
+++ b/sd/source/ui/animations/CustomAnimationDialog.src
diff --cc sd/source/ui/dlg/PaneDockingWindow.src
index 0b366e1,aff5487..aff5487
mode 100755,100644..100755
--- a/sd/source/ui/dlg/PaneDockingWindow.src
+++ b/sd/source/ui/dlg/PaneDockingWindow.src
diff --cc sd/source/ui/dlg/animobjs.src
index 8387555,862a6c8..862a6c8
mode 100644,100644..100755
--- a/sd/source/ui/dlg/animobjs.src
+++ b/sd/source/ui/dlg/animobjs.src
diff --cc sd/source/ui/dlg/brkdlg.src
index 7309242,b0b41f5..b0b41f5
mode 100644,100644..100755
--- a/sd/source/ui/dlg/brkdlg.src
+++ b/sd/source/ui/dlg/brkdlg.src
diff --cc sd/source/ui/dlg/copydlg.src
index bf4f87e,4697dc0..4697dc0
mode 100644,100644..100755
--- a/sd/source/ui/dlg/copydlg.src
+++ b/sd/source/ui/dlg/copydlg.src
diff --cc sd/source/ui/dlg/custsdlg.src
index f5e4195,719362c..719362c
mode 100644,100644..100755
--- a/sd/source/ui/dlg/custsdlg.src
+++ b/sd/source/ui/dlg/custsdlg.src
diff --cc sd/source/ui/dlg/dlgass.src
index 2e3e0e3,b2b6d8d..b2b6d8d
mode 100644,100644..100755
--- a/sd/source/ui/dlg/dlgass.src
+++ b/sd/source/ui/dlg/dlgass.src
diff --cc sd/source/ui/dlg/dlgfield.src
index 679c21f,1208874..1208874
mode 100644,100644..100755
--- a/sd/source/ui/dlg/dlgfield.src
+++ b/sd/source/ui/dlg/dlgfield.src
diff --cc sd/source/ui/dlg/dlgsnap.src
index 43bdb41,31fea0d..31fea0d
mode 100644,100644..100755
--- a/sd/source/ui/dlg/dlgsnap.src
+++ b/sd/source/ui/dlg/dlgsnap.src
diff --cc sd/source/ui/dlg/headerfooterdlg.src
index b2e4fb2,dd4d4b4..dd4d4b4
mode 100644,100644..100755
--- a/sd/source/ui/dlg/headerfooterdlg.src
+++ b/sd/source/ui/dlg/headerfooterdlg.src
diff --cc sd/source/ui/dlg/ins_paste.src
index aec49d3,7c77044..7c77044
mode 100644,100644..100755
--- a/sd/source/ui/dlg/ins_paste.src
+++ b/sd/source/ui/dlg/ins_paste.src
diff --cc sd/source/ui/dlg/inspagob.src
index b4fbaad,1a256ab..1a256ab
mode 100644,100644..100755
--- a/sd/source/ui/dlg/inspagob.src
+++ b/sd/source/ui/dlg/inspagob.src
diff --cc sd/source/ui/dlg/layeroptionsdlg.src
index c199107,737b0c7..737b0c7
mode 100644,100644..100755
--- a/sd/source/ui/dlg/layeroptionsdlg.src
+++ b/sd/source/ui/dlg/layeroptionsdlg.src
diff --cc sd/source/ui/dlg/masterlayoutdlg.src
index a886555,3f2a9d6..3f2a9d6
mode 100644,100644..100755
--- a/sd/source/ui/dlg/masterlayoutdlg.src
+++ b/sd/source/ui/dlg/masterlayoutdlg.src
diff --cc sd/source/ui/dlg/morphdlg.src
index 13e8278,9d413e9..9d413e9
mode 100644,100644..100755
--- a/sd/source/ui/dlg/morphdlg.src
+++ b/sd/source/ui/dlg/morphdlg.src
diff --cc sd/source/ui/dlg/paragr.src
index 2db4939,a6ec49f..a6ec49f
mode 100644,100644..100755
--- a/sd/source/ui/dlg/paragr.src
+++ b/sd/source/ui/dlg/paragr.src
diff --cc sd/source/ui/dlg/present.src
index bdf5b12,5dd23ec..5dd23ec
mode 100644,100644..100755
--- a/sd/source/ui/dlg/present.src
+++ b/sd/source/ui/dlg/present.src
diff --cc sd/source/ui/dlg/prntopts.src
index 2644d6e,3747dd3..3747dd3
mode 100644,100644..100755
--- a/sd/source/ui/dlg/prntopts.src
+++ b/sd/source/ui/dlg/prntopts.src
diff --cc sd/source/ui/dlg/sdpreslt.src
index f1d18ad,3319988..3319988
mode 100644,100644..100755
--- a/sd/source/ui/dlg/sdpreslt.src
+++ b/sd/source/ui/dlg/sdpreslt.src
diff --cc sd/source/ui/dlg/tpaction.src
index 118f4ed,8c42655..8c42655
mode 100644,100644..100755
--- a/sd/source/ui/dlg/tpaction.src
+++ b/sd/source/ui/dlg/tpaction.src
diff --cc sd/source/ui/dlg/tpoption.src
index b5f5ae0,23c8d9d..23c8d9d
mode 100644,100644..100755
--- a/sd/source/ui/dlg/tpoption.src
+++ b/sd/source/ui/dlg/tpoption.src
diff --cc sd/source/ui/dlg/vectdlg.src
index 70b5701,6a3fd04..6a3fd04
mode 100644,100644..100755
--- a/sd/source/ui/dlg/vectdlg.src
+++ b/sd/source/ui/dlg/vectdlg.src
diff --cc sd/source/ui/table/TableDesignPane.src
index 4ab8d78,f9c1b1e..f9c1b1e
mode 100644,100644..100755
--- a/sd/source/ui/table/TableDesignPane.src
+++ b/sd/source/ui/table/TableDesignPane.src
commit 2e9f5f9d0a48624615735b6833d9c8632417dc55
Author: Michael Stahl <mst at openoffice.org>
Date: Fri Dec 17 11:00:57 2010 +0100
sw34bf03: #i93908#: ODF: fix bogus style:num-suffix on bullet lists:
Svx{Bullet,Num}PickTabPage, SwAutoFormat, SwWrtShell::NumOrBulletOn():
clear suffix when bullet lists are created.
xmlnumi.cxx: ignore style:num-suffix written by defective OOo versions.
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 16b130e..78d11a2 100755
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -1063,6 +1063,9 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet,
{
SvxNumberFormat aFrmt( pDefaultRule->GetLevel(i) );
aFrmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
+ // #i93908# clear suffix for bullet lists
+ aFmt.SetPrefix(::rtl::OUString());
+ aFmt.SetSuffix(::rtl::OUString());
aFrmt.SetStart(1);
aFrmt.SetBulletRelSize(45);
aFrmt.SetBulletChar( 0x25CF ); // StarBats: 0xF000 + 34
commit bcfa709eddb0868581796a919300888e2091efb1
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Fri Dec 3 14:27:32 2010 +0100
dba34c: #i115901#: dispose the local pane's window (after clearing the cache, which will dispose the windows currently anchored to the pane)
(transplanted from 6010283465918075d489ba4b589fdc9b11343759)
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index 98b58fc..207c0ec 100755
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -50,6 +50,7 @@
#include <sfx2/viewfrm.hxx>
#include <vcl/wrkwin.hxx>
#include <toolkit/helper/vclunohelper.hxx>
+#include <tools/diagnose_ex.h>
#include <boost/bind.hpp>
@@ -152,6 +153,20 @@ BasicViewFactory::BasicViewFactory (
BasicViewFactory::~BasicViewFactory (void)
{
+ mpViewCache.reset();
+
+ Reference< awt::XWindow > xLocalPaneWindow( mxLocalPane->getWindow() );
+ try
+ {
+ const Reference< XComponent > xLocalPaneComponent( mxLocalPane, UNO_QUERY_THROW );
+ xLocalPaneComponent->dispose();
+ const Reference< XComponent > xWindowComponent( xLocalPaneWindow, UNO_QUERY_THROW );
+ xWindowComponent->dispose();
+ }
+ catch( const Exception& )
+ {
+ DBG_UNHANDLED_EXCEPTION();
+ }
}
commit 5a4fd64f3bf70717384cec7080ebd8e107f58df0
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Sun Feb 13 20:29:47 2011 +0100
debuglevels: use vsnprintf instead of _vsnprintf, otherwise it won't build on unxlngi6.pro+debug
diff --git a/slideshow/source/engine/debug.cxx b/slideshow/source/engine/debug.cxx
index 8f4b4f9..6026218 100644
--- a/slideshow/source/engine/debug.cxx
+++ b/slideshow/source/engine/debug.cxx
@@ -307,7 +307,7 @@ DebugTraceScope::DebugTraceScope (const sal_Char* sFormat, ...)
va_start(args, sFormat);
msMessage[mnBufferSize-1] = 0;
- _vsnprintf(msMessage, mnBufferSize-1, sFormat, args);
+ vsnprintf(msMessage, mnBufferSize-1, sFormat, args);
TRACE_BEGIN("[ %s", msMessage);
va_end(args);
}
commit 61c45a4d4dcff577f8dad6e5592d322d716bae55
Merge: b04b1b1... ae03be4...
Author: Matthias Huetsch [mhu] <matthias.huetsch at oracle.com>
Date: Thu Nov 25 18:25:48 2010 +0100
Update from sibling repository.
diff --cc sd/qa/unoapi/sd.sce
index 84a5216,c964c1b..c964c1b
mode 100644,100644..100755
--- a/sd/qa/unoapi/sd.sce
+++ b/sd/qa/unoapi/sd.sce
diff --cc sd/source/ui/animations/CustomAnimation.src
index 132c15f,adc0c2b..adc0c2b
mode 100644,100644..100755
--- a/sd/source/ui/animations/CustomAnimation.src
+++ b/sd/source/ui/animations/CustomAnimation.src
diff --cc sd/source/ui/func/fupage.cxx
index 52d55d0,207b45d..207b45d
mode 100644,100644..100755
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
commit ae03be4ee5d6f9753be05ec8aa37ec2d48504677
Merge: c746ce1... 068ae12...
Author: Matthias Huetsch [mhu] <matthias.huetsch at oracle.com>
Date: Thu Nov 25 16:04:27 2010 +0100
Update from sibling repository.
commit c746ce155a75de9004b3bce160664b0a055ee7f5
Merge: debebad... 8f1650e...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Fri Jun 25 16:25:27 2010 +0200
Update from master repository (DEV300_m83).
diff --cc sd/source/ui/annotations/annotationmanagerimpl.hxx
index c3d35d0,06e57d7..06e57d7
mode 100755,100755..100644
--- a/sd/source/ui/annotations/annotationmanagerimpl.hxx
+++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx
diff --cc sd/source/ui/app/optsitem.cxx
index 5818626,a5a26f2..a5a26f2
mode 100755,100755..100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
commit 068ae1280c23fef6bca3b8c2aea37b38e45cf389
Merge: 3467e87... e5983ed...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Fri Jun 18 19:04:23 2010 +0200
Update from cloned repository.
commit 3467e878a8ba664f20c2c66c0ad65584005e5c4c
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Fri Jun 18 19:00:23 2010 +0200
Update from master repository (DEV300_m82).
diff --git a/slideshow/source/engine/animationnodes/basenode.hxx b/slideshow/source/engine/animationnodes/basenode.hxx
index eb722d6..12d7e47 100644
--- a/slideshow/source/engine/animationnodes/basenode.hxx
+++ b/slideshow/source/engine/animationnodes/basenode.hxx
@@ -89,7 +89,7 @@ class BaseContainerNode;
file-private accessor methods.
*/
class BaseNode : public AnimationNode,
- protected ::osl::DebugBase<BaseNode>,
+ public ::osl::DebugBase<BaseNode>,
private ::boost::noncopyable
{
public:
diff --git a/slideshow/source/engine/shapes/drawshape.hxx b/slideshow/source/engine/shapes/drawshape.hxx
index e6c5e69..bccd544 100644
--- a/slideshow/source/engine/shapes/drawshape.hxx
+++ b/slideshow/source/engine/shapes/drawshape.hxx
@@ -65,7 +65,7 @@ namespace slideshow
class DrawShape : public AttributableShape,
public DocTreeNodeSupplier,
public HyperlinkArea,
- protected ::osl::DebugBase<DrawShape>
+ public ::osl::DebugBase<DrawShape>
{
public:
/** Create a shape for the given XShape
diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx
index eb8ce0c..3825c65 100644
--- a/slideshow/source/engine/slide/slideimpl.cxx
+++ b/slideshow/source/engine/slide/slideimpl.cxx
@@ -94,7 +94,7 @@ namespace
class SlideImpl : public Slide,
public CursorManager,
public ViewEventHandler,
- protected ::osl::DebugBase<SlideImpl>
+ public ::osl::DebugBase<SlideImpl>
{
public:
SlideImpl( const uno::Reference<drawing::XDrawPage>& xDrawPage,
commit e5983ed4a111a923a2d26a6ffc9b008592849386
Merge: 895f607... 9ebc6cb...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Wed Jun 16 17:09:09 2010 +0200
Update from master repository (DEV300_m82).
commit debebadf1ec83d5080fd6ebabfc67331f2e1de24
Merge: 55d81f8... 9ebc6cb...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Mon Jun 14 10:57:59 2010 +0200
Update from master repository (DEV300_m82).
commit 55d81f8285d8af66638a37cea23e783d9d70e13f
Merge: cf3f1d0... 442e958...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Wed Jun 9 08:39:08 2010 +0200
Update from master repository (DEV300_m81).
commit 895f607d882de5311a3759e378024d0d770b8228
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Mon Jun 7 11:23:04 2010 +0200
Update from master repository (DEV300_m80).
diff --git a/slideshow/source/engine/animationnodes/basenode.hxx b/slideshow/source/engine/animationnodes/basenode.hxx
index eb722d6..12d7e47 100644
--- a/slideshow/source/engine/animationnodes/basenode.hxx
+++ b/slideshow/source/engine/animationnodes/basenode.hxx
@@ -89,7 +89,7 @@ class BaseContainerNode;
file-private accessor methods.
*/
class BaseNode : public AnimationNode,
- protected ::osl::DebugBase<BaseNode>,
+ public ::osl::DebugBase<BaseNode>,
private ::boost::noncopyable
{
public:
diff --git a/slideshow/source/engine/shapes/drawshape.hxx b/slideshow/source/engine/shapes/drawshape.hxx
index e6c5e69..bccd544 100644
--- a/slideshow/source/engine/shapes/drawshape.hxx
+++ b/slideshow/source/engine/shapes/drawshape.hxx
@@ -65,7 +65,7 @@ namespace slideshow
class DrawShape : public AttributableShape,
public DocTreeNodeSupplier,
public HyperlinkArea,
- protected ::osl::DebugBase<DrawShape>
+ public ::osl::DebugBase<DrawShape>
{
public:
/** Create a shape for the given XShape
diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx
index eb8ce0c..3825c65 100644
--- a/slideshow/source/engine/slide/slideimpl.cxx
+++ b/slideshow/source/engine/slide/slideimpl.cxx
@@ -94,7 +94,7 @@ namespace
class SlideImpl : public Slide,
public CursorManager,
public ViewEventHandler,
- protected ::osl::DebugBase<SlideImpl>
+ public ::osl::DebugBase<SlideImpl>
{
public:
SlideImpl( const uno::Reference<drawing::XDrawPage>& xDrawPage,
commit cf3f1d024f59871dea604821daca056e4f87a586
Merge: 0610a32... 969f09e...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Tue Jun 1 16:49:19 2010 +0200
Update from master repository (DEV300_m80).
commit 0610a32ac77c40a4c5bdd29e1bbceb17ad77d7cc
Merge: fd3b0a8... 2db6dc3...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Thu May 27 11:57:25 2010 +0200
Update from master repository (DEV300_m79).
commit fd3b0a8810c1e778aaf1715c07cc5461231fee5a
Merge: 63a65c0... 0eba338...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Thu May 20 18:00:57 2010 +0200
Update from master repository (DEV300_m78).
commit 63a65c00a910a3da68196f5ae0359f91941fcb85
Merge: b6a8cb8... 1d68e3d...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Thu Apr 29 12:07:25 2010 +0200
Update from master repository (DEV300 masterfix).
commit b04b1b1cfd74518f78ee3153dc41124771c59c78
Merge: c65a3b4... 1d68e3d...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Thu Apr 22 15:29:12 2010 +0200
Update from master repository (DEV300m77).
commit b6a8cb8310e55d7b42693ede8b6eafbd71980c3c
Merge: c65a3b4... a73fc34...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Fri Apr 9 16:11:26 2010 +0200
Update from master repository (DEV300_m76).
commit c65a3b4d5ceae61b120faf279487aa862974e013
Merge: 8321082... c7eff9c...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Mon Mar 22 18:41:46 2010 +0100
Update from local repository.
commit c7eff9ca87b170b0284b2b53460e0fdcdc6ac987
Merge: 86574db... c0d4ec8...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Mon Mar 22 17:02:50 2010 +0100
Update from master repository (DEV300_m75).
commit 86574db35425e96cb2155ebb18f46bde36e6707e
Merge: 80954cf... a167c37...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Thu Jan 21 16:52:59 2010 +0100
Update from master repository (to m70).
commit 83210825652e9115a4b1abb0dccdb28ee8369674
Merge: 4427dc7... a2e95eb...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Mon Jan 11 14:29:32 2010 +0100
Update from master repository (to m69).
commit 80954cf443b3cd3f774f31052a7eb63983cf5763
Merge: 94f3ba6... a2e95eb...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Fri Jan 8 18:08:02 2010 +0100
Update from master repository (to m69).
commit 94f3ba6b29581dfc388e5b612ded449382e0dadc
Merge: 38b0d88... 17ffefd...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Mon Jan 4 10:33:53 2010 +0100
Update from master repository (to m68).
commit 38b0d886ec5b324a8bb1cd153ef0c1e4d650750d
Merge: cee2ef4... 52bc22f...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Wed Dec 9 19:54:38 2009 +0100
Update from master repository (to m67).
commit 4427dc70b464607d20e37fb0cc8f2dbef823e206
Merge: cee2ef4... 7e01d3e...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Thu Nov 19 10:02:58 2009 +0100
Update from master repository to m65.
commit 8ca9aec24b0258287bc388c6ace0f7696ea4aa3e
Merge: 93dcdea... 4de9a23...
Author: Andre Fischer<andre.f.fischer <Andre Fischer<andre.f.fischer at oracle.com>
Date: Thu Jan 1 00:00:00 1970 +0000
impress195: rebase to DEV300 m98
commit 93dcdead6fc0ea7f040101accc5369b27cb83836
Author: Andre Fischer<andre.f.fischer <Andre Fischer<andre.f.fischer at oracle.com>
Date: Thu Jan 1 00:00:00 1970 +0000
impress195: #i102142# Fixed order of initialization in constructor.
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
old mode 100755
new mode 100644
index 717a67d..605b6c3
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -141,8 +141,8 @@ BasicViewFactory::BasicViewFactory (
mpViewShellContainer(new ViewShellContainer()),
mpBase(NULL),
mpFrameView(NULL),
- mpViewCache(new ViewCache()),
mpWindow(new WorkWindow(NULL,WB_STDWORK)),
+ mpViewCache(new ViewCache()),
mxLocalPane(new Pane(Reference<XResourceId>(), mpWindow.get()))
{
(void)rxContext;
commit 31cd03fcd35d2f05638efd3740a48b59a9a4c156
Merge: 04f33c8... fbc8e36...
Author: Andre Fischer<andre.f.fischer <Andre Fischer<andre.f.fischer at oracle.com>
Date: Thu Jan 1 00:00:00 1970 +0000
impress195: merge with DEV300_m92
diff --cc sd/source/ui/animations/CustomAnimationDialog.cxx
index f812253,f812253..f812253
mode 100644,100644..100755
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
diff --cc sd/source/ui/annotations/annotations.src
index 369bd02,9dff8d6..9dff8d6
mode 100644,100644..100755
--- a/sd/source/ui/annotations/annotations.src
+++ b/sd/source/ui/annotations/annotations.src
diff --cc sd/source/ui/app/menuids3_tmpl.src
index a7935fe,3d49d1a..3d49d1a
mode 100644,100644..100755
--- a/sd/source/ui/app/menuids3_tmpl.src
+++ b/sd/source/ui/app/menuids3_tmpl.src
diff --cc sd/source/ui/app/menuids4_tmpl.src
index 5cd541b,30dad8f..30dad8f
mode 100644,100644..100755
--- a/sd/source/ui/app/menuids4_tmpl.src
+++ b/sd/source/ui/app/menuids4_tmpl.src
diff --cc sd/source/ui/app/menuids_tmpl.src
index 6e89d6a,a5496dd..a5496dd
mode 100644,100644..100755
--- a/sd/source/ui/app/menuids_tmpl.src
+++ b/sd/source/ui/app/menuids_tmpl.src
diff --cc sd/source/ui/app/popup.src
index 9bd3047,6f30c56..6f30c56
mode 100644,100644..100755
--- a/sd/source/ui/app/popup.src
+++ b/sd/source/ui/app/popup.src
diff --cc sd/source/ui/app/popup2_tmpl.src
index 6bbba0e,f70e309..f70e309
mode 100644,100644..100755
--- a/sd/source/ui/app/popup2_tmpl.src
+++ b/sd/source/ui/app/popup2_tmpl.src
diff --cc sd/source/ui/app/toolbox.src
index 945bb0b,92944c3..92944c3
mode 100644,100644..100755
--- a/sd/source/ui/app/toolbox.src
+++ b/sd/source/ui/app/toolbox.src
diff --cc sd/source/ui/dlg/LayerTabBar.cxx
index 7a0d8e2,7a0d8e2..7a0d8e2
mode 100644,100644..100755
--- a/sd/source/ui/dlg/LayerTabBar.cxx
+++ b/sd/source/ui/dlg/LayerTabBar.cxx
diff --cc sd/source/ui/dlg/navigatr.cxx
index 1a89d95,a32db86..a32db86
mode 100644,100644..100755
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
diff --cc sd/source/ui/slideshow/showwin.cxx
index e2c0945,e2c0945..e2c0945
mode 100644,100644..100755
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
diff --cc sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index 148800c,83d6f47..be981e4
mode 100755,100644..100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
diff --cc sd/source/ui/table/tableobjectbar.cxx
index f31f4f3,6fef867..6fef867
mode 100644,100644..100755
--- a/sd/source/ui/table/tableobjectbar.cxx
+++ b/sd/source/ui/table/tableobjectbar.cxx
diff --cc sd/source/ui/view/drviewsb.cxx
index ae7ec1b,9febd16..9febd16
mode 100644,100644..100755
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
diff --cc sd/source/ui/view/sdruler.cxx
index 2b6a361,2b6a361..2b6a361
mode 100644,100644..100755
--- a/sd/source/ui/view/sdruler.cxx
+++ b/sd/source/ui/view/sdruler.cxx
diff --cc sd/source/ui/view/tabcontr.cxx
index 3a4318a,3a4318a..3a4318a
mode 100644,100644..100755
--- a/sd/source/ui/view/tabcontr.cxx
+++ b/sd/source/ui/view/tabcontr.cxx
commit 04f33c8320b8b942b33cfbae656c0496e64852db
Author: Andre Fischer<andre.f.fischer <Andre Fischer<andre.f.fischer at oracle.com>
Date: Thu Jan 1 00:00:00 1970 +0000
impress195: #158718# Added some checks to validate pointers.
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index 80bd77c..148800c 100755
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -351,7 +351,12 @@ bool SlideSorterController::Command (
{
bool bEventHasBeenHandled = false;
+ if (pWindow == NULL)
+ return false;
+
ViewShell* pViewShell = mrSlideSorter.GetViewShell();
+ if (pViewShell == NULL)
+ return false;
switch (rEvent.GetCommand())
{
@@ -409,12 +414,9 @@ bool SlideSorterController::Command (
if (rEvent.IsMouseEvent())
{
mbIsContextMenuOpen = true;
- if (pViewShell != NULL)
- {
- SfxDispatcher* pDispatcher = pViewShell->GetDispatcher();
- if (pDispatcher != NULL)
- pDispatcher->ExecutePopup(SdResId(nPopupId));
- }
+ SfxDispatcher* pDispatcher = pViewShell->GetDispatcher();
+ if (pDispatcher != NULL)
+ pDispatcher->ExecutePopup(SdResId(nPopupId));
}
else
{
@@ -432,8 +434,9 @@ bool SlideSorterController::Command (
view::SlideSorterView::BBT_SHAPE));
Point aPosition (aBBox.Center());
mbIsContextMenuOpen = true;
- if (pViewShell != NULL)
- pViewShell->GetViewFrame()->GetDispatcher()->ExecutePopup(
+ SfxDispatcher* pDispatcher = pViewShell->GetViewFrame()->GetDispatcher();
+ if (pDispatcher != NULL)
+ pDispatcher->ExecutePopup(
SdResId(nPopupId),
pWindow,
&aPosition);
commit e564619c8abee2ad8c159e8d02282eccbd736d7a
Author: Andre Fischer<andre.f.fischer <Andre Fischer<andre.f.fischer at oracle.com>
Date: Thu Jan 1 00:00:00 1970 +0000
impress195: #i80637# Changed the algorithm for mixing of elements.
diff --git a/slideshow/source/engine/transitions/randomwipe.cxx b/slideshow/source/engine/transitions/randomwipe.cxx
index af0698d..66fd5bf 100644
--- a/slideshow/source/engine/transitions/randomwipe.cxx
+++ b/slideshow/source/engine/transitions/randomwipe.cxx
@@ -68,13 +68,11 @@ RandomWipe::RandomWipe( sal_Int32 nElements, bool randomBars )
m_rect.transform( aTransform );
// mix up:
- for ( sal_Int32 i = (nElements / 2); i--; )
+ for (sal_Int32 nIndex=0; nIndex<nElements; ++nIndex)
{
- const sal_Int32 pos1 = getRandomOrdinal(nElements);
- const sal_Int32 pos2 = getRandomOrdinal(nElements);
- const ::basegfx::B2DPoint point( m_positions[ pos1 ] );
- m_positions[ pos1 ] = m_positions[ pos2 ];
- m_positions[ pos2 ] = point;
+ const sal_Int32 nOtherIndex (getRandomOrdinal(nElements));
+ OSL_ASSERT(nOtherIndex>=0 && nOtherIndex<nElements);
+ ::std::swap(m_positions[nIndex], m_positions[nOtherIndex]);
}
}
commit 59286c879205000503f4c5d9ee7956685969c35b
Author: Andre Fischer<andre.f.fischer <Andre Fischer<andre.f.fischer at oracle.com>
Date: Thu Jan 1 00:00:00 1970 +0000
impress195: #i113720# Break cyclic dependency between DrawController and ModuleController.
diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx
index ef4b8b5..1838a49 100755
--- a/sd/source/ui/framework/module/ModuleController.cxx
+++ b/sd/source/ui/framework/module/ModuleController.cxx
@@ -143,6 +143,10 @@ ModuleController::~ModuleController (void) throw()
void SAL_CALL ModuleController::disposing (void)
{
+ // Break the cyclic reference back to DrawController object
+ mpLoadedFactories.reset();
+ mpResourceToFactoryMap.reset();
+ mxController.clear();
}
commit 7753c939a4944f953d7f96509f6319504ea4c29a
Author: Andre Fischer <af at openoffice.org>
Date: Thu Jul 15 17:09:32 2010 +0200
impress195: #i113169# Reducing default frame duration of animated images to 0.1s
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx
index 9dc82cb..43c3a54 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -491,9 +491,10 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames& o_rFrames,
nWaitTime100thSeconds = 100 * 60 * 60 * 24;
}
- // There are animated GIFs with no WaitTime set. Take 1 sec, then.
+ // There are animated GIFs with no WaitTime set. Take 0.1 sec, the
+ // same duration that is used by the edit view.
if( nWaitTime100thSeconds == 0 )
- nWaitTime100thSeconds = 100;
+ nWaitTime100thSeconds = 10;
o_rFrames.push_back( MtfAnimationFrame( pMtf,
nWaitTime100thSeconds / 100.0 ) );
commit e219e8cbd5cee868988e994471beb49ad214ece3
Author: Andre Fischer <af at openoffice.org>
Date: Wed Jul 14 14:03:14 2010 +0200
impress195: #i112510# Stop leaking task pane FocusManager singleton.
diff --git a/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx b/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
old mode 100644
new mode 100755
index cf9e9bf..37e5668
--- a/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
+++ b/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
@@ -31,9 +31,9 @@
#include "TaskPaneFocusManager.hxx"
#include <vcl/window.hxx>
-#include <vos/mutex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/event.hxx>
+#include <rtl/instance.hxx>
#include <hash_map>
namespace {
@@ -70,16 +70,23 @@ class FocusManager::LinkMap
-FocusManager* FocusManager::spInstance = NULL;
-
-
FocusManager& FocusManager::Instance (void)
{
+ static FocusManager* spInstance = NULL;
+
if (spInstance == NULL)
{
- ::vos::OGuard aGuard (::Application::GetSolarMutex());
+ ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex());
if (spInstance == NULL)
- spInstance = new FocusManager ();
+ {
+ static FocusManager aInstance;
+ OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
+ spInstance = &aInstance;
+ }
+ }
+ else
+ {
+ OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
}
return *spInstance;
}
diff --git a/sd/source/ui/toolpanel/TaskPaneFocusManager.hxx b/sd/source/ui/toolpanel/TaskPaneFocusManager.hxx
old mode 100644
new mode 100755
index 3111b2f..acbe347
--- a/sd/source/ui/toolpanel/TaskPaneFocusManager.hxx
+++ b/sd/source/ui/toolpanel/TaskPaneFocusManager.hxx
@@ -103,7 +103,6 @@ public:
bool TransferFocus (::Window* pSource, const KeyCode& rCode);
private:
- static FocusManager* spInstance;
class LinkMap;
::std::auto_ptr<LinkMap> mpLinks;
commit d4d8dc6d59f9001fa5954e87681a69d789d12fba
Author: Andre Fischer <af at openoffice.org>
Date: Wed Jul 14 13:48:47 2010 +0200
impress195: #i102142# Stop leaking windows.
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index d73efd9..bb0fadc 100755
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -142,7 +142,8 @@ BasicViewFactory::BasicViewFactory (
mpBase(NULL),
mpFrameView(NULL),
mpViewCache(new ViewCache()),
- mxLocalPane(new Pane(Reference<XResourceId>(), new WorkWindow(NULL,WB_STDWORK)))
+ mpWindow(new WorkWindow(NULL,WB_STDWORK)),
+ mxLocalPane(new Pane(Reference<XResourceId>(), mpWindow.get()))
{
(void)rxContext;
}
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx
index 34d2e25..7b03d85 100755
--- a/sd/source/ui/framework/factories/BasicViewFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx
@@ -119,6 +119,7 @@ private:
FrameView* mpFrameView;
class ViewCache;
+ ::boost::shared_ptr<Window> mpWindow;
::boost::shared_ptr<ViewCache> mpViewCache;
css::uno::Reference<css::drawing::framework::XPane> mxLocalPane;
commit 4894f1d43cba7f6d7661537a94428016f0e62c6b
Author: Andre Fischer <af at openoffice.org>
Date: Wed Jul 14 13:35:16 2010 +0200
impress195: #i101808# Allow unused master pages to be deleted in master pages control.
diff --git a/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx
old mode 100644
new mode 100755
index 57b2984..e8e52fe
--- a/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx
+++ b/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx
@@ -227,7 +227,7 @@ void CurrentMasterPagesSelector::Execute (SfxRequest& rRequest)
// i.e. is not used.
SdPage* pMasterPage = GetSelectedMasterPage();
if (pMasterPage != NULL
- && mrDocument.GetMasterPageUserCount(pMasterPage) > 0)
+ && mrDocument.GetMasterPageUserCount(pMasterPage) == 0)
{
// Removing the precious flag so that the following call to
// RemoveUnnessesaryMasterPages() will remove this master page.
More information about the Libreoffice-commits
mailing list