Skip to content

C
core
Kaydet (Commit) 9cc5a08e authored tarafından Christian Lippka's avatar Christian Lippka
Dosyalara gözat
Seçenekler

cws impress190: merging

üst 73637454 0cd8711b
Hide whitespace changes
Inline Side-by-side
Showing with 126 additions and 96 deletions
sd/inc/Outliner.hxx
Dosyayı görüntüle @ 9cc5a08e
......@@ -136,6 +136,9 @@ public:
*/
void StartSpelling (void);
/** Proxy for method from base class to avoid compiler warning */
void StartSpelling(EditView&, unsigned char);
/** Initiate a find and/or replace on the next relevant text object.
@return
Returns </TRUE> when the search/replace is finished (as
......
sd/inc/stlpool.hxx
Dosyayı görüntüle @ 9cc5a08e
......@@ -124,6 +124,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 );
......
sd/qa/unoapi/sd.sce
Dosyayı görüntüle @ 9cc5a08e
-o sd.AccessibleDrawDocumentView
-o sd.AccessibleOutlineView
#i111199 -o sd.AccessibleOutlineView
#i35935# -o sd.AccessibleSlideView
-o sd.DrawController_DrawView
-o sd.DrawController_HandoutView
-o sd.DrawController_NotesView
-o sd.DrawController_OutlineView
-o sd.DrawController_PresentationView
#i111042# -o sd.DrawController_DrawView
#i111042# -o sd.DrawController_HandoutView
#i111042# -o sd.DrawController_NotesView
#i111043# -o sd.DrawController_OutlineView
#i111042# -o sd.DrawController_PresentationView
-o sd.SdDocLinkTargets
-o sd.SdDrawPage
-o sd.SdDrawPagesAccess
......@@ -16,7 +16,7 @@
-o sd.SdMasterPagesAccess
-o sd.SdPageLinkTargets
-o sd.SdXCustomPresentation
-o sd.SdXCustomPresentationAccess
#i111329 -o sd.SdXCustomPresentationAccess
#i84994# -o sd.SdXImpressDocument
-o sd.SdXPresentation
#i87746 -o sd.SdXShape
......
sd/source/core/stlpool.cxx
Dosyayı görüntüle @ 9cc5a08e
......@@ -1387,6 +1387,8 @@ void SAL_CALL SdStyleSheetPool::dispose() throw (RuntimeException)
// EndListening( *mpDoc );
mpDoc = 0;
Clear();
}
}
......@@ -1425,3 +1427,15 @@ SdStyleSheetVector SdStyleSheetPool::CreateChildList( SdStyleSheet* pSheet )
}
// --------------------------------------------------------------------
void SAL_CALL SdStyleSheetPool::acquire (void) throw ()
{
SdStyleSheetPoolBase::acquire();
}
void SAL_CALL SdStyleSheetPool::release (void) throw ()
{
SdStyleSheetPoolBase::release();
}
// --------------------------------------------------------------------
sd/source/filter/eppt/epptso.cxx
Dosyayı görüntüle @ 9cc5a08e
......@@ -5341,6 +5341,12 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
pClientTextBox->Write( pOut->GetData(), pOut->Tell() );
delete pOut, aTextRule.pOut = NULL;
}
if ( aExtBu.Tell() )
{
if ( !pClientData )
pClientData = new SvMemoryStream( 0x200, 0x200 );
ImplProgTagContainer( pClientData, &aExtBu );
}
}
}
}
......
sd/source/ui/animations/CustomAnimation.src
Dosyayı görüntüle @ 9cc5a08e
......@@ -202,7 +202,7 @@ Menu RID_CUSTOMANIMATION_FONTSTYLE_POPUP
MenuItem
{
Identifier = CM_UNDERLINED ;
Text [ en-US ] = "Underlinded" ;
Text [ en-US ] = "Underlined" ;
};
};
};
......
sd/source/ui/func/fupage.cxx
Dosyayı görüntüle @ 9cc5a08e
......@@ -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 ) )
......
sd/source/ui/func/fupoor.cxx
Dosyayı görüntüle @ 9cc5a08e
......@@ -104,6 +104,7 @@ FuPoor::FuPoor (
bNoScrollUntilInside (TRUE),
bScrollable (FALSE),
bDelayActive (FALSE),
bFirstMouseMove (FALSE),
// #95491# remember MouseButton state
mnCode(0)
{
......
sd/source/ui/func/makefile.mk
Dosyayı görüntüle @ 9cc5a08e
......@@ -157,7 +157,6 @@ LIB3OBJFILES= \
$(SLO)$/fuolbull.obj \
$(SLO)$/fucopy.obj \
$(SLO)$/fulink.obj \
$(SLO)$/fuspell.obj \
$(SLO)$/futhes.obj \
$(SLO)$/fusearch.obj \
$(SLO)$/fuinsfil.obj \
......
sd/source/ui/slideshow/slideshowimpl.cxx
Dosyayı görüntüle @ 9cc5a08e
......@@ -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
{
......
sd/source/ui/unoidl/unoobj.cxx
Dosyayı görüntüle @ 9cc5a08e
......@@ -729,22 +729,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);
}
......@@ -902,30 +886,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;
......
sd/source/ui/view/Outliner.cxx
Dosyayı görüntüle @ 9cc5a08e
......@@ -318,6 +318,11 @@ void Outliner::StartSpelling (void)
mpSearchItem = NULL;
}
/** Proxy for method from base class to avoid compiler warning */
void Outliner::StartSpelling(EditView& rView, unsigned char c)
{
SdrOutliner::StartSpelling( rView, c );
}
/** Free all resources acquired during the search/spell check. After a
spell check the start position is restored here.
......
sd/source/ui/view/drviews1.cxx
Dosyayı görüntüle @ 9cc5a08e
......@@ -153,12 +153,32 @@ void DrawViewShell::Deactivate(BOOL bIsMDIActivate)
ViewShell::Deactivate(bIsMDIActivate);
}
namespace
{
class LockUI
{
private:
void Lock(bool bLock);
SfxViewFrame *mpFrame;
public:
LockUI(SfxViewFrame *pFrame) : mpFrame(pFrame) { Lock(true); }
~LockUI() { Lock(false); }
};
void LockUI::Lock(bool bLock)
{
if (!mpFrame)
return;
mpFrame->Enable( !bLock );
}
}
/*************************************************************************
|*
|* Wird gerufen, wenn sich der Selektionszustand der View aendert
|*
\************************************************************************/
void DrawViewShell::SelectionHasChanged (void)
{
Invalidate();
......@@ -212,6 +232,8 @@ void DrawViewShell::SelectionHasChanged (void)
// we need to deselect it now
if (!pOleObj)
{
//#i47279# disable frame until after object has completed unload
LockUI aUILock(GetViewFrame());
pIPClient->DeactivateObject();
//HMHmpDrView->ShowMarkHdl();
}
......
sd/uiconfig/sdraw/menubar/menubar.xml
Dosyayı görüntüle @ 9cc5a08e
......@@ -75,14 +75,14 @@
</menu:menu>
<menu:menu menu:id=".uno:ViewMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:PageMode"/>
<menu:menuitem menu:id=".uno:MasterPage"/>
<menu:menuitem menu:id=".uno:PageMode" menu:style="radio"/>
<menu:menuitem menu:id=".uno:MasterPage" menu:style="radio"/>
<menu:menuseparator/>
<menu:menu menu:id=".uno:DisplayQualityMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:OutputQualityColor"/>
<menu:menuitem menu:id=".uno:OutputQualityGrayscale"/>
<menu:menuitem menu:id=".uno:OutputQualityBlackWhite"/>
<menu:menuitem menu:id=".uno:OutputQualityColor" menu:style="radio"/>
<menu:menuitem menu:id=".uno:OutputQualityGrayscale" menu:style="radio"/>
<menu:menuitem menu:id=".uno:OutputQualityBlackWhite" menu:style="radio"/>
</menu:menupopup>
</menu:menu>
<menu:menuseparator/>
......
sd/uiconfig/simpress/menubar/menubar.xml
Dosyayı görüntüle @ 9cc5a08e
......@@ -76,12 +76,12 @@
</menu:menu>
<menu:menu menu:id=".uno:ViewMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:NormalMultiPaneGUI"/>
<menu:menuitem menu:id=".uno:OutlineMode"/>
<menu:menuitem menu:id=".uno:DiaMode"/>
<menu:menuitem menu:id=".uno:NormalMultiPaneGUI" menu:style="radio"/>
<menu:menuitem menu:id=".uno:OutlineMode" menu:style="radio"/>
<menu:menuitem menu:id=".uno:DiaMode" menu:style="radio"/>
<menu:menuitem menu:id=".uno:Presentation"/>
<menu:menuitem menu:id=".uno:NotesMode"/>
<menu:menuitem menu:id=".uno:HandoutMode"/>
<menu:menuitem menu:id=".uno:NotesMode" menu:style="radio"/>
<menu:menuitem menu:id=".uno:HandoutMode" menu:style="radio"/>
<menu:menuseparator/>
<menu:menu menu:id=".uno:MasterPageMenu">
<menu:menupopup>
......@@ -93,9 +93,9 @@
</menu:menu>
<menu:menu menu:id=".uno:DisplayQualityMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:OutputQualityColor"/>
<menu:menuitem menu:id=".uno:OutputQualityGrayscale"/>
<menu:menuitem menu:id=".uno:OutputQualityBlackWhite"/>
<menu:menuitem menu:id=".uno:OutputQualityColor" menu:style="radio"/>
<menu:menuitem menu:id=".uno:OutputQualityGrayscale" menu:style="radio"/>
<menu:menuitem menu:id=".uno:OutputQualityBlackWhite" menu:style="radio"/>
</menu:menupopup>
</menu:menu>
<menu:menuseparator/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment