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
869a0f36
Kaydet (Commit)
869a0f36
authored
Kas 04, 2011
tarafından
Philipp Weissenbacher
Kaydeden (comit)
Norbert Thiebaud
Kas 04, 2011
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Translate German comments
üst
6f9d6b6c
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
31 additions
and
32 deletions
+31
-32
doc.cxx
sw/source/core/doc/doc.cxx
+0
-0
docbasic.cxx
sw/source/core/doc/docbasic.cxx
+5
-5
docbm.cxx
sw/source/core/doc/docbm.cxx
+15
-16
docchart.cxx
sw/source/core/doc/docchart.cxx
+7
-7
doccomp.cxx
sw/source/core/doc/doccomp.cxx
+0
-0
doccorr.cxx
sw/source/core/doc/doccorr.cxx
+4
-4
No files found.
sw/source/core/doc/doc.cxx
Dosyayı görüntüle @
869a0f36
This diff is collapsed.
Click to expand it.
sw/source/core/doc/docbasic.cxx
Dosyayı görüntüle @
869a0f36
...
@@ -101,7 +101,7 @@ sal_Bool SwDoc::ExecMacro( const SvxMacro& rMacro, String* pRet, SbxArray* pArgs
...
@@ -101,7 +101,7 @@ sal_Bool SwDoc::ExecMacro( const SvxMacro& rMacro, String* pRet, SbxArray* pArgs
if
(
pRet
&&
SbxNULL
<
pRetValue
->
GetType
()
&&
if
(
pRet
&&
SbxNULL
<
pRetValue
->
GetType
()
&&
SbxVOID
!=
pRetValue
->
GetType
()
)
SbxVOID
!=
pRetValue
->
GetType
()
)
//
gueltiger Wert, also setzen
//
valid value, so set it
*
pRet
=
pRetValue
->
GetString
();
*
pRet
=
pRetValue
->
GetString
();
}
}
break
;
break
;
...
@@ -147,7 +147,7 @@ sal_Bool SwDoc::ExecMacro( const SvxMacro& rMacro, String* pRet, SbxArray* pArgs
...
@@ -147,7 +147,7 @@ sal_Bool SwDoc::ExecMacro( const SvxMacro& rMacro, String* pRet, SbxArray* pArgs
sal_uInt16
SwDoc
::
CallEvent
(
sal_uInt16
nEvent
,
const
SwCallMouseEvent
&
rCallEvent
,
sal_uInt16
SwDoc
::
CallEvent
(
sal_uInt16
nEvent
,
const
SwCallMouseEvent
&
rCallEvent
,
sal_Bool
bCheckPtr
,
SbxArray
*
pArgs
,
const
Link
*
)
sal_Bool
bCheckPtr
,
SbxArray
*
pArgs
,
const
Link
*
)
{
{
if
(
!
pDocShell
)
//
ohne DocShell geht das nicht
!
if
(
!
pDocShell
)
//
we can't do that without a DocShell
!
return
0
;
return
0
;
sal_uInt16
nRet
=
0
;
sal_uInt16
nRet
=
0
;
...
@@ -163,7 +163,7 @@ sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEve
...
@@ -163,7 +163,7 @@ sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEve
if
(
0
!=
(
pItem
=
GetAttrPool
().
GetItem2
(
RES_TXTATR_INETFMT
,
n
)
)
if
(
0
!=
(
pItem
=
GetAttrPool
().
GetItem2
(
RES_TXTATR_INETFMT
,
n
)
)
&&
rCallEvent
.
PTR
.
pINetAttr
==
pItem
)
&&
rCallEvent
.
PTR
.
pINetAttr
==
pItem
)
{
{
bCheckPtr
=
sal_False
;
// als Flag missbrauchen
bCheckPtr
=
sal_False
;
// misuse as a flag
break
;
break
;
}
}
}
}
...
@@ -179,7 +179,7 @@ sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEve
...
@@ -179,7 +179,7 @@ sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEve
{
{
sal_uInt16
nPos
=
GetSpzFrmFmts
()
->
GetPos
(
pFmt
);
sal_uInt16
nPos
=
GetSpzFrmFmts
()
->
GetPos
(
pFmt
);
if
(
USHRT_MAX
!=
nPos
)
if
(
USHRT_MAX
!=
nPos
)
bCheckPtr
=
sal_False
;
//
als Flag missbrauchen
bCheckPtr
=
sal_False
;
//
misuse as a flag
}
}
if
(
!
bCheckPtr
)
if
(
!
bCheckPtr
)
pTbl
=
&
pFmt
->
GetMacro
().
GetMacroTable
();
pTbl
=
&
pFmt
->
GetMacro
().
GetMacroTable
();
...
@@ -200,7 +200,7 @@ sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEve
...
@@ -200,7 +200,7 @@ sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEve
for
(
nPos
=
pIMap
->
GetIMapObjectCount
();
nPos
;
)
for
(
nPos
=
pIMap
->
GetIMapObjectCount
();
nPos
;
)
if
(
pIMapObj
==
pIMap
->
GetIMapObject
(
--
nPos
))
if
(
pIMapObj
==
pIMap
->
GetIMapObject
(
--
nPos
))
{
{
bCheckPtr
=
sal_False
;
//
als Flag missbrauchen
bCheckPtr
=
sal_False
;
//
misuse as a flag
break
;
break
;
}
}
}
}
...
...
sw/source/core/doc/docbm.cxx
Dosyayı görüntüle @
869a0f36
...
@@ -578,7 +578,7 @@ namespace sw { namespace mark
...
@@ -578,7 +578,7 @@ namespace sw { namespace mark
{
{
vector
<
const_iterator_t
>
vMarksToDelete
;
vector
<
const_iterator_t
>
vMarksToDelete
;
bool
isSortingNeeded
=
false
;
bool
isSortingNeeded
=
false
;
// copy all bookmarks in the move area to a vector storing all position data as offset
// copy all bookmarks in the move area to a vector storing all position data as offset
s
// reassignment is performed after the move
// reassignment is performed after the move
for
(
iterator_t
ppMark
=
m_vMarks
.
begin
();
for
(
iterator_t
ppMark
=
m_vMarks
.
begin
();
ppMark
!=
m_vMarks
.
end
();
ppMark
!=
m_vMarks
.
end
();
...
@@ -899,19 +899,19 @@ namespace sw { namespace mark
...
@@ -899,19 +899,19 @@ namespace sw { namespace mark
namespace
namespace
{
{
// A
ufbau vom Array
: 2 longs,
// A
rray structure
: 2 longs,
// 1
. Long enthaelt Type und Position im
DocArray,
// 1
st long contains the type and position in the
DocArray,
// 2
. di
e ContentPosition
// 2
nd long contains th
e ContentPosition
//
//
// CntntType --
// CntntType --
// 0x8000 = Bookmark Pos1
// 0x8000 = Bookmark Pos1
// 0x8001 = Bookmark Pos2
// 0x8001 = Bookmark Pos2
// 0x2000 =
Absatzgebundener Rahmen
// 0x2000 =
Paragraph bound frame
// 0x2001 = Auto
-Absatzgebundener Rahmen, der umgehaengt werden soll
// 0x2001 = Auto
paragraph bound frame, which should be attached
// 0x1000 = Redline Mark
// 0x1000 = Redline Mark
// 0x1001 = Redline Point
// 0x1001 = Redline Point
// 0x0800 = Crsr
aus der
CrsrShell Mark
// 0x0800 = Crsr
from the
CrsrShell Mark
// 0x0801 = Crsr
aus der
CrsrShell Point
// 0x0801 = Crsr
from the
CrsrShell Point
// 0x0400 = UnoCrsr Mark
// 0x0400 = UnoCrsr Mark
// 0x0401 = UnoCrsr Point
// 0x0401 = UnoCrsr Point
//
//
...
@@ -997,7 +997,7 @@ namespace
...
@@ -997,7 +997,7 @@ namespace
const
SwPaM
&
rPam
,
_SwSaveTypeCountContent
&
rSave
,
const
SwPaM
&
rPam
,
_SwSaveTypeCountContent
&
rSave
,
sal_Bool
bChkSelDirection
)
sal_Bool
bChkSelDirection
)
{
{
//
SelektionsRichtung beachte
n
//
Respect direction of selectio
n
bool
bBound1IsStart
=
!
bChkSelDirection
?
sal_True
:
bool
bBound1IsStart
=
!
bChkSelDirection
?
sal_True
:
(
*
rPam
.
GetPoint
()
<
*
rPam
.
GetMark
()
(
*
rPam
.
GetPoint
()
<
*
rPam
.
GetMark
()
?
rPam
.
GetPoint
()
==
&
rPam
.
GetBound
()
?
rPam
.
GetPoint
()
==
&
rPam
.
GetBound
()
...
@@ -1172,13 +1172,12 @@ void _DelBookmarks(
...
@@ -1172,13 +1172,12 @@ void _DelBookmarks(
pDoc
->
getIDocumentMarkAccess
()
->
deleteMarks
(
rStt
,
rEnd
,
pSaveBkmk
,
pSttIdx
,
pEndIdx
);
pDoc
->
getIDocumentMarkAccess
()
->
deleteMarks
(
rStt
,
rEnd
,
pSaveBkmk
,
pSttIdx
,
pEndIdx
);
// kopiere alle Redlines, die im Move Bereich stehen in ein
// Copy all red lines which are in the move area into an array, which holds all position information as offset.
// Array, das alle Angaben auf die Position als Offset speichert.
// Assignement happens after moving.
// Die neue Zuordung erfolgt nach dem Moven.
SwRedlineTbl
&
rTbl
=
(
SwRedlineTbl
&
)
pDoc
->
GetRedlineTbl
();
SwRedlineTbl
&
rTbl
=
(
SwRedlineTbl
&
)
pDoc
->
GetRedlineTbl
();
for
(
sal_uInt16
nCnt
=
0
;
nCnt
<
rTbl
.
Count
();
++
nCnt
)
for
(
sal_uInt16
nCnt
=
0
;
nCnt
<
rTbl
.
Count
();
++
nCnt
)
{
{
//
liegt auf der Position ?
?
//
Is at position
?
SwRedline
*
pRedl
=
rTbl
[
nCnt
];
SwRedline
*
pRedl
=
rTbl
[
nCnt
];
SwPosition
*
pRStt
=
&
pRedl
->
GetBound
(
sal_True
),
SwPosition
*
pRStt
=
&
pRedl
->
GetBound
(
sal_True
),
...
@@ -1314,7 +1313,7 @@ void _SaveCntntIdx(SwDoc* pDoc,
...
@@ -1314,7 +1313,7 @@ void _SaveCntntIdx(SwDoc* pDoc,
}
}
}
}
// 4.
Absatzgebundene Objekte
// 4.
Paragraph bound objects
{
{
SwCntntNode
*
pNode
=
pDoc
->
GetNodes
()[
nNode
]
->
GetCntntNode
();
SwCntntNode
*
pNode
=
pDoc
->
GetNodes
()[
nNode
]
->
GetCntntNode
();
if
(
pNode
)
if
(
pNode
)
...
@@ -1326,7 +1325,7 @@ void _SaveCntntIdx(SwDoc* pDoc,
...
@@ -1326,7 +1325,7 @@ void _SaveCntntIdx(SwDoc* pDoc,
if
(
bViaDoc
)
if
(
bViaDoc
)
pFrm
=
NULL
;
pFrm
=
NULL
;
#endif
#endif
if
(
pFrm
)
//
gibt es ein Layout? Dann ist etwas billiger
...
if
(
pFrm
)
//
Do we have a layout? Then it's a bit cheaper
...
{
{
if
(
pFrm
->
GetDrawObjs
()
)
if
(
pFrm
->
GetDrawObjs
()
)
{
{
...
@@ -1370,7 +1369,7 @@ void _SaveCntntIdx(SwDoc* pDoc,
...
@@ -1370,7 +1369,7 @@ void _SaveCntntIdx(SwDoc* pDoc,
}
}
}
}
}
}
else
//
Schade, kein Layout, dann ist es eben etwas teurer
...
else
//
No layout, so it's a bit more expensive
...
{
{
for
(
aSave
.
SetCount
(
pDoc
->
GetSpzFrmFmts
()
->
Count
()
);
for
(
aSave
.
SetCount
(
pDoc
->
GetSpzFrmFmts
()
->
Count
()
);
aSave
.
GetCount
()
;
)
aSave
.
GetCount
()
;
)
...
...
sw/source/core/doc/docchart.cxx
Dosyayı görüntüle @
869a0f36
...
@@ -72,30 +72,30 @@ sal_Bool SwTable::IsTblComplexForChart( const String& rSelection,
...
@@ -72,30 +72,30 @@ sal_Bool SwTable::IsTblComplexForChart( const String& rSelection,
const
SwTableBox
*
pSttBox
,
*
pEndBox
;
const
SwTableBox
*
pSttBox
,
*
pEndBox
;
if
(
2
<
rSelection
.
Len
()
)
if
(
2
<
rSelection
.
Len
()
)
{
{
//
spitze Klammern am Anfang & Ende enfernen
//
Remove brackets at the beginning and from the end
String
sBox
(
rSelection
);
String
sBox
(
rSelection
);
if
(
'<'
==
sBox
.
GetChar
(
0
)
)
sBox
.
Erase
(
0
,
1
);
if
(
'<'
==
sBox
.
GetChar
(
0
)
)
sBox
.
Erase
(
0
,
1
);
if
(
'>'
==
sBox
.
GetChar
(
sBox
.
Len
()
-
1
)
)
sBox
.
Erase
(
sBox
.
Len
()
-
1
);
if
(
'>'
==
sBox
.
GetChar
(
sBox
.
Len
()
-
1
)
)
sBox
.
Erase
(
sBox
.
Len
()
-
1
);
xub_StrLen
n
Trenne
r
=
sBox
.
Search
(
':'
);
xub_StrLen
n
Seperato
r
=
sBox
.
Search
(
':'
);
OSL_ENSURE
(
STRING_NOTFOUND
!=
n
Trenner
,
"keine gueltige Selek
tion"
);
OSL_ENSURE
(
STRING_NOTFOUND
!=
n
Seperator
,
"no valid selec
tion"
);
pSttBox
=
GetTblBox
(
sBox
.
Copy
(
0
,
n
Trenne
r
));
pSttBox
=
GetTblBox
(
sBox
.
Copy
(
0
,
n
Seperato
r
));
pEndBox
=
GetTblBox
(
sBox
.
Copy
(
n
Trenne
r
+
1
));
pEndBox
=
GetTblBox
(
sBox
.
Copy
(
n
Seperato
r
+
1
));
}
}
else
else
{
{
const
SwTableLines
*
pLns
=
&
GetTabLines
();
const
SwTableLines
*
pLns
=
&
GetTabLines
();
pSttBox
=
(
*
pLns
)[
0
]
->
GetTabBoxes
()[
0
];
pSttBox
=
(
*
pLns
)[
0
]
->
GetTabBoxes
()[
0
];
while
(
!
pSttBox
->
GetSttNd
()
)
while
(
!
pSttBox
->
GetSttNd
()
)
//
bis zur
Content Box!
//
Until the
Content Box!
pSttBox
=
pSttBox
->
GetTabLines
()[
0
]
->
GetTabBoxes
()[
0
];
pSttBox
=
pSttBox
->
GetTabLines
()[
0
]
->
GetTabBoxes
()[
0
];
const
SwTableBoxes
*
pBoxes
=
&
(
*
pLns
)[
pLns
->
Count
()
-
1
]
->
GetTabBoxes
();
const
SwTableBoxes
*
pBoxes
=
&
(
*
pLns
)[
pLns
->
Count
()
-
1
]
->
GetTabBoxes
();
pEndBox
=
(
*
pBoxes
)[
pBoxes
->
Count
()
-
1
];
pEndBox
=
(
*
pBoxes
)[
pBoxes
->
Count
()
-
1
];
while
(
!
pEndBox
->
GetSttNd
()
)
while
(
!
pEndBox
->
GetSttNd
()
)
{
{
//
bis zur
Content Box!
//
Until the
Content Box!
pLns
=
&
pEndBox
->
GetTabLines
();
pLns
=
&
pEndBox
->
GetTabLines
();
pBoxes
=
&
(
*
pLns
)[
pLns
->
Count
()
-
1
]
->
GetTabBoxes
();
pBoxes
=
&
(
*
pLns
)[
pLns
->
Count
()
-
1
]
->
GetTabBoxes
();
pEndBox
=
(
*
pBoxes
)[
pBoxes
->
Count
()
-
1
];
pEndBox
=
(
*
pBoxes
)[
pBoxes
->
Count
()
-
1
];
...
...
sw/source/core/doc/doccomp.cxx
Dosyayı görüntüle @
869a0f36
This diff is collapsed.
Click to expand it.
sw/source/core/doc/doccorr.cxx
Dosyayı görüntüle @
869a0f36
...
@@ -45,7 +45,7 @@
...
@@ -45,7 +45,7 @@
#include <hints.hxx>
#include <hints.hxx>
/*
/*
* M
ACROS um ueber alle CrsrShells zu iterieren
* M
acros to iterate over all CrsrShells
*/
*/
#define PCURSH ((SwCrsrShell*)_pStartShell)
#define PCURSH ((SwCrsrShell*)_pStartShell)
#define FOREACHSHELL_START( pEShell ) \
#define FOREACHSHELL_START( pEShell ) \
...
@@ -327,7 +327,7 @@ void SwDoc::CorrRel(const SwNodeIndex& rOldNode,
...
@@ -327,7 +327,7 @@ void SwDoc::CorrRel(const SwNodeIndex& rOldNode,
{
{
getIDocumentMarkAccess
()
->
correctMarksRelative
(
rOldNode
,
rNewPos
,
nOffset
);
getIDocumentMarkAccess
()
->
correctMarksRelative
(
rOldNode
,
rNewPos
,
nOffset
);
{
//
dann die Redlines korrigieren
{
//
fix the Redlines
SwRedlineTbl
&
rTbl
=
*
pRedlineTbl
;
SwRedlineTbl
&
rTbl
=
*
pRedlineTbl
;
SwPosition
aNewPos
(
rNewPos
);
SwPosition
aNewPos
(
rNewPos
);
for
(
sal_uInt16
n
=
0
;
n
<
rTbl
.
Count
();
++
n
)
for
(
sal_uInt16
n
=
0
;
n
<
rTbl
.
Count
();
++
n
)
...
@@ -344,14 +344,14 @@ void SwDoc::CorrRel(const SwNodeIndex& rOldNode,
...
@@ -344,14 +344,14 @@ void SwDoc::CorrRel(const SwNodeIndex& rOldNode,
SwEditShell
*
SwDoc
::
GetEditShell
(
ViewShell
**
ppSh
)
const
SwEditShell
*
SwDoc
::
GetEditShell
(
ViewShell
**
ppSh
)
const
{
{
// Layout
und OLE-Shells sollten vorhanden sein!
// Layout
and OLE shells should be available
if
(
pCurrentView
)
if
(
pCurrentView
)
{
{
ViewShell
*
pSh
=
pCurrentView
,
*
pVSh
=
pSh
;
ViewShell
*
pSh
=
pCurrentView
,
*
pVSh
=
pSh
;
if
(
ppSh
)
if
(
ppSh
)
*
ppSh
=
pSh
;
*
ppSh
=
pSh
;
//
wir suchen uns eine EditShell, falls diese existiert
//
look for an EditShell (if it exists)
do
{
do
{
if
(
pSh
->
IsA
(
TYPE
(
SwEditShell
)
)
)
if
(
pSh
->
IsA
(
TYPE
(
SwEditShell
)
)
)
return
(
SwEditShell
*
)
pSh
;
return
(
SwEditShell
*
)
pSh
;
...
...
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