summaryrefslogtreecommitdiff
path: root/sd/source/ui/view
diff options
context:
space:
mode:
authorChristian Lippka <christian.lippka@sun.com>2010-06-14 18:49:32 +0200
committerChristian Lippka <christian.lippka@sun.com>2010-06-14 18:49:32 +0200
commitdefcfcf416a0d25c104e8f492e14049814db51e2 (patch)
tree9ab15168771fa958b32a58b4656041343b9b7732 /sd/source/ui/view
parentf3b2db1efb379596f0269e439a35b5575b616b2c (diff)
parentf7a274b959bef49abf7f3ff45137d03c041f4a6d (diff)
cws impress190: rebase m82
Diffstat (limited to 'sd/source/ui/view')
-rwxr-xr-xsd/source/ui/view/Outliner.cxx64
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/OutlinerIterator.cxx36
-rwxr-xr-xsd/source/ui/view/ToolBarManager.cxx98
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx66
-rwxr-xr-xsd/source/ui/view/ViewShellImplementation.cxx42
-rwxr-xr-xsd/source/ui/view/ViewShellManager.cxx207
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/bmcache.cxx109
-rwxr-xr-xsd/source/ui/view/drviews1.cxx1
-rwxr-xr-xsd/source/ui/view/drviews2.cxx42
-rwxr-xr-xsd/source/ui/view/drviews6.cxx26
-rwxr-xr-xsd/source/ui/view/drviewsa.cxx15
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/grviewsh.cxx18
-rw-r--r--sd/source/ui/view/makefile.mk1
-rwxr-xr-xsd/source/ui/view/outlnvsh.cxx25
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/outlview.cxx2
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/sdview.cxx83
-rwxr-xr-xsd/source/ui/view/sdview4.cxx5
-rwxr-xr-xsd/source/ui/view/sdwindow.cxx29
-rw-r--r--sd/source/ui/view/showview.cxx170
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/viewshe2.cxx40
-rwxr-xr-xsd/source/ui/view/viewshel.cxx8
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/zoomlist.cxx13
22 files changed, 5 insertions, 1095 deletions
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index fd07d966ad47..356c03b82387 100755
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -427,23 +427,6 @@ BOOL Outliner::SpellNextDocument (void)
}
-void Outliner::HandleOutsideChange (ChangeHint eHint)
-{
- switch (eHint)
- {
- case CH_VIEW_SHELL_INVALID:
- EndSpelling();
- mbPrepareSpellingPending = true;
- mbViewShellValid = false;
- break;
-
- case CH_VIEW_SHELL_VALID:
- mbViewShellValid = true;
- break;
- }
-}
-
-
/*************************************************************************
|*
@@ -1088,23 +1071,6 @@ void Outliner::EndOfSearch (void)
}
}
-
-
-
-void Outliner::InitPage (USHORT nPageIndex)
-{
- (void)nPageIndex;
-
- ::sd::outliner::IteratorPosition aPosition (*maObjectIterator);
- if (aPosition.meEditMode == EM_PAGE)
- mnPageCount = mpDrawDocument->GetSdPageCount(aPosition.mePageKind);
- else
- mnPageCount = mpDrawDocument->GetMasterSdPageCount(aPosition.mePageKind);
-}
-
-
-
-
void Outliner::ShowEndOfSearchDialog (void)
{
String aString;
@@ -1487,36 +1453,6 @@ bool Outliner::HandleFailedSearch (void)
}
-#if ENABLE_LAYOUT
-#define SvxSearchDialog Window
-#endif
-
-/** See task #95227# for discussion about correct parent for dialogs/info boxes.
-*/
-::Window* Outliner::GetParentForDialog (void)
-{
- ::Window* pParent = NULL;
-
- if (meMode == SEARCH)
- pParent = static_cast<SvxSearchDialog*>(
- SfxViewFrame::Current()->GetChildWindow(
- SvxSearchDialogWrapper::GetChildWindowId())->GetWindow());
-
- if (pParent == NULL)
- pParent = mpViewShell->GetActiveWindow();
-
- if (pParent == NULL)
- pParent = Application::GetDefDialogParent();
- //1.30->1.31 of sdoutl.cxx pParent = Application::GetDefModalDialogParent();
-
- return pParent;
-}
-
-#if ENABLE_LAYOUT
-#undef SvxSearchDialog
-#endif
-
-
SdrObject* Outliner::SetObject (
const ::sd::outliner::IteratorPosition& rPosition)
{
diff --git a/sd/source/ui/view/OutlinerIterator.cxx b/sd/source/ui/view/OutlinerIterator.cxx
index 81f9a50d256d..226d767c6c91 100644..100755
--- a/sd/source/ui/view/OutlinerIterator.cxx
+++ b/sd/source/ui/view/OutlinerIterator.cxx
@@ -67,15 +67,6 @@ IteratorPosition::IteratorPosition (const IteratorPosition& aPosition)
{
}
-IteratorPosition::IteratorPosition (SdrObject* pObject, sal_Int32 nText, sal_Int32 nPageIndex, PageKind ePageKind, EditMode eEditMode)
-: mxObject(pObject)
-, mnText(nText)
-, mnPageIndex(nPageIndex)
-, mePageKind(ePageKind)
-, meEditMode(eEditMode)
-{
-}
-
IteratorPosition::~IteratorPosition (void)
{
}
@@ -119,11 +110,6 @@ Iterator::Iterator (IteratorImplBase* pObject)
mpIterator = pObject;
}
-Iterator::Iterator (const IteratorImplBase& rObject)
-{
- mpIterator = rObject.Clone();
-}
-
Iterator::~Iterator (void)
{
delete mpIterator;
@@ -266,28 +252,6 @@ Iterator OutlinerContainer::CreateSelectionIterator (
rObjectList, nObjectIndex, pDocument, rpViewShell, bDirectionIsForward));
}
-Iterator OutlinerContainer::CreateViewIterator (
- SdDrawDocument* pDocument,
- const ::boost::shared_ptr<ViewShell>& rpViewShell,
- bool bDirectionIsForward,
- IteratorLocation aLocation)
-{
- OSL_ASSERT(rpViewShell.get());
-
- const ::boost::shared_ptr<DrawViewShell> pDrawViewShell(
- ::boost::dynamic_pointer_cast<DrawViewShell>(rpViewShell));
- sal_Int32 nPageIndex = GetPageIndex (
- pDocument,
- rpViewShell,
- pDrawViewShell.get() ? pDrawViewShell->GetPageKind() : PK_STANDARD,
- pDrawViewShell.get() ? pDrawViewShell->GetEditMode() : EM_PAGE,
- bDirectionIsForward,
- aLocation);
-
- return Iterator (new ViewIteratorImpl (
- nPageIndex, pDocument, rpViewShell, bDirectionIsForward));
-}
-
Iterator OutlinerContainer::CreateDocumentIterator (
SdDrawDocument* pDocument,
const ::boost::shared_ptr<ViewShell>& rpViewShell,
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index 4919a9fe2bbb..ce3064392d40 100755
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -119,10 +119,9 @@ private:
/** Manage tool bars that are implemented as sub shells of a view shell.
The typical procedure of updating the sub shells of a view shell is to
rebuild a list of sub shells that the caller would like to have active.
- The methods ClearGroup(), AddShellId(), and RemoveShellId() allow the
- caller to do that. A final call to UpdateShells() activates the
- requested shells that are not active and deactivates the active shells
- that are not requested.
+ The methods ClearGroup() and AddShellId() allow the caller to do that. A
+ final call to UpdateShells() activates the requested shells that are not
+ active and deactivates the active shells that are not requested .
This is done by maintaining two lists. One (the current list)
reflects the current state. The other (the requested list) contains the
@@ -157,18 +156,6 @@ public:
*/
void AddShellId (sd::ToolBarManager::ToolBarGroup eGroup, sd::ShellId nId);
- /** Remove a shell. This is done only when the specified shell is a
- member of the specified group. If it has been requested for another
- group or if it has not been requested then this call is ignored.
- @param eGroup
- The group from which to remove the shell.
- @param nId
- The id of the shell to remove.
- @return
- Returns whether the shell is removed.
- */
- bool RemoveShellId (sd::ToolBarManager::ToolBarGroup eGroup, sd::ShellId nId);
-
/** Releasing all shells means that the given ToolBarRules object is
informed that every shell mananged by the called ToolBarShellList is
about to be removed and that the associated framework tool bars can
@@ -296,7 +283,6 @@ public:
void AddToolBar (ToolBarGroup eGroup, const ::rtl::OUString& rsToolBarName);
void AddToolBarShell (ToolBarGroup eGroup, ShellId nToolBarId);
void RemoveToolBar (ToolBarGroup eGroup, const ::rtl::OUString& rsToolBarName);
- void RemoveToolBarShell (ToolBarGroup eGroup, ShellId nToolBarId);
/** Release all tool bar shells and the associated framework tool bars.
Typically called when the main view shell is being replaced by
@@ -332,7 +318,6 @@ public:
};
void LockViewShellManager (void);
- bool IsUpdateLocked (void) const;
void LockUpdate (void);
void UnlockUpdate (void);
@@ -430,15 +415,6 @@ void ToolBarManager::Shutdown (void)
-void ToolBarManager::SetValid (bool bValid)
-{
- if (mpImpl.get() != NULL)
- mpImpl->SetValid(bValid);
-}
-
-
-
-
void ToolBarManager::ResetToolBars (ToolBarGroup eGroup)
{
if (mpImpl.get() != NULL)
@@ -505,20 +481,6 @@ void ToolBarManager::RemoveToolBar (
-void ToolBarManager::RemoveToolBarShell (
- ToolBarGroup eGroup,
- ShellId nToolBarId)
-{
- if (mpImpl.get() != NULL)
- {
- UpdateLock aLock (shared_from_this());
- mpImpl->RemoveToolBarShell(eGroup,nToolBarId);
- }
-}
-
-
-
-
void ToolBarManager::SetToolBar (
ToolBarGroup eGroup,
const ::rtl::OUString& rsToolBarName)
@@ -576,17 +538,6 @@ void ToolBarManager::LockViewShellManager (void)
-bool ToolBarManager::IsUpdateLocked (void) const
-{
- if (mpImpl.get() != NULL)
- return mpImpl->IsUpdateLocked();
- else
- return false;
-}
-
-
-
-
void ToolBarManager::LockUpdate (void)
{
if (mpImpl.get()!=NULL)
@@ -819,21 +770,6 @@ void ToolBarManager::Implementation::AddToolBarShell (
-void ToolBarManager::Implementation::RemoveToolBarShell (
- ToolBarGroup eGroup,
- ShellId nToolBarId)
-{
- ViewShell* pMainViewShell = mrBase.GetMainViewShell().get();
- if (pMainViewShell != NULL)
- {
- GetToolBarRules().SubShellRemoved(eGroup, nToolBarId);
- maToolBarShellList.RemoveShellId(eGroup,nToolBarId);
- }
-}
-
-
-
-
void ToolBarManager::Implementation::ReleaseAllToolBarShells (void)
{
maToolBarShellList.ReleaseAllShells(GetToolBarRules());
@@ -946,14 +882,6 @@ void ToolBarManager::Implementation::LockViewShellManager (void)
-bool ToolBarManager::Implementation::IsUpdateLocked (void) const
-{
- return mnLockCount;
-}
-
-
-
-
void ToolBarManager::Implementation::LockUpdate (void)
{
#ifdef VERBOSE
@@ -1705,26 +1633,6 @@ void ToolBarShellList::AddShellId (sd::ToolBarManager::ToolBarGroup eGroup, sd::
-bool ToolBarShellList::RemoveShellId (sd::ToolBarManager::ToolBarGroup eGroup, sd::ShellId nId)
-{
- bool bRemoved (false);
-
- GroupedShellList::iterator iDescriptor (maNewList.find(ShellDescriptor(nId,eGroup)));
- if (iDescriptor != maNewList.end())
- {
- if (iDescriptor->meGroup == eGroup)
- {
- maNewList.erase(iDescriptor);
- bRemoved = true;
- }
- }
-
- return bRemoved;
-}
-
-
-
-
void ToolBarShellList::ReleaseAllShells (ToolBarRules& rRules)
{
// Release the currently active tool bars.
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 14da3ea1a526..1e18ad5c5ee9 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -164,8 +164,6 @@ public:
::boost::shared_ptr<FormShellManager> mpFormShellManager;
- ::boost::shared_ptr<CustomHandleManager> mpCustomHandleManager;
-
Implementation (ViewShellBase& rBase);
~Implementation (void);
@@ -461,13 +459,6 @@ ViewShellBase* ViewShellBase::GetViewShellBase (SfxViewFrame* pViewFrame)
-void ViewShellBase::GetMenuState (SfxItemSet& )
-{
-}
-
-
-
-
DrawDocShell* ViewShellBase::GetDocShell (void) const
{
return mpDocShell;
@@ -713,21 +704,6 @@ ErrCode ViewShellBase::DoPrint (
-USHORT ViewShellBase::SetPrinterOptDlg (
- SfxPrinter* pNewPrinter,
- USHORT nDiffFlags,
- BOOL bShowDialog)
-{
- (void)pNewPrinter;
- (void)nDiffFlags;
- (void)bShowDialog;
- return 0;
- // return mpImpl->mpPrintManager->SetPrinterOptDlg ( pNewPrinter, nDiffFlags, bShowDialog);
-}
-
-
-
-
void ViewShellBase::PreparePrint (PrintDialog* pPrintDialog)
{
SfxViewShell::PreparePrint (pPrintDialog);
@@ -1246,18 +1222,6 @@ void ViewShellBase::SetViewTabBar (const ::rtl::Reference<ViewTabBar>& rViewTabB
}
-
-
-CustomHandleManager& ViewShellBase::getCustomHandleManager() const
-{
- OSL_ASSERT(mpImpl.get()!=NULL);
-
- if( !mpImpl->mpCustomHandleManager.get() )
- mpImpl->mpCustomHandleManager.reset( new ::sd::CustomHandleManager(*const_cast< ViewShellBase* >(this)) );
-
- return *mpImpl->mpCustomHandleManager.get();
-}
-
::rtl::OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const ::rtl::OUString& aCmdURL )
{
::rtl::OUString aLabel;
@@ -1820,34 +1784,4 @@ void FocusForwardingWindow::Command (const CommandEvent& rEvent)
} // end of anonymouse namespace
-// ====================================================================
-
-CustomHandleManager::CustomHandleManager( ViewShellBase& rViewShellBase )
-: mrViewShellBase( rViewShellBase )
-{
-}
-
-CustomHandleManager::~CustomHandleManager()
-{
- DBG_ASSERT( maSupplier.empty(), "sd::CustomHandleManager::~CustomHandleManager(), still suppliers attached!" );
-}
-
-void CustomHandleManager::registerSupplier( ICustomhandleSupplier* pSupplier )
-{
- maSupplier.insert( pSupplier );
-}
-
-void CustomHandleManager::unRegisterSupplier( ICustomhandleSupplier* pSupplier )
-{
- maSupplier.erase( pSupplier );
-}
-
-void CustomHandleManager::addCustomHandler( SdrView& rSourceView, ViewShell::ShellType eShellType, SdrHdlList& rHandlerList )
-{
- for( std::set< ICustomhandleSupplier* >::iterator aIter( maSupplier.begin() ); aIter != maSupplier.end(); aIter++ )
- {
- (*aIter)->addCustomHandler( rSourceView, eShellType, rHandlerList );
- }
-}
-
} // end of namespace sd
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index 926d579e93e9..fdd7c530137f 100755
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -69,48 +69,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing::framework;
using ::sd::framework::FrameworkHelper;
-namespace {
-
-class ImpUndoDeleteWarning : public ModalDialog
-{
-private:
- FixedImage maImage;
- FixedText maWarningFT;
- CheckBox maDisableCB;
- OKButton maYesBtn;
- CancelButton maNoBtn;
-
-public:
- ImpUndoDeleteWarning(Window* pParent);
- BOOL IsWarningDisabled() const { return maDisableCB.IsChecked(); }
-};
-
-ImpUndoDeleteWarning::ImpUndoDeleteWarning(Window* pParent)
-: ModalDialog(pParent, SdResId(RID_UNDO_DELETE_WARNING)),
- maImage(this, SdResId(IMG_UNDO_DELETE_WARNING)),
- maWarningFT(this, SdResId(FT_UNDO_DELETE_WARNING)),
- maDisableCB(this, SdResId(CB_UNDO_DELETE_DISABLE)),
- maYesBtn(this, SdResId(BTN_UNDO_DELETE_YES)),
- maNoBtn(this, SdResId(BTN_UNDO_DELETE_NO))
-{
- FreeResource();
-
- SetHelpId( HID_SD_UNDODELETEWARNING_DLG );
- maDisableCB.SetHelpId( HID_SD_UNDODELETEWARNING_CBX );
-
- maYesBtn.SetText(Button::GetStandardText(BUTTON_YES));
- maNoBtn.SetText(Button::GetStandardText(BUTTON_NO));
- maImage.SetImage(WarningBox::GetStandardImage());
-
- // #93721# Set focus to YES-Button
- maYesBtn.GrabFocus();
-}
-
-} // end of anonymous namespace
-
-
-
-
namespace sd {
ViewShell::Implementation::Implementation (ViewShell& rViewShell)
diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx
index 059e0fde06fb..c25c0f11270a 100755
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -124,10 +124,6 @@ public:
void RemoveShellFactory (
const SfxShell* pViewShell,
const SharedShellFactory& rpFactory);
- ViewShell* ActivateViewShell (
- ShellId nId,
- ::Window* pParentWindow,
- FrameView* pFrameView);
void ActivateViewShell (
ViewShell* pViewShell);
void DeactivateViewShell (const ViewShell& rShell);
@@ -137,13 +133,10 @@ public:
void SetFormShell (const ViewShell* pViewShell, FmFormShell* pFormShell, bool bAbove);
void ActivateSubShell (const SfxShell& rParentShell, ShellId nId);
void DeactivateSubShell (const SfxShell& rParentShell, ShellId nId);
- void DeactivateAllSubShells (const SfxShell& rViewShell);
void MoveSubShellToTop (const SfxShell& rParentShell, ShellId nId);
void MoveToTop (const SfxShell& rParentShell);
SfxShell* GetShell (ShellId nId) const;
SfxShell* GetTopShell (void) const;
- ShellId GetShellId (const SfxShell* pShell) const;
- void ReplaceUndoManager (SfxUndoManager* pManager, SfxUndoManager* pReplacement);
void Shutdown (void);
void InvalidateAllSubShells (const SfxShell* pParentShell);
@@ -235,7 +228,6 @@ private:
DECL_LINK(WindowEventHandler, VclWindowEvent*);
- void DumpActiveShell (const ActiveShellList& rList);
void DumpShellStack (const ShellStack& rStack);
void DumpSfxShellStack (void);
@@ -246,10 +238,6 @@ private:
*/
void Deactivate (SfxShell* pShell);
- ShellDescriptor CreateViewShell (
- ShellId nShellId,
- ::Window* pParentWindow,
- FrameView* pFrameView);
ShellDescriptor CreateSubShell (
SfxShell* pShell,
ShellId nShellId,
@@ -304,20 +292,6 @@ void ViewShellManager::RemoveSubShellFactory (
-ViewShell* ViewShellManager::ActivateViewShell (
- ShellId nShellId,
- ::Window* pParentWindow,
- FrameView* pFrameView)
-{
- if (mbValid)
- return mpImpl->ActivateViewShell(nShellId,pParentWindow,pFrameView);
- else
- return NULL;
-}
-
-
-
-
void ViewShellManager::ActivateViewShell (ViewShell* pViewShell)
{
if (mbValid)
@@ -377,15 +351,6 @@ void ViewShellManager::DeactivateSubShell (const ViewShell& rViewShell, ShellId
-void ViewShellManager::DeactivateAllSubShells (const ViewShell& rViewShell)
-{
- if (mbValid)
- mpImpl->DeactivateAllSubShells(rViewShell);
-}
-
-
-
-
void ViewShellManager::InvalidateAllSubShells (ViewShell* pViewShell)
{
if (mbValid)
@@ -413,15 +378,6 @@ void ViewShellManager::DeactivateShell (const SfxShell* pShell)
-void ViewShellManager::InvalidateShellStack (const SfxShell* pShell)
-{
- if (mbValid)
- mpImpl->TakeShellsFromStack(pShell);
-}
-
-
-
-
void ViewShellManager::MoveToTop (const ViewShell& rParentShell)
{
if (mbValid)
@@ -453,26 +409,6 @@ SfxShell* ViewShellManager::GetTopShell (void) const
-ShellId ViewShellManager::GetShellId (const SfxShell* pShell) const
-{
- if (mbValid)
- return mpImpl->GetShellId(pShell);
- else
- return snInvalidShellId;
-}
-
-
-
-
-void ViewShellManager::ReplaceUndoManager (SfxUndoManager* pManager, SfxUndoManager* pReplacement)
-{
- if (mbValid)
- mpImpl->ReplaceUndoManager(pManager,pReplacement);
-}
-
-
-
-
void ViewShellManager::Shutdown (void)
{
if (mbValid)
@@ -572,24 +508,6 @@ void ViewShellManager::Implementation::RemoveShellFactory (
-ViewShell* ViewShellManager::Implementation::ActivateViewShell (
- ShellId nShellId,
- ::Window* pParentWindow,
- FrameView* pFrameView)
-{
- ::osl::MutexGuard aGuard (maMutex);
-
- // Create a new shell or recycle on in the cache.
- ShellDescriptor aDescriptor (CreateViewShell(nShellId, pParentWindow, pFrameView));
-
- ActivateShell(aDescriptor);
-
- return dynamic_cast<ViewShell*>(aDescriptor.mpShell);
-}
-
-
-
-
void ViewShellManager::Implementation::ActivateViewShell (ViewShell* pViewShell)
{
::osl::MutexGuard aGuard (maMutex);
@@ -953,66 +871,6 @@ SfxShell* ViewShellManager::Implementation::GetTopShell (void) const
-ShellId ViewShellManager::Implementation::GetShellId (const SfxShell* pShell) const
-{
- ::osl::MutexGuard aGuard (maMutex);
-
- ShellId nId = snInvalidShellId;
-
- // First search the active view shells.
- const ViewShell* pViewShell = dynamic_cast<const ViewShell*>(pShell);
- if (pShell != NULL)
- {
- ActiveShellList::const_iterator iShell (
- ::std::find_if (
- maActiveViewShells.begin(),
- maActiveViewShells.end(),
- IsShell(pViewShell)));
- if (iShell != maActiveViewShells.end())
- nId = iShell->mnId;
- }
- if (nId == snInvalidShellId)
- {
- // Now search the active sub shells of every active view shell.
- SubShellList::const_iterator iList;
- for (iList=maActiveSubShells.begin(); iList!=maActiveSubShells.end(); ++iList)
- {
- const SubShellSubList& rList (iList->second);
- SubShellSubList::const_iterator iSubShell(
- ::std::find_if(rList.begin(),rList.end(), IsShell(pShell)));
- if (iSubShell != rList.end())
- {
- nId = iSubShell->mnId;
- break;
- }
- }
- }
-
- return nId;
-}
-
-
-
-
-void ViewShellManager::Implementation::ReplaceUndoManager (
- SfxUndoManager* pManager,
- SfxUndoManager* pReplacement)
-{
- for (USHORT i=0; ;++i)
- {
- SfxShell* pShell = mrBase.GetSubShell(i);
- if (pShell == NULL)
- break;
- if (pShell->GetUndoManager() == pManager)
- pShell->SetUndoManager(pReplacement);
- }
-}
-
-
-
-
-
-
void ViewShellManager::Implementation::LockUpdate (void)
{
mnUpdateLockCount++;
@@ -1333,44 +1191,6 @@ IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent*,
-ShellDescriptor ViewShellManager::Implementation::CreateViewShell (
- ShellId nShellId,
- ::Window* pParentWindow,
- FrameView* pFrameView)
-{
- ShellDescriptor aResult;
-
- if (pParentWindow != NULL)
- {
- ShellDescriptor aDescriptor (
- CreateSubShell(NULL,nShellId,pParentWindow,pFrameView));
- aResult.mpShell = dynamic_cast<ViewShell*>(aDescriptor.mpShell);
- aResult.mpFactory = aDescriptor.mpFactory;
- aResult.mnId = aDescriptor.mnId;
-
- // Register as window listener so that the shells of the current
- // window can be moved to the top of the shell stack.
- if (aResult.mpShell != NULL)
- {
- ::Window* pWindow = aResult.GetWindow();
- if (pWindow != NULL)
- pWindow->AddEventListener(
- LINK(this, ViewShellManager::Implementation, WindowEventHandler));
- else
- {
- DBG_ASSERT (false,
- "ViewShellManager::ActivateViewShell: "
- "new view shell has no active window");
- }
- }
- }
-
- return aResult;
-}
-
-
-
-
ShellDescriptor ViewShellManager::Implementation::CreateSubShell (
SfxShell* pParentShell,
ShellId nShellId,
@@ -1499,15 +1319,6 @@ void ViewShellManager::Implementation::Shutdown (void)
-void ViewShellManager::Implementation::DumpActiveShell (const ActiveShellList& rList)
-{
- for (ActiveShellList::const_iterator aI=rList.begin(); aI!=rList.end(); ++aI)
- OSL_TRACE (" %d %p\r", aI->mnId, aI->mpShell);
-}
-
-
-
-
void ViewShellManager::Implementation::DumpShellStack (const ShellStack& rStack)
{
ShellStack::const_reverse_iterator iEntry;
@@ -1580,24 +1391,6 @@ void ViewShellManager::Implementation::SetFormShell (
-void ViewShellManager::Implementation::DeactivateAllSubShells (
- const SfxShell& rViewShell)
-{
- ::osl::MutexGuard aGuard (maMutex);
-
- SubShellList::iterator iList (maActiveSubShells.find(&rViewShell));
- if (iList != maActiveSubShells.end())
- {
- SubShellSubList& rList (iList->second);
- UpdateLock aLock (*this);
- while ( ! rList.empty())
- DeactivateSubShell(rViewShell, rList.front().mnId);
- }
-}
-
-
-
-
namespace {
ShellDescriptor::ShellDescriptor (void)
diff --git a/sd/source/ui/view/bmcache.cxx b/sd/source/ui/view/bmcache.cxx
index d8781733c520..c7f313037ff8 100644..100755
--- a/sd/source/ui/view/bmcache.cxx
+++ b/sd/source/ui/view/bmcache.cxx
@@ -58,115 +58,6 @@ BitmapCache::~BitmapCache()
}
}
-/*************************************************************************
-|*
-|* Cache-Eintrag einfuegen
-|*
-\************************************************************************/
-
-void BitmapCache::Add(const SdPage* pPage, const Bitmap& rBmp, long nZoom)
-{
- BitmapCacheEntry* pEntry = NULL;
- ULONG nSizeOfBitmap = rBmp.GetSizeBytes();
-
- if( nSizeOfBitmap < nMaxSize )
- {
- while (nCurSize + nSizeOfBitmap > nMaxSize)
- {
- if( aEntries.Count() )
- {
- pEntry = (BitmapCacheEntry*) aEntries.Remove(aEntries.Count() - 1);
-
- if( pEntry && pEntry->pGraphicObject )
- {
- nCurSize -= pEntry->nSizeBytes;
- delete pEntry->pGraphicObject;
- }
-
- delete pEntry;
- }
- else
- break;
- }
-
- pEntry = new BitmapCacheEntry;
- pEntry->pPage = pPage;
- pEntry->pGraphicObject = new GraphicObject( rBmp );
- pEntry->nSizeBytes = nSizeOfBitmap;
- pEntry->nZoom = nZoom;
-
- aEntries.Insert( pEntry, (ULONG) 0 );
- nCurSize += nSizeOfBitmap;
- }
-}
-
-/*************************************************************************
-|*
-|* Cache-Eintrag suchen, Bitmap-Zeiger zurueckgeben (NULL, wenn Bitmap nicht
-|* im Cache)
-|* - auf rZoomPercent wird der Zoomfaktor der Bitmap geschrieben
-|* - abs(nZoomTolerance) gibt die maximal erlaubte Abweichung des
-|* Zoomfaktors an; ist die Toleranz negativ, so sucht der Cache den
-|* "best fit", sonst den "first fit",
-|* - es werden nur Bitmaps mit Zoomfaktoren kleiner oder gleich rZoomPercent
-|* beruecksichtigt, um ein Verkleinern der Bitmap beim Zeichnen zu vermeiden
-|*
-\************************************************************************/
-
-const GraphicObject* BitmapCache::Get( const SdPage* pPage, long& rZoomPercent, long nZoomTolerancePercent)
-{
- BitmapCacheEntry* pEntry = NULL;
- GraphicObject* pGraphicObject = NULL;
-
- if( nZoomTolerancePercent < 0 )
- {
- // "best fit"-Suche
- long nTolerance = -nZoomTolerancePercent;
- BitmapCacheEntry* pBest = NULL;
- long nBest = LONG_MAX;
- long nTest = 0L;
-
- for( ULONG nPos = 0; nPos < aEntries.Count(); nPos++ )
- {
- pEntry = (BitmapCacheEntry*) aEntries.GetObject( nPos );
-
- if( pEntry->pPage == pPage )
- {
- nTest = rZoomPercent - pEntry->nZoom;
-
- if( nTest >= 0 && nTest < nBest && nTest <= nTolerance )
- pBest = pEntry;
- }
- }
-
- pEntry = pBest;
- }
- else
- {
- // "first fit"-suche
- for( ULONG nPos = 0; nPos < aEntries.Count(); nPos++ )
- {
- pEntry = (BitmapCacheEntry*)aEntries.GetObject( nPos );
-
- if (pEntry->pPage == pPage && Abs( pEntry->nZoom - rZoomPercent ) <= nZoomTolerancePercent )
- break;
- else
- pEntry = NULL;
- }
- }
-
- // was passendes gefunden?
- if( pEntry )
- {
- pGraphicObject = pEntry->pGraphicObject;
- aEntries.Remove( pEntry );
- aEntries.Insert( pEntry, (ULONG) 0 );
- rZoomPercent = pEntry->nZoom;
- }
-
- return pGraphicObject;
-}
-
void BitmapCache::Remove( const SdPage* pPage )
{
for( ULONG nPos = 0; nPos < aEntries.Count(); )
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 55479228f918..98d0b7551705 100755
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -94,7 +94,6 @@
#include "slideshow.hxx"
#include "optsitem.hxx"
#include "fusearch.hxx"
-#include "fuspell.hxx"
#include "Outliner.hxx"
#include "AnimationChildWindow.hxx"
#include "SdUnoDrawView.hxx"
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 2e33ab909f00..3102dc726a61 100755
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -105,48 +105,6 @@ namespace sd {
/*************************************************************************
|*
-|* modal dialog for #90356#
-|*
-\************************************************************************/
-
-class ImpUndoDeleteWarning : public ModalDialog
-{
-private:
- FixedImage maImage;
- FixedText maWarningFT;
- CheckBox maDisableCB;
- OKButton maYesBtn;
- CancelButton maNoBtn;
-
-public:
- ImpUndoDeleteWarning(Window* pParent);
- BOOL IsWarningDisabled() const { return maDisableCB.IsChecked(); }
-};
-
-ImpUndoDeleteWarning::ImpUndoDeleteWarning(Window* pParent)
-: ModalDialog(pParent, SdResId(RID_UNDO_DELETE_WARNING)),
- maImage(this, SdResId(IMG_UNDO_DELETE_WARNING)),
- maWarningFT(this, SdResId(FT_UNDO_DELETE_WARNING)),
- maDisableCB(this, SdResId(CB_UNDO_DELETE_DISABLE)),
- maYesBtn(this, SdResId(BTN_UNDO_DELETE_YES)),
- maNoBtn(this, SdResId(BTN_UNDO_DELETE_NO))
-{
- FreeResource();
-
- SetHelpId( HID_SD_UNDODELETEWARNING_DLG );
- maDisableCB.SetHelpId( HID_SD_UNDODELETEWARNING_CBX );
-
- maYesBtn.SetText(Button::GetStandardText(BUTTON_YES));
- maNoBtn.SetText(Button::GetStandardText(BUTTON_NO));
- maImage.SetImage(WarningBox::GetStandardImage());
-
- // #93721# Set focus to YES-Button
- maYesBtn.GrabFocus();
-}
-
-
-/*************************************************************************
-|*
|* SfxRequests fuer temporaere Funktionen
|*
\************************************************************************/
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx
index c4c6b20f8ca8..681192ff351b 100755
--- a/sd/source/ui/view/drviews6.cxx
+++ b/sd/source/ui/view/drviews6.cxx
@@ -192,32 +192,6 @@ void DrawViewShell::GetFormTextState(SfxItemSet& rSet)
/*************************************************************************
|*
-|* SfxRequests fuer Objektpalette bearbeiten
-|*
-\************************************************************************/
-
-void DrawViewShell::ExecObjPalette( SfxRequest& )
-{
- // Diese Methode muss erhalten bleiben, bis
- // der/die Slots entfernt wurden;
- // ==> Voll-Update
-}
-
-/*************************************************************************
-|*
-|* Statuswerte fuer Objektpalette zurueckgeben
-|*
-\************************************************************************/
-
-void DrawViewShell::GetObjPaletteState(SfxItemSet& )
-{
- // Diese Methode muss erhalten bleiben, bis
- // der/die Slots entfernt wurden;
- // ==> Voll-Update
-}
-
-/*************************************************************************
-|*
|* SfxRequests fuer Animator bearbeiten
|*
\************************************************************************/
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index ad42a9251878..3628a11ac5a1 100755
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -151,21 +151,6 @@ DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBas
/*************************************************************************
|*
-|* Copy-Konstruktor
-|*
-\************************************************************************/
-
-DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ::Window* pParentWindow, const DrawViewShell& rShell )
-: ViewShell(pFrame, pParentWindow, rShell)
-, maTabControl(this, pParentWindow)
-, mbIsInSwitchPage(false)
-{
- mpFrameView = new FrameView(GetDoc());
- Construct (GetDocSh(), PK_STANDARD);
-}
-
-/*************************************************************************
-|*
|* Destruktor
|*
\************************************************************************/
diff --git a/sd/source/ui/view/grviewsh.cxx b/sd/source/ui/view/grviewsh.cxx
index 1c22348f8b87..646a437c42bf 100644..100755
--- a/sd/source/ui/view/grviewsh.cxx
+++ b/sd/source/ui/view/grviewsh.cxx
@@ -61,24 +61,6 @@ GraphicViewShell::GraphicViewShell (
ConstructGraphicViewShell();
}
-/*************************************************************************
-|*
-|* Copy-Konstruktor
-|*
-\************************************************************************/
-
-GraphicViewShell::GraphicViewShell (
- SfxViewFrame* pFrame,
- ::Window* pParentWindow,
- const DrawViewShell& rShell)
- : DrawViewShell (pFrame, pParentWindow, rShell)
-{
- ConstructGraphicViewShell();
-}
-
-
-
-
GraphicViewShell::~GraphicViewShell (void)
{
}
diff --git a/sd/source/ui/view/makefile.mk b/sd/source/ui/view/makefile.mk
index 2cc2a96d46a2..0ee8280d3fad 100644
--- a/sd/source/ui/view/makefile.mk
+++ b/sd/source/ui/view/makefile.mk
@@ -85,7 +85,6 @@ SLOFILES = \
$(SLO)$/presvish.obj \
$(SLO)$/outlview.obj \
$(SLO)$/tabcontr.obj \
- $(SLO)$/showview.obj \
$(SLO)$/bmcache.obj \
$(SLO)$/drbezob.obj \
$(SLO)$/drtxtob.obj \
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index bbdcf35a4e34..955a9d167b49 100755
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -236,31 +236,6 @@ OutlineViewShell::OutlineViewShell (
Construct(GetDocSh());
}
-
-/*************************************************************************
-|*
-|* Copy-Konstruktor
-|*
-\************************************************************************/
-
-OutlineViewShell::OutlineViewShell (
- SfxViewFrame* pFrame,
- ::Window* pParentWindow,
- const OutlineViewShell& rShell)
- : ViewShell (pFrame, pParentWindow, rShell),
- pOlView(NULL),
- pLastPage( NULL ),
- pClipEvtLstnr(NULL),
- bPastePossible(FALSE),
- mbInitialized(false)
-
-{
- mpFrameView = new FrameView(GetDoc());
- mpFrameView->Connect();
-
- Construct(GetDocSh());
-}
-
/*************************************************************************
|*
|* Destruktor
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 30daec8b636e..dfad4b34c6f2 100644..100755
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -2040,6 +2040,7 @@ IMPL_LINK(OutlineView, PaintingFirstLineHdl, PaintFirstLineInfo*, pInfo)
return 0;
}
+#if 0
sal_Int32 OutlineView::GetPageNumberWidthPixel()
{
Window* pActWin = mpOutlineViewShell->GetActiveWindow();
@@ -2062,6 +2063,7 @@ sal_Int32 OutlineView::GetPageNumberWidthPixel()
}
return mnPageNumberWidthPixel;
}
+#endif
// --------------------------------------------------------------------
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 813c6caba95a..3aed9c6c0d9c 100644..100755
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -969,89 +969,6 @@ void View::SetMarkedOriginalSize()
delete pUndoGroup;
}
-/** create a virtual device and paints the slide contents into it.
- The caller must delete the returned device */
-VirtualDevice* View::CreatePageVDev(USHORT nSdPage, PageKind ePageKind, ULONG nWidthPixel)
-{
- ViewShell* pViewShell = mpDocSh->GetViewShell();
- OutputDevice* pRefDevice = 0;
- if( pViewShell )
- pRefDevice = pViewShell->GetActiveWindow();
-
- if( !pRefDevice )
- pRefDevice = Application::GetDefaultDevice();
-
- DBG_ASSERT( pRefDevice, "sd::View::CreatePageVDev(), I need a reference device to work properly!" );
-
- VirtualDevice* pVDev;
- if( pRefDevice )
- pVDev = new VirtualDevice( *pRefDevice );
- else
- pVDev = new VirtualDevice();
-
- MapMode aMM( MAP_100TH_MM );
-
- SdPage* pPage = mpDoc->GetSdPage(nSdPage, ePageKind);
- DBG_ASSERT(pPage, "sd::View::CreatePageVDev(), slide not found!");
-
- if( pPage )
- {
- Size aPageSize(pPage->GetSize());
- aPageSize.Width() -= pPage->GetLftBorder();
- aPageSize.Width() -= pPage->GetRgtBorder();
- aPageSize.Height() -= pPage->GetUppBorder();
- aPageSize.Height() -= pPage->GetLwrBorder();
-
- // use scaling?
- if( nWidthPixel )
- {
- const Fraction aFrac( (long) nWidthPixel, pVDev->LogicToPixel( aPageSize, aMM ).Width() );
-
- aMM.SetScaleX( aFrac );
- aMM.SetScaleY( aFrac );
- }
-
- pVDev->SetMapMode( aMM );
- if( pVDev->SetOutputSize(aPageSize) )
- {
- std::auto_ptr< SdrView > pView( new SdrView(mpDoc, pVDev) );
- pView->SetPageVisible( FALSE );
- pView->SetBordVisible( FALSE );
- pView->SetGridVisible( FALSE );
- pView->SetHlplVisible( FALSE );
- pView->SetGlueVisible( FALSE );
- pView->ShowSdrPage(pPage); // WAITING FOR SJ , Point(-pPage->GetLftBorder(), -pPage->GetUppBorder()));
- SdrPageView* pPageView = pView->GetSdrPageView();
- if( pViewShell )
- {
- FrameView* pFrameView = pViewShell->GetFrameView();
- if( pFrameView )
- {
- pPageView->SetVisibleLayers( pFrameView->GetVisibleLayers() );
- pPageView->SetLockedLayers( pFrameView->GetLockedLayers() );
- pPageView->SetPrintableLayers( pFrameView->GetPrintableLayers() );
- }
- }
-
- // SJ: i40609, the vdev mapmode seems to be dangled after CompleteRedraw,
- // so we are pushing here, because the mapmode is used afterwards
- pVDev->Push();
-
- Point aPoint( 0, 0 );
- Region aRegion (Rectangle( aPoint, aPageSize ) );
- pView->CompleteRedraw(pVDev, aRegion);
- pVDev->Pop();
- }
- else
- {
- DBG_ERROR("sd::View::CreatePageVDev(), virt. device creation failed!");
- }
- }
- return pVDev;
-}
-
-
-
/*************************************************************************
|*
|* OLE-Obj am Client connecten
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index a980496cecf3..9fbe223c276a 100755
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -623,11 +623,6 @@ void View::LockRedraw(BOOL bLock)
-bool View::IsRedrawLocked (void) const
-{
- return mnLockRedrawSmph>0;
-}
-
/*************************************************************************
|*
|* StyleSheet aus der Sleketion besorgen
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index 5ae673b8769f..28873b3946a3 100755
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -146,35 +146,6 @@ void Window::SetViewShell (ViewShell* pViewSh)
}
}
-
-
-
-/*************************************************************************
-|*
-|* Die Haelfte des Sichtbaren Bereich eines anderen Fensters darstellen
-|*
-\************************************************************************/
-
-void Window::ShareViewArea(Window* pOtherWin)
-{
- mpShareWin = pOtherWin;
- maViewOrigin = pOtherWin->maViewOrigin;
- maViewSize = pOtherWin->maViewSize;
- mnMinZoom = pOtherWin->mnMinZoom;
- mnMaxZoom = pOtherWin->mnMaxZoom;
- mbCenterAllowed = pOtherWin->mbCenterAllowed;
-
- long nZoom = pOtherWin->GetZoom();
- MapMode aMap(GetMapMode());
- aMap.SetScaleX(Fraction(nZoom, 100));
- aMap.SetScaleY(Fraction(nZoom, 100));
- aMap.SetOrigin(pOtherWin->GetMapMode().GetOrigin());
- SetMapMode(aMap);
-}
-
-
-
-
void Window::CalcMinZoom()
{
// Are we entitled to change the minimal zoom factor?
diff --git a/sd/source/ui/view/showview.cxx b/sd/source/ui/view/showview.cxx
deleted file mode 100644
index a60195eac1b8..000000000000
--- a/sd/source/ui/view/showview.cxx
+++ /dev/null
@@ -1,170 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sd.hxx"
-
-#include "showview.hxx"
-#include <svx/svdmodel.hxx>
-#include <svx/fmview.hxx>
-
-
-#include "drawdoc.hxx"
-#include "sdpage.hxx"
-#include "ViewShell.hxx"
-#include "FrameView.hxx"
-
-namespace sd {
-
-#ifndef SO2_DECL_SVINPLACEOBJECT_DEFINED
-#define SO2_DECL_SVINPLACEOBJECT_DEFINED
-SO2_DECL_REF(SvInPlaceObject)
-#endif
-#ifndef SO2_DECL_SVINPLACECLIENT_DEFINED
-#define SO2_DECL_SVINPLACECLIENT_DEFINED
-SO2_DECL_REF(SvInPlaceClient)
-#endif
-
-/*************************************************************************
-|*
-|* der Konstruktor setzt den MapMode und arrangiert die einzelnen Seiten
-|*
-\************************************************************************/
-
-ShowView::ShowView (
- SdDrawDocument* pDoc,
- OutputDevice* pOut,
- ViewShell* pViewShell,
- ::Window* pWin)
- : FmFormView(pDoc, pOut),
- pDrDoc(pDoc),
- mpViewSh(pViewShell),
- pWindowForPlugIns(pWin),
- nAllowInvalidateSmph(0),
- bAllowMasterPageCaching(TRUE)
-{
- // #i73602# Use default from the configuration
- SetBufferedOverlayAllowed(getOptionsDrawinglayer().IsOverlayBuffer_DrawImpress());
-
- // #i74769#, #i75172# Use default from the configuration
- SetBufferedOutputAllowed(getOptionsDrawinglayer().IsPaintBuffer_DrawImpress());
-
- EnableExtendedKeyInputDispatcher(FALSE);
- EnableExtendedMouseEventDispatcher(FALSE);
- EnableExtendedCommandEventDispatcher(FALSE);
-}
-
-/*************************************************************************
-|*
-|* Destruktor
-|*
-\************************************************************************/
-
-ShowView::~ShowView()
-{
-}
-
-/*************************************************************************
-|*
-|* Zaehler fuer Invalidierungserlaubnis hoch- oder runter zaehlen
-|*
-\************************************************************************/
-
-void ShowView::SetAllowInvalidate(BOOL bFlag)
-{
- if (!bFlag)
- {
- nAllowInvalidateSmph++;
- }
- else if (nAllowInvalidateSmph > 0)
- {
- nAllowInvalidateSmph--;
- }
-}
-
-/*************************************************************************
-|*
-|* ermittelt, ob invalidiert werden darf
-|*
-\************************************************************************/
-
-BOOL ShowView::IsInvalidateAllowed() const
-{
- return (nAllowInvalidateSmph == 0);
-}
-
-/*************************************************************************
-|*
-|* Invalidate abfangen
-|*
-\************************************************************************/
-
-void ShowView::InvalidateOneWin (::Window& rWin)
-{
- if (IsInvalidateAllowed())
- {
- FmFormView::InvalidateOneWin(rWin);
- }
-}
-
-/*************************************************************************
-|*
-|* Invalidate abfangen
-|*
-\************************************************************************/
-
-void ShowView::InvalidateOneWin (::Window& rWin, const Rectangle& rRect)
-{
- if (IsInvalidateAllowed())
- {
- FmFormView::InvalidateOneWin(rWin, rRect);
- }
-}
-
-/*************************************************************************
-|*
-|* Paint-Methode: das Ereignis wird an die View weitergeleitet
-|*
-\************************************************************************/
-
-void ShowView::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector /*=0L*/)
-{
- FmFormView::CompleteRedraw(pOutDev, rReg, pRedirector);
-}
-
-/*************************************************************************
-|*
-|* DoConnect
-|*
-\************************************************************************/
-
-void ShowView::DoConnect(SdrOle2Obj* )
-{
- // connected wird jetzt in FuSlideShow::ShowPlugIns()
-}
-
-} // end of namespace sd
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index 5a3426a42533..616516782be3 100644..100755
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -526,34 +526,6 @@ void ViewShell::DrawMarkRect(const Rectangle& rRect) const
}
}
-
-/*************************************************************************
-|*
-|* Auf allen Split-Windows ein Rechteck zeichnen. Fuer den Rahmen wird der
-|* uebergebene Pen, zum Fuellen die uebergebene Brush benutzt.
-|*
-\************************************************************************/
-
-void ViewShell::DrawFilledRect( const Rectangle& rRect, const Color& rLColor,
- const Color& rFColor ) const
-{
- if (mpContentWindow.get() != NULL)
- {
- const Color& rOldLineColor = mpContentWindow->GetLineColor();
- const Color& rOldFillColor = mpContentWindow->GetFillColor();
-
- mpContentWindow->SetLineColor( rLColor );
- mpContentWindow->SetFillColor( rFColor );
-
- mpContentWindow->DrawRect(rRect);
-
- mpContentWindow->SetLineColor( rOldLineColor );
- mpContentWindow->SetFillColor( rOldFillColor );
- }
-}
-
-
-
/*************************************************************************
|*
|* Groesse und Raender aller Seiten setzen
@@ -851,18 +823,6 @@ void ViewShell::WriteFrameViewData()
/*************************************************************************
|*
-|* Auf allen Split-Windows ein Update erzwingen.
-|*
-\************************************************************************/
-
-void ViewShell::UpdateWindows()
-{
- if (mpContentWindow.get() != NULL)
- mpContentWindow->Update();
-}
-
-/*************************************************************************
-|*
|* OLE-Object aktivieren
|*
\************************************************************************/
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 578026018b9f..c1f4bc070bcf 100755
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -173,14 +173,6 @@ ViewShell::ViewShell( SfxViewFrame*, ::Window* pParentWindow, ViewShellBase& rVi
construct();
}
-ViewShell::ViewShell( SfxViewFrame*, ::Window* pParentWindow, const ViewShell& rShell)
-: SfxShell(rShell.GetViewShell())
-, mbCenterAllowed(rShell.mbCenterAllowed)
-, mpParentWindow(pParentWindow)
-{
- construct();
-}
-
ViewShell::~ViewShell()
{
// Keep the content window from accessing in its destructor the
diff --git a/sd/source/ui/view/zoomlist.cxx b/sd/source/ui/view/zoomlist.cxx
index 6f4d56b6f0a3..9ae178e3d7a6 100644..100755
--- a/sd/source/ui/view/zoomlist.cxx
+++ b/sd/source/ui/view/zoomlist.cxx
@@ -112,19 +112,6 @@ void ZoomList::InsertZoomRect(const Rectangle& rRect)
rBindings.Invalidate( SID_ZOOM_PREV );
}
-
-/*************************************************************************
-|*
-|* Aktuelles ZoomRect herausgeben
-|*
-\************************************************************************/
-
-Rectangle ZoomList::GetCurrentZoomRect() const
-{
- Rectangle aRect(*(Rectangle*) GetObject(mnCurPos));
- return (aRect);
-}
-
/*************************************************************************
|*
|* Naechstes ZoomRect herausgeben