summaryrefslogtreecommitdiff
path: root/sd/source/ui/view/drviewsc.cxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:11:31 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:11:31 +0200
commit4f30c816fa0fb66e650d4e85304292b5ec72b22d (patch)
tree2c6ae8d7c2f6eb55686bb306afe1b1fce5172be8 /sd/source/ui/view/drviewsc.cxx
parent2ebf6456709b2345fcd340137b10ff7bb47a3263 (diff)
recreated tag libreoffice-3.3.0.4 which had these commits:
commit 40849a63d4ca6da479ef28e129b15109a42e8617 (tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0) Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 18 19:01:18 2011 +0100 Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4) commit 2764d5adfcd646794593cda200fca9d4988d0d06 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 22:59:37 2011 +0100 Branch libreoffice-3-3-0 This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master.
Notes
Notes: split repo tag: impress_libreoffice-3.3.0.4
Diffstat (limited to 'sd/source/ui/view/drviewsc.cxx')
-rw-r--r--sd/source/ui/view/drviewsc.cxx32
1 files changed, 16 insertions, 16 deletions
diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx
index 563a153a7ef5..73cc59fd9709 100644
--- a/sd/source/ui/view/drviewsc.cxx
+++ b/sd/source/ui/view/drviewsc.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -64,11 +64,11 @@
#include "drawdoc.hxx"
#include "DrawDocShell.hxx"
#include "drawview.hxx"
-#include "sdabstdlg.hxx"
-#include "brkdlg.hrc"
+#include "sdabstdlg.hxx"
+#include "brkdlg.hrc"
namespace sd {
-#define MIN_ACTIONS_FOR_DIALOG 5000 // bei mehr als 1600 Metaobjekten
+#define MIN_ACTIONS_FOR_DIALOG 5000 // bei mehr als 1600 Metaobjekten
// wird beim Aufbrechen ein Dialog
// angezeigt.
/*************************************************************************
@@ -121,7 +121,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq)
OSL_ENSURE(pFact, "Dialogdiet fail!");
AbstractSvxObjectNameDialog* pDlg = pFact->CreateSvxObjectNameDialog(NULL, aName);
OSL_ENSURE(pDlg, "Dialogdiet fail!");
-
+
pDlg->SetCheckNameHdl(LINK(this, DrawViewShell, NameObjectHdl));
if(RET_OK == pDlg->Execute())
@@ -200,7 +200,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq)
rReq.Done ();
}
break;
-
+
case SID_COMBINE: // BASIC
{
// #88224# End text edit to avoid conflicts
@@ -421,7 +421,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq)
}
break;
- case SID_FRAME_TO_TOP: // BASIC
+ case SID_FRAME_TO_TOP: // BASIC
{
mpDrawView->PutMarkedToTop();
Cancel();
@@ -439,7 +439,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq)
}
break;
- case SID_MOREBACK: // BASIC
+ case SID_MOREBACK: // BASIC
{
mpDrawView->MovMarkedToBtm();
Cancel();
@@ -448,7 +448,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq)
}
break;
- case SID_FRAME_TO_BOTTOM: // BASIC
+ case SID_FRAME_TO_BOTTOM: // BASIC
{
mpDrawView->PutMarkedToBtm();
Cancel();
@@ -465,7 +465,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq)
}
break;
- case SID_VERTICAL: // BASIC
+ case SID_VERTICAL: // BASIC
{
mpDrawView->MirrorAllMarkedVertical();
Cancel();
@@ -537,7 +537,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq)
}
break;
- case SID_STYLE_NEW: // BASIC ???
+ case SID_STYLE_NEW: // BASIC ???
case SID_STYLE_APPLY:
case SID_STYLE_EDIT:
case SID_STYLE_DELETE:
@@ -594,7 +594,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq)
case SID_IMAP:
{
SvxIMapDlg* pDlg;
- USHORT nId = SvxIMapDlgChildWindow::GetChildWindowId();
+ USHORT nId = SvxIMapDlgChildWindow::GetChildWindowId();
GetViewFrame()->ToggleChildWindow( nId );
GetViewFrame()->GetBindings().Invalidate( SID_IMAP );
@@ -602,7 +602,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq)
if ( GetViewFrame()->HasChildWindow( nId )
&& ( ( pDlg = ViewShell::Implementation::GetImageMapDialog() ) != NULL ) )
{
- const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
+ const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
if ( rMarkList.GetMarkCount() == 1 )
UpdateIMapDlg( rMarkList.GetMark( 0 )->GetMarkedSdrObj() );
@@ -940,9 +940,9 @@ void DrawViewShell::UpdateIMapDlg( SdrObject* pObj )
if( ( pObj->ISA( SdrGrafObj ) || pObj->ISA( SdrOle2Obj ) ) && !mpDrawView->IsTextEdit() &&
GetViewFrame()->HasChildWindow( SvxIMapDlgChildWindow::GetChildWindowId() ) )
{
- Graphic aGraphic;
- ImageMap* pIMap = NULL;
- TargetList* pTargetList = NULL;
+ Graphic aGraphic;
+ ImageMap* pIMap = NULL;
+ TargetList* pTargetList = NULL;
SdIMapInfo* pIMapInfo = GetDoc()->GetIMapInfo( pObj );
// get graphic from shape