summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2010-05-11 11:08:58 +0200
committerIvo Hinkelmann <ihi@openoffice.org>2010-05-11 11:08:58 +0200
commit89ba05fa4e5bd1a5b91f3c57ce9a31660200b4d8 (patch)
tree805814bf295a7dc3187347590dbac2488036e469
parent5bfcdccad80216ef53365fb3ca7697b613738a24 (diff)
parentbf8b1838a7ad9a5895fcbee511985cdfb665c966 (diff)
CWS-TOOLING: integrate CWS impress188
Notes
split repo tag: impress_ooo/DEV300_m78
-rw-r--r--sd/inc/stlpool.hxx2
-rw-r--r--sd/source/core/stlpool.cxx14
-rw-r--r--sd/source/ui/animations/CustomAnimation.src2
-rw-r--r--sd/source/ui/func/fupage.cxx47
-rw-r--r--sd/source/ui/func/fupoor.cxx1
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx37
-rw-r--r--sd/source/ui/unoidl/unoobj.cxx40
7 files changed, 69 insertions, 74 deletions
diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx
index d49d743b6dee..7dfeac99121b 100644
--- a/sd/inc/stlpool.hxx
+++ b/sd/inc/stlpool.hxx
@@ -126,6 +126,8 @@ public:
virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL acquire (void) throw ();
+ virtual void SAL_CALL release (void) throw ();
protected:
void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily );
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index e592ba45a27e..c91fee735954 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -1437,6 +1437,8 @@ void SAL_CALL SdStyleSheetPool::dispose() throw (RuntimeException)
// EndListening( *mpDoc );
mpDoc = 0;
+
+ Clear();
}
}
@@ -1475,3 +1477,15 @@ SdStyleSheetVector SdStyleSheetPool::CreateChildList( SdStyleSheet* pSheet )
}
// --------------------------------------------------------------------
+
+void SAL_CALL SdStyleSheetPool::acquire (void) throw ()
+{
+ SdStyleSheetPoolBase::acquire();
+}
+
+void SAL_CALL SdStyleSheetPool::release (void) throw ()
+{
+ SdStyleSheetPoolBase::release();
+}
+
+// --------------------------------------------------------------------
diff --git a/sd/source/ui/animations/CustomAnimation.src b/sd/source/ui/animations/CustomAnimation.src
index 1320e75d3e36..449107f05c75 100644
--- a/sd/source/ui/animations/CustomAnimation.src
+++ b/sd/source/ui/animations/CustomAnimation.src
@@ -202,7 +202,7 @@ Menu RID_CUSTOMANIMATION_FONTSTYLE_POPUP
MenuItem
{
Identifier = CM_UNDERLINED ;
- Text [ en-US ] = "Underlinded" ;
+ Text [ en-US ] = "Underlined" ;
};
};
};
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index de1dadc3ae43..9fb0007cc72c 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -84,6 +84,7 @@
#include "undoback.hxx"
#include "sdabstdlg.hxx"
#include "sdresid.hxx"
+#include "sdundogr.hxx"
#include "helpids.h"
namespace sd {
@@ -359,6 +360,8 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
( ( (XFillStyleItem*) aMergedAttr.GetItem( XATTR_FILLSTYLE ) )->GetValue() == XFILL_NONE ) ) )
mbPageBckgrdDeleted = TRUE;
+ bool bSetToAllPages = false;
+
// Ask, wether the setting are for the background-page or for the current page
if( !mbMasterPage && bChanges )
{
@@ -374,7 +377,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
aTit,
aTxt );
aQuestionBox.SetImage( QueryBox::GetStandardImage() );
- mbMasterPage = ( RET_YES == aQuestionBox.Execute() );
+ bSetToAllPages = ( RET_YES == aQuestionBox.Execute() );
}
if( mbPageBckgrdDeleted )
@@ -403,6 +406,48 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
pStyleSheet->GetItemSet().Put( *(pTempSet.get()) );
pStyleSheet->Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED));
}
+ else if( bSetToAllPages )
+ {
+ String aComment(SdResId(STR_UNDO_CHANGE_PAGEFORMAT));
+ SfxUndoManager* pUndoMgr = mpDocSh->GetUndoManager();
+ pUndoMgr->EnterListAction(aComment, aComment);
+ SdUndoGroup* pUndoGroup = new SdUndoGroup(mpDoc);
+ pUndoGroup->SetComment(aComment);
+
+ //Set background on all master pages
+ USHORT nMasterPageCount = mpDoc->GetMasterSdPageCount(ePageKind);
+ for (USHORT i = 0; i < nMasterPageCount; ++i)
+ {
+ SdPage *pMasterPage = mpDoc->GetMasterSdPage(i, ePageKind);
+ SdStyleSheet *pStyle =
+ pMasterPage->getPresentationStyle(HID_PSEUDOSHEET_BACKGROUND);
+ StyleSheetUndoAction* pAction =
+ new StyleSheetUndoAction(mpDoc, (SfxStyleSheet*)pStyle, &(*pTempSet.get()));
+ pUndoGroup->AddAction(pAction);
+ pStyle->GetItemSet().Put( *(pTempSet.get()) );
+ pStyle->Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED));
+ }
+
+ //Remove background from all pages to reset to the master bg
+ USHORT nPageCount(mpDoc->GetSdPageCount(ePageKind));
+ for(USHORT i=0; i<nPageCount; ++i)
+ {
+ SdPage *pPage = mpDoc->GetSdPage(i, ePageKind);
+
+ const SfxItemSet& rFillAttributes = pPage->getSdrPageProperties().GetItemSet();
+ if(XFILL_NONE != ((const XFillStyleItem&)rFillAttributes.Get(XATTR_FILLSTYLE)).GetValue())
+ {
+ SdBackgroundObjUndoAction *pBackgroundObjUndoAction = new SdBackgroundObjUndoAction(*mpDoc, *pPage, rFillAttributes);
+ pUndoGroup->AddAction(pBackgroundObjUndoAction);
+ pPage->getSdrPageProperties().PutItem(XFillStyleItem(XFILL_NONE));
+ pPage->ActionChanged();
+ }
+ }
+
+ pUndoMgr->AddUndoAction(pUndoGroup);
+ pUndoMgr->LeaveListAction();
+
+ }
const SfxPoolItem *pItem;
if( SFX_ITEM_SET == pTempSet->GetItemState( EE_PARA_WRITINGDIR, sal_False, &pItem ) )
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index bb6f6e7b6908..c1df44e52677 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -104,6 +104,7 @@ FuPoor::FuPoor (
bNoScrollUntilInside (TRUE),
bScrollable (FALSE),
bDelayActive (FALSE),
+ bFirstMouseMove (FALSE),
// #95491# remember MouseButton state
mnCode(0)
{
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index d58cfcb3f6c9..0afcb7df053b 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -51,7 +51,8 @@
#include <sfx2/imagemgr.hxx>
#include <sfx2/request.hxx>
-#include "sfx2/docfile.hxx"
+#include <sfx2/docfile.hxx>
+#include <sfx2/app.hxx>
#include <svx/unoapi.hxx>
#include <svx/svdoole2.hxx>
@@ -3472,39 +3473,11 @@ void SAL_CALL SlideshowImpl::gotoNextSlide( ) throw (RuntimeException)
{
if( maPresSettings.mnPauseTimeout )
{
- boost::scoped_ptr< Graphic > pGraphic;
-
- if( maPresSettings.mbShowPauseLogo )
+ if( mpShowWindow )
{
- // load about image from module path
- String aBmpFileName( RTL_CONSTASCII_USTRINGPARAM("about.bmp") );
- INetURLObject aObj( SvtPathOptions().GetModulePath(), INET_PROT_FILE );
- aObj.insertName( aBmpFileName );
- SvFileStream aStrm( aObj.PathToFileName(), STREAM_STD_READ );
- if ( !aStrm.GetError() )
- {
- Bitmap aBmp;
- aStrm >> aBmp;
- pGraphic.reset( new Graphic(aBmp) );
- pGraphic->SetPrefMapMode(MAP_PIXEL);
- }
- else
- {
- //if no image is located in the module path
- //use default logo from iso resource:
-
- String aMgrName( RTL_CONSTASCII_USTRINGPARAM( "iso" ) );
- boost::scoped_ptr< ResMgr > pResMgr( ResMgr::CreateResMgr( U2S( aMgrName )) );
- DBG_ASSERT(pResMgr,"No ResMgr found");
- if(pResMgr.get())
- {
- pGraphic.reset( new Graphic( Bitmap( ResId( RID_DEFAULT_ABOUT_BMP_LOGO, *pResMgr ) ) ) );
- pGraphic->SetPrefMapMode(MAP_PIXEL);
- }
- }
+ Graphic aGraphic( SfxApplication::GetApplicationLogo().GetBitmapEx() );
+ mpShowWindow->SetPauseMode( 0, maPresSettings.mnPauseTimeout, &aGraphic );
}
- if( mpShowWindow )
- mpShowWindow->SetPauseMode( 0, maPresSettings.mnPauseTimeout, pGraphic.get() );
}
else
{
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 54c3f88a6916..d4ea1dce196f 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -737,22 +737,6 @@ void SAL_CALL SdXShape::setPropertyValue( const ::rtl::OUString& aPropertyName,
aAny <<= aName;
}
}
- else if( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_shape_zorder ) ) )
- {
- SdrObject* pObj = mpShape->GetSdrObject();
- SdPage* pPage = pObj ? (SdPage*)pObj->GetPage() : NULL;
- if( pPage && pPage == pObj->GetObjList() && pPage->IsMasterPage() && pPage->GetPageKind() == PK_STANDARD )
- {
- sal_Int32 nOrdNum;
- if( aAny >>= nOrdNum )
- {
- // if this is a masterpage, there is always a background shape with the ord num 0
- // so we add one to the api ordnum to hide the background shape over the api
- nOrdNum++;
- aAny <<= nOrdNum;
- }
- }
- }
mpShape->_setPropertyValue(aPropertyName, aAny);
}
@@ -910,30 +894,6 @@ void SAL_CALL SdXShape::setPropertyValue( const ::rtl::OUString& aPropertyName,
aRet <<= aName;
}
}
- else if( PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_shape_zorder ) ) )
- {
- SdrObject* pObj = mpShape->GetSdrObject();
- SdPage* pPage = pObj ? (SdPage*)pObj->GetPage() : NULL;
- if( pPage && pPage == pObj->GetObjList() && pPage->IsMasterPage() && pPage->GetPageKind() == PK_STANDARD )
- {
- sal_Int32 nOrdNum;
- if( aRet >>= nOrdNum )
- {
- // if this is a masterpage, there is always a background shape with the ord num 0
- // so we add one to the api ordnum to hide the background shape over the api
- if( nOrdNum > 0 )
- {
- nOrdNum--;
- aRet <<= nOrdNum;
- }
- else
- {
- DBG_ERROR( "Masterpage without a background shape, ZOrder property will be corrupt!" );
- }
- }
- }
- }
-
}
return aRet;