diff options
-rw-r--r-- | sd/source/core/stlpool.cxx | 3 | ||||
-rw-r--r-- | sd/source/ui/framework/module/ModuleController.cxx | 4 | ||||
-rwxr-xr-x | sd/source/ui/func/fuhhconv.cxx | 10 | ||||
-rw-r--r-- | sd/source/ui/presenter/PresenterTextView.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 5 | ||||
-rwxr-xr-x[-rw-r--r--] | sd/source/ui/toolpanel/TaskPaneFocusManager.cxx | 19 | ||||
-rwxr-xr-x[-rw-r--r--] | sd/source/ui/toolpanel/TaskPaneFocusManager.hxx | 1 | ||||
-rwxr-xr-x | sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx | 2 | ||||
-rw-r--r-- | slideshow/source/engine/animationnodes/basenode.hxx | 2 | ||||
-rw-r--r-- | slideshow/source/engine/debug.cxx | 2 | ||||
-rw-r--r-- | slideshow/source/engine/shapes/drawshape.hxx | 2 | ||||
-rw-r--r-- | slideshow/source/engine/shapes/gdimtftools.cxx | 5 | ||||
-rw-r--r-- | slideshow/source/engine/slide/slideimpl.cxx | 2 |
13 files changed, 39 insertions, 20 deletions
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index b097563bcbef..c5f36fe94791 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -1033,6 +1033,9 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet, { SvxNumberFormat aFrmt( pDefaultRule->GetLevel(i) ); aFrmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL); + // #i93908# clear suffix for bullet lists + aFrmt.SetPrefix(::rtl::OUString()); + aFrmt.SetSuffix(::rtl::OUString()); aFrmt.SetStart(1); aFrmt.SetBulletRelSize(45); aFrmt.SetBulletChar( 0x25CF ); // StarBats: 0xF000 + 34 diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx index 8424d1f5d6ff..442b78eac6f2 100644 --- a/sd/source/ui/framework/module/ModuleController.cxx +++ b/sd/source/ui/framework/module/ModuleController.cxx @@ -144,6 +144,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(); } diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx index 7af85364efad..e751dbb6a8cf 100755 --- a/sd/source/ui/func/fuhhconv.cxx +++ b/sd/source/ui/func/fuhhconv.cxx @@ -204,11 +204,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 d8126597b4a2..4562a477c40d 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -499,7 +499,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; diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 4cc101990807..0d2e49d31e97 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -373,7 +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 --git a/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx b/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx index d2686189afac..cd65382254aa 100644..100755 --- a/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx +++ b/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx @@ -32,9 +32,9 @@ #include "TaskPaneFocusManager.hxx" #include <vcl/window.hxx> -#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/event.hxx> +#include <rtl/instance.hxx> #include <boost/unordered_map.hpp> namespace { @@ -71,16 +71,23 @@ class FocusManager::LinkMap -FocusManager* FocusManager::spInstance = NULL; - - FocusManager& FocusManager::Instance (void) { + static FocusManager* spInstance = NULL; + if (spInstance == NULL) { - SolarMutexGuard aGuard; + ::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 index fbb87f8d66fe..95ba137ad486 100644..100755 --- a/sd/source/ui/toolpanel/TaskPaneFocusManager.hxx +++ b/sd/source/ui/toolpanel/TaskPaneFocusManager.hxx @@ -104,7 +104,6 @@ public: bool TransferFocus (::Window* pSource, const KeyCode& rCode); private: - static FocusManager* spInstance; class LinkMap; ::std::auto_ptr<LinkMap> mpLinks; diff --git a/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx index e26251dc1e76..ac701d484bbf 100755 --- a/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx @@ -228,7 +228,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. diff --git a/slideshow/source/engine/animationnodes/basenode.hxx b/slideshow/source/engine/animationnodes/basenode.hxx index 6f4a6d9c47b3..ad2d09a59e78 100644 --- a/slideshow/source/engine/animationnodes/basenode.hxx +++ b/slideshow/source/engine/animationnodes/basenode.hxx @@ -90,7 +90,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/debug.cxx b/slideshow/source/engine/debug.cxx index a0dbe58cb7ec..bc5f24f95509 100644 --- a/slideshow/source/engine/debug.cxx +++ b/slideshow/source/engine/debug.cxx @@ -308,7 +308,7 @@ DebugTraceScope::DebugTraceScope (const sal_Char* sFormat, ...) va_start(args, sFormat); msMessage[mnBufferSize-1] = 0; - snprintf(msMessage, mnBufferSize-1, sFormat, args); + vsnprintf(msMessage, mnBufferSize-1, sFormat, args); TRACE_BEGIN("[ %s", msMessage); va_end(args); } diff --git a/slideshow/source/engine/shapes/drawshape.hxx b/slideshow/source/engine/shapes/drawshape.hxx index a657d337064e..1800ab3a5fe8 100644 --- a/slideshow/source/engine/shapes/drawshape.hxx +++ b/slideshow/source/engine/shapes/drawshape.hxx @@ -66,7 +66,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/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx index dec32a95262d..9e914c41c088 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 ) ); diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index 82f0792abd36..eb2ee6c1bc57 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -97,7 +97,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, |