mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renaissance1: merge with DEV300_m84

Browse Source
This commit is contained in:
Andre Fischer
2010-07-01 18:06:39 +02:00
parent 4a33a0f64f 4adb61dc6b
commit df76bfb069
402 changed files with 6146 additions and 11850 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
View File

@@ -65,7 +65,6 @@
#include "ViewShellBase.hxx"
#include "ViewShellImplementation.hxx"
#include "sdattr.hxx"
#include "TaskPaneViewShell.hxx"
#include "FrameView.hxx"
#include "zoomlist.hxx"
#include "sdpage.hxx"
@@ -266,12 +265,7 @@ void SlotManager::FuTemporary (SfxRequest& rRequest)
case SID_ASSIGN_LAYOUT:
{
SFX_REQUEST_ARG (rRequest, pWhatPage, SfxUInt32Item, ID_VAL_WHATPAGE, FALSE);
SFX_REQUEST_ARG (rRequest, pWhatLayout, SfxUInt32Item, ID_VAL_WHATLAYOUT, FALSE);
pShell->mpImpl->AssignLayout(
pDocument->GetSdPage((USHORT)pWhatPage->GetValue(),
mrSlideSorter.GetModel().GetPageType()),
(AutoLayout)pWhatLayout->GetValue());
pShell->mpImpl->AssignLayout( rRequest, mrSlideSorter.GetModel().GetPageType() );
rRequest.Done ();
}
break;
@@ -522,68 +516,6 @@ void SlotManager::GetAttrState (SfxItemSet& rSet)
}
}
void SlotManager::GetCtrlState (SfxItemSet& rSet)
{
if (rSet.GetItemState(SID_RELOAD) != SFX_ITEM_UNKNOWN)
{
// "Letzte Version" vom SFx en/disablen lassen
ViewShell* pShell = mrSlideSorter.GetViewShell();
if (pShell != NULL)
{
SfxViewFrame* pSlideViewFrame = pShell->GetViewFrame();
DBG_ASSERT(pSlideViewFrame!=NULL,
"SlideSorterController::GetCtrlState: ViewFrame not found");
pSlideViewFrame->GetSlotState (SID_RELOAD, NULL, &rSet);
}
}
// Output quality.
if (rSet.GetItemState(SID_OUTPUT_QUALITY_COLOR)==SFX_ITEM_AVAILABLE
||rSet.GetItemState(SID_OUTPUT_QUALITY_GRAYSCALE)==SFX_ITEM_AVAILABLE
||rSet.GetItemState(SID_OUTPUT_QUALITY_BLACKWHITE)==SFX_ITEM_AVAILABLE
||rSet.GetItemState(SID_OUTPUT_QUALITY_CONTRAST)==SFX_ITEM_AVAILABLE)
{
ULONG nMode = mrSlideSorter.GetContentWindow()->GetDrawMode();
UINT16 nQuality = 0;
switch (nMode)
{
case ::sd::ViewShell::OUTPUT_DRAWMODE_COLOR:
nQuality = 0;
break;
case ::sd::ViewShell::OUTPUT_DRAWMODE_GRAYSCALE:
nQuality = 1;
break;
case ::sd::ViewShell::OUTPUT_DRAWMODE_BLACKWHITE:
nQuality = 2;
break;
case ::sd::ViewShell::OUTPUT_DRAWMODE_CONTRAST:
nQuality = 3;
break;
}
rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_COLOR,
(BOOL)(nQuality==0)));
rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_GRAYSCALE,
(BOOL)(nQuality==1)));
rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_BLACKWHITE,
(BOOL)(nQuality==2)));
rSet.Put (SfxBoolItem (SID_OUTPUT_QUALITY_CONTRAST,
(BOOL)(nQuality==3)));
}
if (rSet.GetItemState(SID_MAIL_SCROLLBODY_PAGEDOWN) == SFX_ITEM_AVAILABLE)
{
rSet.Put (SfxBoolItem( SID_MAIL_SCROLLBODY_PAGEDOWN, TRUE));
}
}
void SlotManager::GetMenuState (SfxItemSet& rSet)
{
EditMode eEditMode = mrSlideSorter.GetModel().GetEditMode();
@@ -1198,38 +1130,6 @@ void SlotManager::DuplicateSelectedSlides (SfxRequest& rRequest)
_1));
}
void SlotManager::AssignTransitionEffect (void)
{
model::SlideSorterModel& rModel (mrSlideSorter.GetModel());
// We have to manually select the pages in the document that are
// selected in the slide sorter.
rModel.SynchronizeDocumentSelection();
// #i34011#: Needs review, AF's bugfix is removed here
//rShell.AssignFromSlideChangeWindow(rModel.GetEditMode());
// We have to remove the selection of master pages to not confuse the
// model.
if (rModel.GetEditMode() == EM_MASTERPAGE)
{
SdDrawDocument* pDocument = mrSlideSorter.GetModel().GetDocument();
USHORT nMasterPageCount = pDocument->GetMasterSdPageCount(PK_STANDARD);
for (USHORT nIndex=0; nIndex<nMasterPageCount; nIndex++)
{
SdPage* pPage = pDocument->GetMasterSdPage(nIndex, PK_STANDARD);
if (pPage != NULL)
pPage->SetSelected (FALSE);
}
}
}
void SlotManager::ExecuteCommandAsynchronously (::std::auto_ptr<Command> pCommand)
{
// Ownership of command is (implicitely) transferred to the queue.