Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
d76091de
Kaydet (Commit)
d76091de
authored
Ock 17, 2012
tarafından
Luc Castermans
Kaydeden (comit)
Michael Stahl
Ock 17, 2012
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Translate comments from German to English; sw/source/core/frmedt is complete.
üst
e762a8bd
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
113 additions
and
120 deletions
+113
-120
fecopy.cxx
sw/source/core/frmedt/fecopy.cxx
+0
-1
feshview.cxx
sw/source/core/frmedt/feshview.cxx
+113
-118
fetab.cxx
sw/source/core/frmedt/fetab.cxx
+0
-1
No files found.
sw/source/core/frmedt/fecopy.cxx
Dosyayı görüntüle @
d76091de
...
@@ -89,7 +89,6 @@ using namespace ::com::sun::star;
...
@@ -89,7 +89,6 @@ using namespace ::com::sun::star;
/*************************************************************************
/*************************************************************************
|*
|*
|* SwFEShell::Copy() copy for the internal clipboard.
|* SwFEShell::Copy() copy for the internal clipboard.
|* Kopiert alle Selektionen in das Clipboard.
|* Copies all selections to the clipboard.
|* Copies all selections to the clipboard.
|*
|*
|*************************************************************************/
|*************************************************************************/
...
...
sw/source/core/frmedt/feshview.cxx
Dosyayı görüntüle @
d76091de
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
#include <svx/svdpagv.hxx>
#include <svx/svdpagv.hxx>
#include <IDocumentSettingAccess.hxx>
#include <IDocumentSettingAccess.hxx>
#include <cmdid.h>
#include <cmdid.h>
#include <poolfmt.hrc> // f
ue
r InitFldTypes
#include <poolfmt.hrc> // f
o
r InitFldTypes
#include <frmfmt.hxx>
#include <frmfmt.hxx>
#include <frmatr.hxx>
#include <frmatr.hxx>
#include <fmtfsize.hxx>
#include <fmtfsize.hxx>
...
@@ -79,12 +79,12 @@
...
@@ -79,12 +79,12 @@
#include "ndole.hxx"
#include "ndole.hxx"
#include "ndgrf.hxx"
#include "ndgrf.hxx"
#include "ndtxt.hxx"
#include "ndtxt.hxx"
#include "viewopt.hxx" // f
ue
r GetHTMLMode
#include "viewopt.hxx" // f
o
r GetHTMLMode
#include "swundo.hxx"
#include "swundo.hxx"
#include "notxtfrm.hxx"
#include "notxtfrm.hxx"
#include "txtfrm.hxx"
#include "txtfrm.hxx"
#include "txatbase.hxx"
#include "txatbase.hxx"
#include "mdiexp.hxx" // f
uer Update der Statuszeile bei dra
g
#include "mdiexp.hxx" // f
or update of the statusline during draggin
g
#include <sortedobjs.hxx>
#include <sortedobjs.hxx>
#include <HandleAnchorNodeChg.hxx>
#include <HandleAnchorNodeChg.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
...
@@ -94,7 +94,7 @@
...
@@ -94,7 +94,7 @@
using
namespace
com
::
sun
::
star
;
using
namespace
com
::
sun
::
star
;
//
Tattergrenze fuer
Drawing-SS
//
tolerance limit of
Drawing-SS
#define MINMOVE ((sal_uInt16)GetOut()->PixelToLogic(Size(Imp()->GetDrawView()->GetMarkHdlSizePixel()/2,0)).Width())
#define MINMOVE ((sal_uInt16)GetOut()->PixelToLogic(Size(Imp()->GetDrawView()->GetMarkHdlSizePixel()/2,0)).Width())
SwFlyFrm
*
GetFlyFromMarked
(
const
SdrMarkList
*
pLst
,
ViewShell
*
pSh
)
SwFlyFrm
*
GetFlyFromMarked
(
const
SdrMarkList
*
pLst
,
ViewShell
*
pSh
)
...
@@ -117,13 +117,14 @@ void lcl_GrabCursor( SwFEShell* pSh, SwFlyFrm* pOldSelFly)
...
@@ -117,13 +117,14 @@ void lcl_GrabCursor( SwFEShell* pSh, SwFlyFrm* pOldSelFly)
if
(
pFlyFmt
&&
!
pSh
->
ActionPend
()
&&
if
(
pFlyFmt
&&
!
pSh
->
ActionPend
()
&&
(
!
pOldSelFly
||
pOldSelFly
->
GetFmt
()
!=
pFlyFmt
)
)
(
!
pOldSelFly
||
pOldSelFly
->
GetFmt
()
!=
pFlyFmt
)
)
{
{
//
dann das evt. gesetzte Macro rufen
//
now call set macro if applicable
pSh
->
GetFlyMacroLnk
().
Call
(
(
void
*
)
pFlyFmt
);
pSh
->
GetFlyMacroLnk
().
Call
(
(
void
*
)
pFlyFmt
);
extern
sal_Bool
bNoInterrupt
;
// in swapp.cxx
extern
sal_Bool
bNoInterrupt
;
// in swapp.cxx
// wir in dem Makro ein Dialog gestartet, dann kommt das
// if a dialog was started inside a macro, then
// MouseButtonUp zu diesem und nicht zu uns. Dadurch ist
// MouseButtonUp arrives at macro and not to us. Therefore
// Flag bei uns immer gesetzt und schaltet nie die auf die
// flag is always set here and will never be switched to
// entsp. Shell um !!!!!!!
// respective Shell !!!!!!!
bNoInterrupt
=
sal_False
;
bNoInterrupt
=
sal_False
;
}
}
else
if
(
!
pFlyFmt
||
RES_DRAWFRMFMT
==
pFlyFmt
->
Which
()
)
else
if
(
!
pFlyFmt
||
RES_DRAWFRMFMT
==
pFlyFmt
->
Which
()
)
...
@@ -146,9 +147,9 @@ sal_Bool SwFEShell::SelectObj( const Point& rPt, sal_uInt8 nFlag, SdrObject *pOb
...
@@ -146,9 +147,9 @@ sal_Bool SwFEShell::SelectObj( const Point& rPt, sal_uInt8 nFlag, SdrObject *pOb
if
(
!
pDView
)
if
(
!
pDView
)
return
sal_False
;
return
sal_False
;
SET_CURR_SHELL
(
this
);
SET_CURR_SHELL
(
this
);
StartAction
();
//
Aktion ist Notwendig, damit nicht mehrere
StartAction
();
//
necessary action, to assure several
//
AttrChgdNotify (etwa durch
Unmark->MarkListHasChgd)
//
AttrChgdNotify (e.g. due to
Unmark->MarkListHasChgd)
//
durchkommen
//
arrive
const
SdrMarkList
&
rMrkList
=
pDView
->
GetMarkedObjectList
();
const
SdrMarkList
&
rMrkList
=
pDView
->
GetMarkedObjectList
();
const
sal_Bool
bHadSelection
=
rMrkList
.
GetMarkCount
()
?
sal_True
:
sal_False
;
const
sal_Bool
bHadSelection
=
rMrkList
.
GetMarkCount
()
?
sal_True
:
sal_False
;
...
@@ -159,12 +160,12 @@ sal_Bool SwFEShell::SelectObj( const Point& rPt, sal_uInt8 nFlag, SdrObject *pOb
...
@@ -159,12 +160,12 @@ sal_Bool SwFEShell::SelectObj( const Point& rPt, sal_uInt8 nFlag, SdrObject *pOb
if
(
bHadSelection
)
if
(
bHadSelection
)
{
{
//
Unmark rufen wenn !bAddSelect oder wenn ein Fly selektiert ist.
//
call Unmark when !bAddSelect or if fly was selected
sal_Bool
bUnmark
=
!
bAddSelect
;
sal_Bool
bUnmark
=
!
bAddSelect
;
if
(
rMrkList
.
GetMarkCount
()
==
1
)
if
(
rMrkList
.
GetMarkCount
()
==
1
)
{
{
//
Wenn ein Fly selektiert ist, so muss er erst deselektiert werden.
//
if fly was selected, deselect it first
pOldSelFly
=
::
GetFlyFromMarked
(
&
rMrkList
,
this
);
pOldSelFly
=
::
GetFlyFromMarked
(
&
rMrkList
,
this
);
if
(
pOldSelFly
)
if
(
pOldSelFly
)
{
{
...
@@ -173,11 +174,10 @@ sal_Bool SwFEShell::SelectObj( const Point& rPt, sal_uInt8 nFlag, SdrObject *pOb
...
@@ -173,11 +174,10 @@ sal_Bool SwFEShell::SelectObj( const Point& rPt, sal_uInt8 nFlag, SdrObject *pOb
(
pOldSelFly
->
GetFmt
()
->
GetProtect
().
IsCntntProtected
()
(
pOldSelFly
->
GetFmt
()
->
GetProtect
().
IsCntntProtected
()
&&
!
IsReadOnlyAvailable
()
))
&&
!
IsReadOnlyAvailable
()
))
{
{
//Wenn ein Fly deselektiert wird, der Grafik, Ole o.ae.
// If a fly is deselected, which contains graphic, OLE or otherwise,
//enthaelt, so muss der Crsr aus diesem entfernt werden.
// the cursus should be removed from it.
//Desgleichen wenn ein Fly mit geschuetztem Inhalt deselektiert
// Similar if a fly with protected content is deselected.
//wird. Der Einfachheit halber wire der Crsr 'grad so neben die
// For simplicity we put Crsr 'grad next to the upper-left corner.
//linke obere Ecke gesetzt.
Point
aPt
(
pOldSelFly
->
Frm
().
Pos
()
);
Point
aPt
(
pOldSelFly
->
Frm
().
Pos
()
);
aPt
.
X
()
-=
1
;
aPt
.
X
()
-=
1
;
sal_Bool
bUnLockView
=
!
IsViewLocked
();
sal_Bool
bUnLockView
=
!
IsViewLocked
();
...
@@ -217,8 +217,8 @@ sal_Bool SwFEShell::SelectObj( const Point& rPt, sal_uInt8 nFlag, SdrObject *pOb
...
@@ -217,8 +217,8 @@ sal_Bool SwFEShell::SelectObj( const Point& rPt, sal_uInt8 nFlag, SdrObject *pOb
if
(
rMrkList
.
GetMarkCount
()
>
1
)
if
(
rMrkList
.
GetMarkCount
()
>
1
)
{
{
//
Ganz dumm ist es, wenn Zeichenobjekte Selektiert waren und
//
Stupid if a characterobject was selected and only
//
nun ein Fly hinzuselektiert wir
d.
//
one fly extra is selecte
d.
for
(
sal_uInt16
i
=
0
;
i
<
rMrkList
.
GetMarkCount
();
++
i
)
for
(
sal_uInt16
i
=
0
;
i
<
rMrkList
.
GetMarkCount
();
++
i
)
{
{
SdrObject
*
pTmpObj
=
rMrkList
.
GetMark
(
i
)
->
GetMarkedSdrObj
();
SdrObject
*
pTmpObj
=
rMrkList
.
GetMark
(
i
)
->
GetMarkedSdrObj
();
...
@@ -332,7 +332,7 @@ sal_Bool SwFEShell::MoveAnchor( sal_uInt16 nDir )
...
@@ -332,7 +332,7 @@ sal_Bool SwFEShell::MoveAnchor( sal_uInt16 nDir )
switch
(
nAnchorId
)
{
switch
(
nAnchorId
)
{
case
FLY_AT_PAGE
:
case
FLY_AT_PAGE
:
{
{
OSL_ENSURE
(
pOld
->
IsPageFrm
(),
"Wrong anchor, page ex
s
pected."
);
OSL_ENSURE
(
pOld
->
IsPageFrm
(),
"Wrong anchor, page expected."
);
if
(
SW_MOVE_UP
==
nDir
)
if
(
SW_MOVE_UP
==
nDir
)
pNew
=
pOld
->
GetPrev
();
pNew
=
pOld
->
GetPrev
();
else
if
(
SW_MOVE_DOWN
==
nDir
)
else
if
(
SW_MOVE_DOWN
==
nDir
)
...
@@ -346,7 +346,7 @@ sal_Bool SwFEShell::MoveAnchor( sal_uInt16 nDir )
...
@@ -346,7 +346,7 @@ sal_Bool SwFEShell::MoveAnchor( sal_uInt16 nDir )
}
}
case
FLY_AT_CHAR
:
case
FLY_AT_CHAR
:
{
{
OSL_ENSURE
(
pOld
->
IsCntntFrm
(),
"Wrong anchor, page ex
s
pected."
);
OSL_ENSURE
(
pOld
->
IsCntntFrm
(),
"Wrong anchor, page expected."
);
if
(
SW_MOVE_LEFT
==
nDir
||
SW_MOVE_RIGHT
==
nDir
)
if
(
SW_MOVE_LEFT
==
nDir
||
SW_MOVE_RIGHT
==
nDir
)
{
{
SwPosition
*
pPos
=
(
SwPosition
*
)
aAnch
.
GetCntntAnchor
();
SwPosition
*
pPos
=
(
SwPosition
*
)
aAnch
.
GetCntntAnchor
();
...
@@ -380,7 +380,7 @@ sal_Bool SwFEShell::MoveAnchor( sal_uInt16 nDir )
...
@@ -380,7 +380,7 @@ sal_Bool SwFEShell::MoveAnchor( sal_uInt16 nDir )
}
// no break!
}
// no break!
case
FLY_AT_PARA
:
case
FLY_AT_PARA
:
{
{
OSL_ENSURE
(
pOld
->
IsCntntFrm
(),
"Wrong anchor, page ex
s
pected."
);
OSL_ENSURE
(
pOld
->
IsCntntFrm
(),
"Wrong anchor, page expected."
);
if
(
SW_MOVE_UP
==
nDir
)
if
(
SW_MOVE_UP
==
nDir
)
pNew
=
pOld
->
FindPrev
();
pNew
=
pOld
->
FindPrev
();
else
if
(
SW_MOVE_DOWN
==
nDir
)
else
if
(
SW_MOVE_DOWN
==
nDir
)
...
@@ -406,7 +406,7 @@ sal_Bool SwFEShell::MoveAnchor( sal_uInt16 nDir )
...
@@ -406,7 +406,7 @@ sal_Bool SwFEShell::MoveAnchor( sal_uInt16 nDir )
}
}
case
FLY_AT_FLY
:
case
FLY_AT_FLY
:
{
{
OSL_ENSURE
(
pOld
->
IsFlyFrm
(),
"Wrong anchor, fly frame ex
s
pected."
);
OSL_ENSURE
(
pOld
->
IsFlyFrm
(),
"Wrong anchor, fly frame expected."
);
SwPageFrm
*
pPage
=
pOld
->
FindPageFrm
();
SwPageFrm
*
pPage
=
pOld
->
FindPageFrm
();
OSL_ENSURE
(
pPage
,
"Where's my page?"
);
OSL_ENSURE
(
pPage
,
"Where's my page?"
);
SwFlyFrm
*
pNewFly
=
NULL
;
SwFlyFrm
*
pNewFly
=
NULL
;
...
@@ -560,7 +560,7 @@ sal_uInt16 SwFEShell::GetSelFrmType() const
...
@@ -560,7 +560,7 @@ sal_uInt16 SwFEShell::GetSelFrmType() const
eType
=
FRMTYPE_FLY_ATCNT
;
eType
=
FRMTYPE_FLY_ATCNT
;
else
else
{
{
OSL_ENSURE
(
pFly
->
IsFlyInCntFrm
(),
"Ne
uer Rahmentyp
?"
);
OSL_ENSURE
(
pFly
->
IsFlyInCntFrm
(),
"Ne
w frametype
?"
);
eType
=
FRMTYPE_FLY_INCNT
;
eType
=
FRMTYPE_FLY_INCNT
;
}
}
}
}
...
@@ -669,7 +669,7 @@ long SwFEShell::EndDrag( const Point *, sal_Bool )
...
@@ -669,7 +669,7 @@ long SwFEShell::EndDrag( const Point *, sal_Bool )
SdrView
*
pView
=
Imp
()
->
GetDrawView
();
SdrView
*
pView
=
Imp
()
->
GetDrawView
();
if
(
pView
->
IsDragObj
()
)
if
(
pView
->
IsDragObj
()
)
{
{
//
Start-/EndActions nur an der ViewShell aufsetzen
//
Setup Start-/EndActions only to the ViewShell
ViewShell
*
pSh
=
this
;
ViewShell
*
pSh
=
this
;
do
{
do
{
pSh
->
StartAction
();
pSh
->
StartAction
();
...
@@ -677,18 +677,18 @@ long SwFEShell::EndDrag( const Point *, sal_Bool )
...
@@ -677,18 +677,18 @@ long SwFEShell::EndDrag( const Point *, sal_Bool )
StartUndo
(
UNDO_START
);
StartUndo
(
UNDO_START
);
//#50778# Bug im Draging: Im StartAction wird ein HideShowXor gerufen.
// #50778# Bug during draging: In StartAction a HideShowXor is called.
//Im EndDragObj() wird dies unsinniger und faelschlicherweise wieder
// In EndDragObj() this is reversed, for no reason and even wrong.
//Rueckgaengig gemacht. Um Konsistenz herzustellen muessen wir das
// To restore consistancy we should bring up the Xor again.
//Xor also wieder zur Anzeige bringen.
// Reanimation from the hack #50778 to fix bug #97057
// Reanimation from the hack #50778 to fix bug #97057
// May be not the best solution, but the one with lowest risc at the moment.
// May be not the best solution, but the one with lowest risc at the moment.
//pView->ShowShownXor( GetOut() );
//
pView->ShowShownXor( GetOut() );
pView
->
EndDragObj
();
pView
->
EndDragObj
();
// DrawUndo-Action auf FlyFrames werden nicht gespeichert
// Die Fly aendern das Flag
// DrawUndo on to flyframes are not stored
// The flys change the flag.
GetDoc
()
->
GetIDocumentUndoRedo
().
DoDrawUndo
(
true
);
GetDoc
()
->
GetIDocumentUndoRedo
().
DoDrawUndo
(
true
);
ChgAnchor
(
0
,
sal_True
);
ChgAnchor
(
0
,
sal_True
);
...
@@ -725,8 +725,8 @@ void SwFEShell::BreakDrag()
...
@@ -725,8 +725,8 @@ void SwFEShell::BreakDrag()
|*
|*
|* SwFEShell::SelFlyGrabCrsr()
|* SwFEShell::SelFlyGrabCrsr()
|*
|*
|*
Beschreibung Wenn ein Fly selektiert ist, zieht er den C
rsr in
|*
Description If a fly is selected, pulls the c
rsr in
|*
den ersten
CntntFrm
|*
the first
CntntFrm
*************************************************************************/
*************************************************************************/
const
SwFrmFmt
*
SwFEShell
::
SelFlyGrabCrsr
()
const
SwFrmFmt
*
SwFEShell
::
SelFlyGrabCrsr
()
...
@@ -766,19 +766,17 @@ const SwFrmFmt* SwFEShell::SelFlyGrabCrsr()
...
@@ -766,19 +766,17 @@ const SwFrmFmt* SwFEShell::SelFlyGrabCrsr()
|*
|*
|* SwFEShell::SelectionToTop(), SelectionToBottom()
|* SwFEShell::SelectionToTop(), SelectionToBottom()
|*
|*
|*
Beschreibung Selektion nach oben/unten
(Z-Order)
|*
Description Selection to above/below
(Z-Order)
|*
|*
*************************************************************************/
*************************************************************************/
void
lcl_NotifyNeighbours
(
const
SdrMarkList
*
pLst
)
void
lcl_NotifyNeighbours
(
const
SdrMarkList
*
pLst
)
{
{
//Die Regeln fuer die Ausweichmanoever haben sich veraendert.
// Rules for dodging have changed.
//1. Die Umgebung des Fly und aller innenliegenden muss benachrichtigt
// 1. The environment of the fly and everything inside should be notified
// werden.
// 2. The content of the frame itself has to be notified
//2. Der Inhalt des Rahmen selbst muss benachrichtigt werden.
// 3. Frames dodging inside frames have to be notified
//3. Rahmen die dem Rahmen ausweichen bzw. wichen muessen benachrichtigt werden.
// 4. Also characterobjects can displace frames
//4. Auch Zeichenobjekte koennen Rahmen verdraengen
for
(
sal_uInt16
j
=
0
;
j
<
pLst
->
GetMarkCount
();
++
j
)
for
(
sal_uInt16
j
=
0
;
j
<
pLst
->
GetMarkCount
();
++
j
)
{
{
SwPageFrm
*
pPage
;
SwPageFrm
*
pPage
;
...
@@ -854,7 +852,7 @@ void SwFEShell::SelectionToTop( sal_Bool bTop )
...
@@ -854,7 +852,7 @@ void SwFEShell::SelectionToTop( sal_Bool bTop )
{
{
OSL_ENSURE
(
Imp
()
->
HasDrawView
(),
"SelectionToTop without DrawView?"
);
OSL_ENSURE
(
Imp
()
->
HasDrawView
(),
"SelectionToTop without DrawView?"
);
const
SdrMarkList
&
rMrkList
=
Imp
()
->
GetDrawView
()
->
GetMarkedObjectList
();
const
SdrMarkList
&
rMrkList
=
Imp
()
->
GetDrawView
()
->
GetMarkedObjectList
();
OSL_ENSURE
(
rMrkList
.
GetMarkCount
(),
"
Kein Object Selektiert
."
);
OSL_ENSURE
(
rMrkList
.
GetMarkCount
(),
"
No object selected
."
);
SwFlyFrm
*
pFly
=
::
GetFlyFromMarked
(
&
rMrkList
,
this
);
SwFlyFrm
*
pFly
=
::
GetFlyFromMarked
(
&
rMrkList
,
this
);
if
(
pFly
&&
pFly
->
IsFlyInCntFrm
()
)
if
(
pFly
&&
pFly
->
IsFlyInCntFrm
()
)
...
@@ -874,7 +872,7 @@ void SwFEShell::SelectionToBottom( sal_Bool bBottom )
...
@@ -874,7 +872,7 @@ void SwFEShell::SelectionToBottom( sal_Bool bBottom )
{
{
OSL_ENSURE
(
Imp
()
->
HasDrawView
(),
"SelectionToBottom without DrawView?"
);
OSL_ENSURE
(
Imp
()
->
HasDrawView
(),
"SelectionToBottom without DrawView?"
);
const
SdrMarkList
&
rMrkList
=
Imp
()
->
GetDrawView
()
->
GetMarkedObjectList
();
const
SdrMarkList
&
rMrkList
=
Imp
()
->
GetDrawView
()
->
GetMarkedObjectList
();
OSL_ENSURE
(
rMrkList
.
GetMarkCount
(),
"
Kein Object Selektiert
."
);
OSL_ENSURE
(
rMrkList
.
GetMarkCount
(),
"
No object selected
."
);
SwFlyFrm
*
pFly
=
::
GetFlyFromMarked
(
&
rMrkList
,
this
);
SwFlyFrm
*
pFly
=
::
GetFlyFromMarked
(
&
rMrkList
,
this
);
if
(
pFly
&&
pFly
->
IsFlyInCntFrm
()
)
if
(
pFly
&&
pFly
->
IsFlyInCntFrm
()
)
...
@@ -894,8 +892,8 @@ void SwFEShell::SelectionToBottom( sal_Bool bBottom )
...
@@ -894,8 +892,8 @@ void SwFEShell::SelectionToBottom( sal_Bool bBottom )
|*
|*
|* SwFEShell::GetLayerId()
|* SwFEShell::GetLayerId()
|*
|*
|*
Beschreibung Objekt ueber/unter dem Dok
ument?
|*
Description Object above/below the doc
ument?
|* 2 Controls, 1 Heaven, 0 Hell, -1
Uneindeutig
|* 2 Controls, 1 Heaven, 0 Hell, -1
Ambiguous
*************************************************************************/
*************************************************************************/
short
SwFEShell
::
GetLayerId
()
const
short
SwFEShell
::
GetLayerId
()
const
...
@@ -927,7 +925,7 @@ short SwFEShell::GetLayerId() const
...
@@ -927,7 +925,7 @@ short SwFEShell::GetLayerId() const
|*
|*
|* SwFEShell::SelectionToHeaven(), SelectionToHell()
|* SwFEShell::SelectionToHeaven(), SelectionToHell()
|*
|*
|*
Beschreibung Objekt ueber/unter dem Dok
ument
|*
Description Object above/below the doc
ument
|*
|*
*************************************************************************/
*************************************************************************/
// Note: only visible objects can be marked. Thus, objects with invisible
// Note: only visible objects can be marked. Thus, objects with invisible
...
@@ -1020,9 +1018,9 @@ sal_Bool SwFEShell::IsObjSelected( const SdrObject& rObj ) const
...
@@ -1020,9 +1018,9 @@ sal_Bool SwFEShell::IsObjSelected( const SdrObject& rObj ) const
void
SwFEShell
::
EndTextEdit
()
void
SwFEShell
::
EndTextEdit
()
{
{
//
Beenden des TextEditModus. Wenn gewuenscht (default wenn das Objek
t
//
Terminate the TextEditMode. If required (default if the objec
t
//
keinen Text mehr enthaelt und keine Attribute traegt) wird das
//
does not contain any more text and does not carry attributes) the object
//
Objekt gel�scht. Alle anderen markierten Objekte bleiben erhalten
.
//
is deleted. All other objects marked are preserved
.
OSL_ENSURE
(
Imp
()
->
HasDrawView
()
&&
Imp
()
->
GetDrawView
()
->
IsTextEdit
(),
OSL_ENSURE
(
Imp
()
->
HasDrawView
()
&&
Imp
()
->
GetDrawView
()
->
IsTextEdit
(),
"EndTextEdit an no Object"
);
"EndTextEdit an no Object"
);
...
@@ -1229,13 +1227,13 @@ sal_Bool SwFEShell::ShouldObjectBeSelected(const Point& rPt)
...
@@ -1229,13 +1227,13 @@ sal_Bool SwFEShell::ShouldObjectBeSelected(const Point& rPt)
|*
|*
|* SwFEShell::GotoObj()
|* SwFEShell::GotoObj()
|*
|*
|*
Beschreibung Wenn ein Obj selektiert ist, gehen wir von dessen
|*
Description If an object was selected, we assume its upper-left corner
|*
TopLeft aus, andernfalls von der Mitte des aktuellen
CharRects.
|*
otherwise the middle of the current
CharRects.
|*
|*
*************************************************************************/
*************************************************************************/
/* --------------------------------------------------
/* --------------------------------------------------
*
Beinhaltet das Objekt ein Control oder Gruppen
,
*
Does the object include a control or groups
,
*
die nur aus Controls bestehen
*
which comprise only controls
* --------------------------------------------------*/
* --------------------------------------------------*/
sal_Bool
lcl_IsControlGroup
(
const
SdrObject
*
pObj
)
sal_Bool
lcl_IsControlGroup
(
const
SdrObject
*
pObj
)
{
{
...
@@ -1304,7 +1302,7 @@ const SdrObject* SwFEShell::GetBestObject( sal_Bool bNext, sal_uInt16 /*GOTOOBJ_
...
@@ -1304,7 +1302,7 @@ const SdrObject* SwFEShell::GetBestObject( sal_Bool bNext, sal_uInt16 /*GOTOOBJ_
if
(
!
pBest
||
rMrkList
.
GetMarkCount
()
==
1
)
if
(
!
pBest
||
rMrkList
.
GetMarkCount
()
==
1
)
{
{
//
Ausgangspunkt bestimmen.
//
Determine starting point
SdrObjList
*
pList
=
NULL
;
SdrObjList
*
pList
=
NULL
;
if
(
rMrkList
.
GetMarkCount
()
)
if
(
rMrkList
.
GetMarkCount
()
)
{
{
...
@@ -1382,10 +1380,10 @@ const SdrObject* SwFEShell::GetBestObject( sal_Bool bNext, sal_uInt16 /*GOTOOBJ_
...
@@ -1382,10 +1380,10 @@ const SdrObject* SwFEShell::GetBestObject( sal_Bool bNext, sal_uInt16 /*GOTOOBJ_
else
else
aCurPos
=
pObj
->
GetCurrentBoundRect
().
TopLeft
();
aCurPos
=
pObj
->
GetCurrentBoundRect
().
TopLeft
();
// S
onderfall wenn ein anderes Obj auf selber Y steht
.
// S
pecial case if another object is on same Y
.
if
(
aCurPos
!=
aPos
&&
//
nur wenn ich es nicht selber bin
if
(
aCurPos
!=
aPos
&&
//
only when it is not me
aCurPos
.
Y
()
==
aPos
.
Y
()
&&
// is
t die Y Position gleich
aCurPos
.
Y
()
==
aPos
.
Y
()
&&
// is
equal to the Y position
(
bNext
?
(
aCurPos
.
X
()
>
aPos
.
X
())
:
// lie
gt neben mir
(
bNext
?
(
aCurPos
.
X
()
>
aPos
.
X
())
:
// lie
s next to me
(
aCurPos
.
X
()
<
aPos
.
X
()))
)
// " reverse
(
aCurPos
.
X
()
<
aPos
.
X
()))
)
// " reverse
{
{
aBestPos
=
Point
(
nTmp
,
nTmp
);
aBestPos
=
Point
(
nTmp
,
nTmp
);
...
@@ -1405,9 +1403,9 @@ const SdrObject* SwFEShell::GetBestObject( sal_Bool bNext, sal_uInt16 /*GOTOOBJ_
...
@@ -1405,9 +1403,9 @@ const SdrObject* SwFEShell::GetBestObject( sal_Bool bNext, sal_uInt16 /*GOTOOBJ_
aCurPos
=
pTmpObj
->
GetCurrentBoundRect
().
TopLeft
();
aCurPos
=
pTmpObj
->
GetCurrentBoundRect
().
TopLeft
();
if
(
aCurPos
!=
aPos
&&
aCurPos
.
Y
()
==
aPos
.
Y
()
&&
if
(
aCurPos
!=
aPos
&&
aCurPos
.
Y
()
==
aPos
.
Y
()
&&
(
bNext
?
(
aCurPos
.
X
()
>
aPos
.
X
())
:
// lie
gt neben mir
(
bNext
?
(
aCurPos
.
X
()
>
aPos
.
X
())
:
// lie
s next to me
(
aCurPos
.
X
()
<
aPos
.
X
()))
&&
// " reverse
(
aCurPos
.
X
()
<
aPos
.
X
()))
&&
// " reverse
(
bNext
?
(
aCurPos
.
X
()
<
aBestPos
.
X
())
:
// be
sser als Beste
(
bNext
?
(
aCurPos
.
X
()
<
aBestPos
.
X
())
:
// be
tter as best
(
aCurPos
.
X
()
>
aBestPos
.
X
()))
)
// " reverse
(
aCurPos
.
X
()
>
aBestPos
.
X
()))
)
// " reverse
{
{
aBestPos
=
aCurPos
;
aBestPos
=
aCurPos
;
...
@@ -1418,13 +1416,13 @@ const SdrObject* SwFEShell::GetBestObject( sal_Bool bNext, sal_uInt16 /*GOTOOBJ_
...
@@ -1418,13 +1416,13 @@ const SdrObject* SwFEShell::GetBestObject( sal_Bool bNext, sal_uInt16 /*GOTOOBJ_
}
}
if
(
(
if
(
(
(
bNext
?
(
aPos
.
Y
()
<
aCurPos
.
Y
())
:
//
nur unter mir
(
bNext
?
(
aPos
.
Y
()
<
aCurPos
.
Y
())
:
//
only below me
(
aPos
.
Y
()
>
aCurPos
.
Y
()))
&&
// " reverse
(
aPos
.
Y
()
>
aCurPos
.
Y
()))
&&
// " reverse
(
bNext
?
(
aBestPos
.
Y
()
>
aCurPos
.
Y
())
:
// n
aeher drunter
(
bNext
?
(
aBestPos
.
Y
()
>
aCurPos
.
Y
())
:
// n
ext below
(
aBestPos
.
Y
()
<
aCurPos
.
Y
()))
(
aBestPos
.
Y
()
<
aCurPos
.
Y
()))
)
||
// " reverse
)
||
// " reverse
(
aBestPos
.
Y
()
==
aCurPos
.
Y
()
&&
(
aBestPos
.
Y
()
==
aCurPos
.
Y
()
&&
(
bNext
?
(
aBestPos
.
X
()
>
aCurPos
.
X
())
:
//
weiter links
(
bNext
?
(
aBestPos
.
X
()
>
aCurPos
.
X
())
:
//
continue left
(
aBestPos
.
X
()
<
aCurPos
.
X
()))))
// " reverse
(
aBestPos
.
X
()
<
aCurPos
.
X
()))))
// " reverse
{
{
...
@@ -1432,17 +1430,17 @@ const SdrObject* SwFEShell::GetBestObject( sal_Bool bNext, sal_uInt16 /*GOTOOBJ_
...
@@ -1432,17 +1430,17 @@ const SdrObject* SwFEShell::GetBestObject( sal_Bool bNext, sal_uInt16 /*GOTOOBJ_
pBest
=
pObj
;
pBest
=
pObj
;
}
}
if
(
(
bNext
?
(
aTopPos
.
Y
()
>
aCurPos
.
Y
())
:
// h
oeher als Beste
if
(
(
bNext
?
(
aTopPos
.
Y
()
>
aCurPos
.
Y
())
:
// h
igher as best
(
aTopPos
.
Y
()
<
aCurPos
.
Y
()))
||
// " reverse
(
aTopPos
.
Y
()
<
aCurPos
.
Y
()))
||
// " reverse
(
aTopPos
.
Y
()
==
aCurPos
.
Y
()
&&
(
aTopPos
.
Y
()
==
aCurPos
.
Y
()
&&
(
bNext
?
(
aTopPos
.
X
()
>
aCurPos
.
X
())
:
//
weiter links
(
bNext
?
(
aTopPos
.
X
()
>
aCurPos
.
X
())
:
//
continue left
(
aTopPos
.
X
()
<
aCurPos
.
X
()))))
// " reverse
(
aTopPos
.
X
()
<
aCurPos
.
X
()))))
// " reverse
{
{
aTopPos
=
aCurPos
;
aTopPos
=
aCurPos
;
pTop
=
pObj
;
pTop
=
pObj
;
}
}
}
}
//
leider nichts gefunden
//
unfortunately nothing found
if
(
(
bNext
?
(
aBestPos
.
X
()
==
LONG_MAX
)
:
(
aBestPos
.
X
()
==
0
))
)
if
(
(
bNext
?
(
aBestPos
.
X
()
==
LONG_MAX
)
:
(
aBestPos
.
X
()
==
0
))
)
pBest
=
pTop
;
pBest
=
pTop
;
}
}
...
@@ -1549,9 +1547,8 @@ void SwFEShell::MoveCreate( const Point &rPos )
...
@@ -1549,9 +1547,8 @@ void SwFEShell::MoveCreate( const Point &rPos )
sal_Bool
SwFEShell
::
EndCreate
(
sal_uInt16
eSdrCreateCmd
)
sal_Bool
SwFEShell
::
EndCreate
(
sal_uInt16
eSdrCreateCmd
)
{
{
// Damit das Undo-Object aus der DrawEngine nicht bei uns
// To assure undo-object from the DrawEngine is not stored,
// gespeichert wird, (wir erzeugen ein eigenes Undo-Object!) hier kurz
// (we create our own undo-object!), temporarily switch-off Undo
// das Undo abschalten
OSL_ENSURE
(
Imp
()
->
HasDrawView
(),
"EndCreate without DrawView?"
);
OSL_ENSURE
(
Imp
()
->
HasDrawView
(),
"EndCreate without DrawView?"
);
if
(
!
Imp
()
->
GetDrawView
()
->
IsGroupEntered
()
)
if
(
!
Imp
()
->
GetDrawView
()
->
IsGroupEntered
()
)
{
{
...
@@ -1579,14 +1576,13 @@ sal_Bool SwFEShell::EndCreate( sal_uInt16 eSdrCreateCmd )
...
@@ -1579,14 +1576,13 @@ sal_Bool SwFEShell::EndCreate( sal_uInt16 eSdrCreateCmd )
sal_Bool
SwFEShell
::
ImpEndCreate
()
sal_Bool
SwFEShell
::
ImpEndCreate
()
{
{
OSL_ENSURE
(
Imp
()
->
GetDrawView
()
->
GetMarkedObjectList
().
GetMarkCount
()
==
1
,
OSL_ENSURE
(
Imp
()
->
GetDrawView
()
->
GetMarkedObjectList
().
GetMarkCount
()
==
1
,
"Ne
ues Object nicht selektiert
."
);
"Ne
w object not selected
."
);
SdrObject
&
rSdrObj
=
*
Imp
()
->
GetDrawView
()
->
GetMarkedObjectList
().
GetMark
(
0
)
->
GetMarkedSdrObj
();
SdrObject
&
rSdrObj
=
*
Imp
()
->
GetDrawView
()
->
GetMarkedObjectList
().
GetMark
(
0
)
->
GetMarkedSdrObj
();
if
(
rSdrObj
.
GetSnapRect
().
IsEmpty
()
)
if
(
rSdrObj
.
GetSnapRect
().
IsEmpty
()
)
{
{
// das Object vergessen wir lieber, fuerht nur
// preferably we forget the object, only gives problems
// zu Problemen
Imp
()
->
GetDrawView
()
->
DeleteMarked
();
Imp
()
->
GetDrawView
()
->
DeleteMarked
();
Imp
()
->
GetDrawView
()
->
UnmarkAll
();
Imp
()
->
GetDrawView
()
->
UnmarkAll
();
::
FrameNotify
(
this
,
FLY_DRAG_END
);
::
FrameNotify
(
this
,
FLY_DRAG_END
);
...
@@ -1612,13 +1608,13 @@ sal_Bool SwFEShell::ImpEndCreate()
...
@@ -1612,13 +1608,13 @@ sal_Bool SwFEShell::ImpEndCreate()
const
Rectangle
&
rBound
=
rSdrObj
.
GetSnapRect
();
const
Rectangle
&
rBound
=
rSdrObj
.
GetSnapRect
();
Point
aPt
(
rBound
.
TopRight
()
);
Point
aPt
(
rBound
.
TopRight
()
);
//
Fremde Identifier sollen in den Default laufen.
//
alien identifier should end up on defaults
//
Ueberschneidungen sind moeglich
!!
//
duplications possible
!!
sal_uInt16
nIdent
=
SdrInventor
==
rSdrObj
.
GetObjInventor
()
sal_uInt16
nIdent
=
SdrInventor
==
rSdrObj
.
GetObjInventor
()
?
rSdrObj
.
GetObjIdentifier
()
?
rSdrObj
.
GetObjIdentifier
()
:
0xFFFF
;
:
0xFFFF
;
//
Default fuer Controls ist Zeichengebunden, Absatzgebunden sonst
.
//
default for controls character bound, otherwise paragraph bound
.
SwFmtAnchor
aAnch
;
SwFmtAnchor
aAnch
;
const
SwFrm
*
pAnch
=
0
;
const
SwFrm
*
pAnch
=
0
;
sal_Bool
bCharBound
=
sal_False
;
sal_Bool
bCharBound
=
sal_False
;
...
@@ -1629,14 +1625,14 @@ sal_Bool SwFEShell::ImpEndCreate()
...
@@ -1629,14 +1625,14 @@ sal_Bool SwFEShell::ImpEndCreate()
Point
aPoint
(
aPt
.
X
(),
aPt
.
Y
()
+
rBound
.
GetHeight
()
/
2
);
Point
aPoint
(
aPt
.
X
(),
aPt
.
Y
()
+
rBound
.
GetHeight
()
/
2
);
GetLayout
()
->
GetCrsrOfst
(
&
aPos
,
aPoint
,
&
aState
);
//swmod 080317
GetLayout
()
->
GetCrsrOfst
(
&
aPos
,
aPoint
,
&
aState
);
//swmod 080317
//
Zeichenbindung ist im ReadnOnly-Inhalt nicht erlaub
t
//
characterbinding not allowed in readonly-conten
t
if
(
!
aPos
.
nNode
.
GetNode
().
IsProtect
()
)
if
(
!
aPos
.
nNode
.
GetNode
().
IsProtect
()
)
{
{
pAnch
=
aPos
.
nNode
.
GetNode
().
GetCntntNode
()
->
getLayoutFrm
(
GetLayout
(),
&
aPoint
,
&
aPos
);
pAnch
=
aPos
.
nNode
.
GetNode
().
GetCntntNode
()
->
getLayoutFrm
(
GetLayout
(),
&
aPoint
,
&
aPos
);
SwRect
aTmp
;
SwRect
aTmp
;
pAnch
->
GetCharRect
(
aTmp
,
aPos
);
pAnch
->
GetCharRect
(
aTmp
,
aPos
);
//
Der Crsr darf nicht zu weit entfernt sein.
//
The crsr should not be to far
bCharBound
=
sal_True
;
bCharBound
=
sal_True
;
Rectangle
aRect
(
aTmp
.
SVRect
()
);
Rectangle
aRect
(
aTmp
.
SVRect
()
);
aRect
.
Left
()
-=
MM50
*
2
;
aRect
.
Left
()
-=
MM50
*
2
;
...
@@ -1647,7 +1643,7 @@ sal_Bool SwFEShell::ImpEndCreate()
...
@@ -1647,7 +1643,7 @@ sal_Bool SwFEShell::ImpEndCreate()
if
(
!
aRect
.
IsOver
(
rBound
)
&&
!::
GetHtmlMode
(
GetDoc
()
->
GetDocShell
()
))
if
(
!
aRect
.
IsOver
(
rBound
)
&&
!::
GetHtmlMode
(
GetDoc
()
->
GetDocShell
()
))
bCharBound
=
sal_False
;
bCharBound
=
sal_False
;
//Bindung in Kopf-/Fusszeilen ist ebenfalls nicht erlaubt
.
// binding in header/footer lines also not allowed
.
if
(
bCharBound
)
if
(
bCharBound
)
bCharBound
=
!
GetDoc
()
->
IsInHeaderFooter
(
aPos
.
nNode
);
bCharBound
=
!
GetDoc
()
->
IsInHeaderFooter
(
aPos
.
nNode
);
...
@@ -1674,10 +1670,10 @@ sal_Bool SwFEShell::ImpEndCreate()
...
@@ -1674,10 +1670,10 @@ sal_Bool SwFEShell::ImpEndCreate()
SwPosition
aPos
(
GetDoc
()
->
GetNodes
()
);
SwPosition
aPos
(
GetDoc
()
->
GetNodes
()
);
GetLayout
()
->
GetCrsrOfst
(
&
aPos
,
aPoint
,
&
aState
);
GetLayout
()
->
GetCrsrOfst
(
&
aPos
,
aPoint
,
&
aState
);
//
nicht in ReadnOnly-Inhalt setzen
//
do not set in ReadnOnly-content
if
(
aPos
.
nNode
.
GetNode
().
IsProtect
()
)
if
(
aPos
.
nNode
.
GetNode
().
IsProtect
()
)
//
dann darf er nur seitengebunden sein. Oder sollte man
//
then only page bound. Or should we
//
die naechste nicht READONLY Position suche
n?
//
search the next not-readonly positio
n?
bAtPage
=
true
;
bAtPage
=
true
;
pAnch
=
aPos
.
nNode
.
GetNode
().
GetCntntNode
()
->
getLayoutFrm
(
GetLayout
(),
&
aPoint
,
0
,
sal_False
);
pAnch
=
aPos
.
nNode
.
GetNode
().
GetCntntNode
()
->
getLayoutFrm
(
GetLayout
(),
&
aPoint
,
0
,
sal_False
);
...
@@ -1707,16 +1703,15 @@ sal_Bool SwFEShell::ImpEndCreate()
...
@@ -1707,16 +1703,15 @@ sal_Bool SwFEShell::ImpEndCreate()
if
(
!
pPage
)
if
(
!
pPage
)
pPage
=
pAnch
->
FindPageFrm
();
pPage
=
pAnch
->
FindPageFrm
();
// immer ueber FindAnchor gehen, damit der Frame immer an den
// Always via FindAnchor, to assure the frame will be bound
// davorgehen gebunden wird. Beim GetCrsOfst kann man auch zum
// to the previous. With GetCrsOfst we can also reach the next. THIS IS WRONG.
// nachfolgenden kommen. DAS IST FALSCH
pAnch
=
::
FindAnchor
(
pPage
,
aPt
,
bBodyOnly
);
pAnch
=
::
FindAnchor
(
pPage
,
aPt
,
bBodyOnly
);
aPos
.
nNode
=
*
((
SwCntntFrm
*
)
pAnch
)
->
GetNode
();
aPos
.
nNode
=
*
((
SwCntntFrm
*
)
pAnch
)
->
GetNode
();
//
nicht in ReadnOnly-Inhalt setzen
//
do not set in ReadnOnly-content
if
(
aPos
.
nNode
.
GetNode
().
IsProtect
()
)
if
(
aPos
.
nNode
.
GetNode
().
IsProtect
()
)
//
dann darf er nur seitengebunden sein. Oder sollte man
//
then only page bound. Or should we
//
die naechste nicht READONLY Position suche
n?
//
search the next not-readonly positio
n?
bAtPage
=
true
;
bAtPage
=
true
;
else
else
{
{
...
@@ -1731,7 +1726,7 @@ sal_Bool SwFEShell::ImpEndCreate()
...
@@ -1731,7 +1726,7 @@ sal_Bool SwFEShell::ImpEndCreate()
aAnch
.
SetType
(
FLY_AT_PAGE
);
aAnch
.
SetType
(
FLY_AT_PAGE
);
aAnch
.
SetPageNum
(
pPage
->
GetPhyPageNum
()
);
aAnch
.
SetPageNum
(
pPage
->
GetPhyPageNum
()
);
pAnch
=
pPage
;
//
die Page wird jetzt zum Anke
r
pAnch
=
pPage
;
//
page becomes an ancho
r
}
}
}
}
...
@@ -1768,7 +1763,7 @@ sal_Bool SwFEShell::ImpEndCreate()
...
@@ -1768,7 +1763,7 @@ sal_Bool SwFEShell::ImpEndCreate()
if
(
OBJ_NONE
==
nIdent
)
if
(
OBJ_NONE
==
nIdent
)
{
{
//
Bei OBJ_NONE wird ein Fly eingefuegt
.
//
For OBJ_NONE a fly is inserted
.
const
long
nWidth
=
rBound
.
Right
()
-
rBound
.
Left
();
const
long
nWidth
=
rBound
.
Right
()
-
rBound
.
Left
();
const
long
nHeight
=
rBound
.
Bottom
()
-
rBound
.
Top
();
const
long
nHeight
=
rBound
.
Bottom
()
-
rBound
.
Top
();
aSet
.
Put
(
SwFmtFrmSize
(
ATT_MIN_SIZE
,
Max
(
nWidth
,
long
(
MINFLY
)
),
aSet
.
Put
(
SwFmtFrmSize
(
ATT_MIN_SIZE
,
Max
(
nWidth
,
long
(
MINFLY
)
),
...
@@ -1780,11 +1775,11 @@ sal_Bool SwFEShell::ImpEndCreate()
...
@@ -1780,11 +1775,11 @@ sal_Bool SwFEShell::ImpEndCreate()
aSet
.
Put
(
aHori
);
aSet
.
Put
(
aHori
);
aSet
.
Put
(
aVert
);
aSet
.
Put
(
aVert
);
//
Schnell noch das Rechteck merken
//
Quickly store the square
const
SwRect
aFlyRect
(
rBound
);
const
SwRect
aFlyRect
(
rBound
);
//
Erzeugtes Object wegwerfen, so kann der Fly am elegentesten
//
Throw away generated object, now the fly can nicely
//
ueber vorhandene SS erzeugt werden
.
//
via the available SS be generated
.
GetDoc
()
->
GetIDocumentUndoRedo
().
DoDrawUndo
(
false
);
// see above
GetDoc
()
->
GetIDocumentUndoRedo
().
DoDrawUndo
(
false
);
// see above
// #i52858# - method name changed
// #i52858# - method name changed
SdrPage
*
pPg
=
getIDocumentDrawModelAccess
()
->
GetOrCreateDrawModel
()
->
GetPage
(
0
);
SdrPage
*
pPg
=
getIDocumentDrawModelAccess
()
->
GetOrCreateDrawModel
()
->
GetPage
(
0
);
...
@@ -1805,7 +1800,7 @@ sal_Bool SwFEShell::ImpEndCreate()
...
@@ -1805,7 +1800,7 @@ sal_Bool SwFEShell::ImpEndCreate()
0
!=
(
pFlyFrm
=
FindFlyFrm
()
))
0
!=
(
pFlyFrm
=
FindFlyFrm
()
))
{
{
SfxItemSet
aHtmlSet
(
GetDoc
()
->
GetAttrPool
(),
RES_VERT_ORIENT
,
RES_HORI_ORIENT
);
SfxItemSet
aHtmlSet
(
GetDoc
()
->
GetAttrPool
(),
RES_VERT_ORIENT
,
RES_HORI_ORIENT
);
//
Horizontale Ausrichtung
:
//
horizontal orientation
:
const
sal_Bool
bLeftFrm
=
aFlyRect
.
Left
()
<
const
sal_Bool
bLeftFrm
=
aFlyRect
.
Left
()
<
pAnch
->
Frm
().
Left
()
+
pAnch
->
Prt
().
Left
(),
pAnch
->
Frm
().
Left
()
+
pAnch
->
Prt
().
Left
(),
bLeftPrt
=
aFlyRect
.
Left
()
+
aFlyRect
.
Width
()
<
bLeftPrt
=
aFlyRect
.
Left
()
+
aFlyRect
.
Width
()
<
...
@@ -2005,8 +2000,8 @@ sal_Bool SwFEShell::EndMark()
...
@@ -2005,8 +2000,8 @@ sal_Bool SwFEShell::EndMark()
{
{
sal_Bool
bShowHdl
=
sal_False
;
sal_Bool
bShowHdl
=
sal_False
;
SwDrawView
*
pDView
=
Imp
()
->
GetDrawView
();
SwDrawView
*
pDView
=
Imp
()
->
GetDrawView
();
//
Rahmen werden auf diese Art nicht Selektiert, es sein denn es
//
frames are not selected this way, except when
//
ist nur ein Rahmen.
//
it is only one frame
SdrMarkList
&
rMrkList
=
(
SdrMarkList
&
)
pDView
->
GetMarkedObjectList
();
SdrMarkList
&
rMrkList
=
(
SdrMarkList
&
)
pDView
->
GetMarkedObjectList
();
SwFlyFrm
*
pOldSelFly
=
::
GetFlyFromMarked
(
&
rMrkList
,
this
);
SwFlyFrm
*
pOldSelFly
=
::
GetFlyFromMarked
(
&
rMrkList
,
this
);
...
@@ -2021,7 +2016,7 @@ sal_Bool SwFEShell::EndMark()
...
@@ -2021,7 +2016,7 @@ sal_Bool SwFEShell::EndMark()
bShowHdl
=
sal_True
;
bShowHdl
=
sal_True
;
}
}
rMrkList
.
DeleteMark
(
i
);
rMrkList
.
DeleteMark
(
i
);
--
i
;
//
keinen auslassen.
--
i
;
//
no exceptions
}
}
}
}
...
@@ -2143,8 +2138,8 @@ void SwFEShell::DelSelectedObj()
...
@@ -2143,8 +2138,8 @@ void SwFEShell::DelSelectedObj()
|*
|*
|* SwFEShell::GetObjSize(), GetAnchorObjDiff()
|* SwFEShell::GetObjSize(), GetAnchorObjDiff()
|*
|*
|*
Beschreibung Fuer die Statuszeile zum Erfragen der aktuellen
|*
Description For the statusline to request the current
|*
Verhaeltnisse
|*
conditions
|*
|*
*************************************************************************/
*************************************************************************/
...
@@ -2308,8 +2303,8 @@ bool SwFEShell::IsGroupAllowed() const
...
@@ -2308,8 +2303,8 @@ bool SwFEShell::IsGroupAllowed() const
|*
|*
|* SwFEShell::GroupSelection()
|* SwFEShell::GroupSelection()
|*
|*
|*
Beschreibung Die Gruppe bekommt den Anker und das Contactobjek
t
|*
Description The group gets the anchor and the contactobjec
t
|*
des ersten in der Selek
tion
|*
of the first in the selec
tion
|*
|*
*************************************************************************/
*************************************************************************/
...
@@ -2331,8 +2326,8 @@ void SwFEShell::GroupSelection()
...
@@ -2331,8 +2326,8 @@ void SwFEShell::GroupSelection()
|*
|*
|* SwFEShell::UnGroupSelection()
|* SwFEShell::UnGroupSelection()
|*
|*
|*
Beschreibung Die Einzelobjekte bekommen eine Kopie vom Anker u
nd
|*
Description The individual objects get a copy of the anchor a
nd
|*
Contactobjekt der Gruppe.
|*
the contactobject of the group
|*
|*
*************************************************************************/
*************************************************************************/
...
@@ -2368,7 +2363,7 @@ void SwFEShell::MirrorSelection( sal_Bool bHorizontal )
...
@@ -2368,7 +2363,7 @@ void SwFEShell::MirrorSelection( sal_Bool bHorizontal )
}
}
}
}
//
springe zum benannten Rahmen (Grafik
/OLE)
//
jump to known frame (Graphic
/OLE)
sal_Bool
SwFEShell
::
GotoFly
(
const
String
&
rName
,
FlyCntType
eType
,
sal_Bool
bSelFrm
)
sal_Bool
SwFEShell
::
GotoFly
(
const
String
&
rName
,
FlyCntType
eType
,
sal_Bool
bSelFrm
)
{
{
...
@@ -2429,7 +2424,7 @@ const SwFrmFmt* SwFEShell::GetFlyNum(sal_uInt16 nIdx, FlyCntType eType ) const
...
@@ -2429,7 +2424,7 @@ const SwFrmFmt* SwFEShell::GetFlyNum(sal_uInt16 nIdx, FlyCntType eType ) const
return
GetDoc
()
->
GetFlyNum
(
nIdx
,
eType
);
return
GetDoc
()
->
GetFlyNum
(
nIdx
,
eType
);
}
}
//
zeige das akt. selektierte "Object" an
//
show the current selected object
void
SwFEShell
::
MakeSelVisible
()
void
SwFEShell
::
MakeSelVisible
()
{
{
if
(
Imp
()
->
HasDrawView
()
&&
if
(
Imp
()
->
HasDrawView
()
&&
...
@@ -2442,7 +2437,7 @@ void SwFEShell::MakeSelVisible()
...
@@ -2442,7 +2437,7 @@ void SwFEShell::MakeSelVisible()
}
}
//
Welcher Schutz ist am selektierten Objekt gesetzt
?
//
how is the selected object protected
?
sal_uInt8
SwFEShell
::
IsSelObjProtected
(
sal_uInt16
eType
)
const
sal_uInt8
SwFEShell
::
IsSelObjProtected
(
sal_uInt16
eType
)
const
{
{
int
nChk
=
0
;
int
nChk
=
0
;
...
@@ -2576,7 +2571,7 @@ sal_Bool SwFEShell::IsAlignPossible() const
...
@@ -2576,7 +2571,7 @@ sal_Bool SwFEShell::IsAlignPossible() const
}
}
//
Temporaerer Fix bis SS von JOE da ist
//
temporary fix till SS of JOE is availale
void
SwFEShell
::
CheckUnboundObjects
()
void
SwFEShell
::
CheckUnboundObjects
()
{
{
SET_CURR_SHELL
(
this
);
SET_CURR_SHELL
(
this
);
...
@@ -2601,8 +2596,8 @@ void SwFEShell::CheckUnboundObjects()
...
@@ -2601,8 +2596,8 @@ void SwFEShell::CheckUnboundObjects()
pPage
=
pLast
;
pPage
=
pLast
;
OSL_ENSURE
(
pPage
,
"Page not found."
);
OSL_ENSURE
(
pPage
,
"Page not found."
);
//
Fremde Identifier sollen in den Default laufen.
//
Alien identifier should roll into the default,
//
Ueberschneidungen sind moeglich
!!
//
Duplications are possible
!!
sal_uInt16
nIdent
=
sal_uInt16
nIdent
=
Imp
()
->
GetDrawView
()
->
GetCurrentObjInventor
()
==
SdrInventor
?
Imp
()
->
GetDrawView
()
->
GetCurrentObjInventor
()
==
SdrInventor
?
Imp
()
->
GetDrawView
()
->
GetCurrentObjIdentifier
()
:
0xFFFF
;
Imp
()
->
GetDrawView
()
->
GetCurrentObjIdentifier
()
:
0xFFFF
;
...
@@ -2617,7 +2612,7 @@ void SwFEShell::CheckUnboundObjects()
...
@@ -2617,7 +2612,7 @@ void SwFEShell::CheckUnboundObjects()
((
SwRect
&
)
GetCharRect
()).
Pos
()
=
aPt
;
((
SwRect
&
)
GetCharRect
()).
Pos
()
=
aPt
;
}
}
//
Erst hier die Action, damit das GetCharRect aktuelle Werte liefert
.
//
First the action here, to assure GetCharRect delivers current values
.
StartAllAction
();
StartAllAction
();
SfxItemSet
aSet
(
GetAttrPool
(),
RES_FRM_SIZE
,
RES_FRM_SIZE
,
SfxItemSet
aSet
(
GetAttrPool
(),
RES_FRM_SIZE
,
RES_FRM_SIZE
,
...
@@ -2659,7 +2654,7 @@ int SwFEShell::Chainable( SwRect &rRect, const SwFrmFmt &rSource,
...
@@ -2659,7 +2654,7 @@ int SwFEShell::Chainable( SwRect &rRect, const SwFrmFmt &rSource,
{
{
rRect
.
Clear
();
rRect
.
Clear
();
//
Die Source darf noch keinen Follow haben
.
//
The source is not allowd to have a follow
.
const
SwFmtChain
&
rChain
=
rSource
.
GetChain
();
const
SwFmtChain
&
rChain
=
rSource
.
GetChain
();
if
(
rChain
.
GetNext
()
)
if
(
rChain
.
GetNext
()
)
return
SW_CHAIN_SOURCE_CHAINED
;
return
SW_CHAIN_SOURCE_CHAINED
;
...
@@ -2677,8 +2672,8 @@ int SwFEShell::Chainable( SwRect &rRect, const SwFrmFmt &rSource,
...
@@ -2677,8 +2672,8 @@ int SwFEShell::Chainable( SwRect &rRect, const SwFrmFmt &rSource,
SwFlyFrm
*
pFly
=
((
SwVirtFlyDrawObj
*
)
pObj
)
->
GetFlyFrm
();
SwFlyFrm
*
pFly
=
((
SwVirtFlyDrawObj
*
)
pObj
)
->
GetFlyFrm
();
rRect
=
pFly
->
Frm
();
rRect
=
pFly
->
Frm
();
//
Ziel darf natuerlich nicht gleich Source sein und es
//
Target and source should not be equal and the list
//
darf keine geschlossene Kette entstehen.
//
should not be cyclic
SwFrmFmt
*
pFmt
=
pFly
->
GetFmt
();
SwFrmFmt
*
pFmt
=
pFly
->
GetFmt
();
return
GetDoc
()
->
Chainable
(
rSource
,
*
pFmt
);
return
GetDoc
()
->
Chainable
(
rSource
,
*
pFmt
);
}
}
...
@@ -2788,16 +2783,16 @@ void SwFEShell::SetChainMarker()
...
@@ -2788,16 +2783,16 @@ void SwFEShell::SetChainMarker()
long
SwFEShell
::
GetSectionWidth
(
SwFmt
&
rFmt
)
const
long
SwFEShell
::
GetSectionWidth
(
SwFmt
&
rFmt
)
const
{
{
SwFrm
*
pFrm
=
GetCurrFrm
();
SwFrm
*
pFrm
=
GetCurrFrm
();
//
Steht der Cursor z.Z. in einem
SectionFrm?
//
Is the cursor at this moment in a
SectionFrm?
if
(
pFrm
&&
pFrm
->
IsInSct
()
)
if
(
pFrm
&&
pFrm
->
IsInSct
()
)
{
{
SwSectionFrm
*
pSect
=
pFrm
->
FindSctFrm
();
SwSectionFrm
*
pSect
=
pFrm
->
FindSctFrm
();
do
do
{
{
// Is
t es der Gewuenscht
e?
// Is
it the right on
e?
if
(
pSect
->
KnowsFormat
(
rFmt
)
)
if
(
pSect
->
KnowsFormat
(
rFmt
)
)
return
pSect
->
Frm
().
Width
();
return
pSect
->
Frm
().
Width
();
// f
uer geschachtelte Bereiche
// f
or nested areas
pSect
=
pSect
->
GetUpper
()
->
FindSctFrm
();
pSect
=
pSect
->
GetUpper
()
->
FindSctFrm
();
}
}
while
(
pSect
);
while
(
pSect
);
...
...
sw/source/core/frmedt/fetab.cxx
Dosyayı görüntüle @
d76091de
...
@@ -774,7 +774,6 @@ void SwFEShell::GetRowSplit( SwFmtRowSplit*& rpSz ) const
...
@@ -774,7 +774,6 @@ void SwFEShell::GetRowSplit( SwFmtRowSplit*& rpSz ) const
* Class : SwFEShell
* Class : SwFEShell
* Methods : SetRowHeight(), GetRowHeight()
* Methods : SetRowHeight(), GetRowHeight()
***********************************************************************/
***********************************************************************/
void
SwFEShell
::
SetRowHeight
(
const
SwFmtFrmSize
&
rNew
)
void
SwFEShell
::
SetRowHeight
(
const
SwFmtFrmSize
&
rNew
)
{
{
SET_CURR_SHELL
(
this
);
SET_CURR_SHELL
(
this
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment