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
ed870efe
Kaydet (Commit)
ed870efe
authored
Kas 19, 2011
tarafından
Philipp Weissenbacher
Kaydeden (comit)
Petr Mladek
Kas 23, 2011
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Translated German comments to English.
üst
6151ec07
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
27 deletions
+27
-27
doccomp.cxx
sw/source/core/doc/doccomp.cxx
+1
-1
docdde.cxx
sw/source/core/doc/docdde.cxx
+26
-26
docdesc.cxx
sw/source/core/doc/docdesc.cxx
+0
-0
No files found.
sw/source/core/doc/doccomp.cxx
Dosyayı görüntüle @
ed870efe
...
@@ -1510,7 +1510,7 @@ void SwCompareData::SetRedlinesToDoc( sal_Bool bUseDocInfo )
...
@@ -1510,7 +1510,7 @@ void SwCompareData::SetRedlinesToDoc( sal_Bool bUseDocInfo )
}
}
else
else
{
{
//
liegen hintereinander also zusammen fassen
//
are consecutive, so combine
rSttEnd
=
*
((
SwPaM
*
)
pTmp
->
GetNext
())
->
End
();
rSttEnd
=
*
((
SwPaM
*
)
pTmp
->
GetNext
())
->
End
();
delete
pTmp
->
GetNext
();
delete
pTmp
->
GetNext
();
}
}
...
...
sw/source/core/doc/docdde.cxx
Dosyayı görüntüle @
ed870efe
...
@@ -42,11 +42,11 @@
...
@@ -42,11 +42,11 @@
#include <unotools/charclass.hxx>
#include <unotools/charclass.hxx>
#include <fmtcntnt.hxx>
#include <fmtcntnt.hxx>
#include <doc.hxx>
#include <doc.hxx>
#include <swserv.hxx> // f
uer Server-Funktionalitaet
#include <swserv.hxx> // f
or server functionality
#include <IMark.hxx>
#include <IMark.hxx>
#include <bookmrk.hxx>
#include <bookmrk.hxx>
#include <section.hxx> // f
ue
r SwSectionFmt
#include <section.hxx> // f
o
r SwSectionFmt
#include <swtable.hxx> // f
ue
r SwTable
#include <swtable.hxx> // f
o
r SwTable
#include <node.hxx>
#include <node.hxx>
#include <ndtxt.hxx>
#include <ndtxt.hxx>
#include <pam.hxx>
#include <pam.hxx>
...
@@ -106,20 +106,20 @@ sal_Bool lcl_FindSection( const SwSectionFmtPtr& rpSectFmt, void* pArgs, bool bC
...
@@ -106,20 +106,20 @@ sal_Bool lcl_FindSection( const SwSectionFmtPtr& rpSectFmt, void* pArgs, bool bC
:
GetAppCharClass
().
lower
(
pItem
->
m_Item
)
);
:
GetAppCharClass
().
lower
(
pItem
->
m_Item
)
);
if
(
sNm
==
sCompare
)
if
(
sNm
==
sCompare
)
{
{
//
gefunden, als erfrage die Daten
//
found, so get the data
const
SwNodeIndex
*
pIdx
;
const
SwNodeIndex
*
pIdx
;
if
(
0
!=
(
pIdx
=
rpSectFmt
->
GetCntnt
().
GetCntntIdx
()
)
&&
if
(
0
!=
(
pIdx
=
rpSectFmt
->
GetCntnt
().
GetCntntIdx
()
)
&&
&
rpSectFmt
->
GetDoc
()
->
GetNodes
()
==
&
pIdx
->
GetNodes
()
)
&
rpSectFmt
->
GetDoc
()
->
GetNodes
()
==
&
pIdx
->
GetNodes
()
)
{
{
//
eine Tabelle im normalen
NodesArr
//
a table in the normal
NodesArr
pItem
->
pSectNd
=
pIdx
->
GetNode
().
GetSectionNode
();
pItem
->
pSectNd
=
pIdx
->
GetNode
().
GetSectionNode
();
return
sal_False
;
return
sal_False
;
}
}
//nein!! // sollte der Namen schon passen, der Rest aber nicht, dann haben wir
// If the name is already correct, but not the rest then we don't have them.
//
sie nicht. Die Namen sind immer eindeutig
.
//
The names are always unique
.
}
}
}
}
return
sal_True
;
// dann weiter
return
sal_True
;
}
}
sal_Bool
lcl_FindSectionCaseSensitive
(
const
SwSectionFmtPtr
&
rpSectFmt
,
void
*
pArgs
)
sal_Bool
lcl_FindSectionCaseSensitive
(
const
SwSectionFmtPtr
&
rpSectFmt
,
void
*
pArgs
)
{
{
...
@@ -145,15 +145,15 @@ sal_Bool lcl_FindTable( const SwFrmFmtPtr& rpTableFmt, void* pArgs )
...
@@ -145,15 +145,15 @@ sal_Bool lcl_FindTable( const SwFrmFmtPtr& rpTableFmt, void* pArgs )
pFBox
->
GetSttNd
()
&&
pFBox
->
GetSttNd
()
&&
&
rpTableFmt
->
GetDoc
()
->
GetNodes
()
==
&
pFBox
->
GetSttNd
()
->
GetNodes
()
)
&
rpTableFmt
->
GetDoc
()
->
GetNodes
()
==
&
pFBox
->
GetSttNd
()
->
GetNodes
()
)
{
{
//
eine Tabelle im normalen
NodesArr
//
a table in the normal
NodesArr
pItem
->
pTblNd
=
(
SwTableNode
*
)
pItem
->
pTblNd
=
(
SwTableNode
*
)
pFBox
->
GetSttNd
()
->
FindTableNode
();
pFBox
->
GetSttNd
()
->
FindTableNode
();
return
sal_False
;
return
sal_False
;
}
}
//nein! // sollte der Namen schon passen, der Rest aber nicht, dann haben wir
// If the name is already correct, but not the rest then we don't have them.
//
sie nicht. Die Namen sind immer eindeutig
.
//
The names are always unique
.
}
}
return
sal_True
;
// dann weiter
return
sal_True
;
}
}
...
@@ -161,7 +161,7 @@ sal_Bool lcl_FindTable( const SwFrmFmtPtr& rpTableFmt, void* pArgs )
...
@@ -161,7 +161,7 @@ sal_Bool lcl_FindTable( const SwFrmFmtPtr& rpTableFmt, void* pArgs )
bool
SwDoc
::
GetData
(
const
String
&
rItem
,
const
String
&
rMimeType
,
bool
SwDoc
::
GetData
(
const
String
&
rItem
,
const
String
&
rMimeType
,
uno
::
Any
&
rValue
)
const
uno
::
Any
&
rValue
)
const
{
{
//search for bookmarks and sections case senstive at first. If nothing is found then try again case insensitive
//
search for bookmarks and sections case senstive at first. If nothing is found then try again case insensitive
bool
bCaseSensitive
=
true
;
bool
bCaseSensitive
=
true
;
while
(
true
)
while
(
true
)
{
{
...
@@ -169,14 +169,14 @@ bool SwDoc::GetData( const String& rItem, const String& rMimeType,
...
@@ -169,14 +169,14 @@ bool SwDoc::GetData( const String& rItem, const String& rMimeType,
if
(
pBkmk
)
if
(
pBkmk
)
return
SwServerObject
(
*
pBkmk
).
GetData
(
rValue
,
rMimeType
);
return
SwServerObject
(
*
pBkmk
).
GetData
(
rValue
,
rMimeType
);
//
haben wir ueberhaupt das Item vorraetig
?
//
Do we already have the Item
?
String
sItem
(
bCaseSensitive
?
rItem
:
GetAppCharClass
().
lower
(
rItem
));
String
sItem
(
bCaseSensitive
?
rItem
:
GetAppCharClass
().
lower
(
rItem
));
_FindItem
aPara
(
sItem
);
_FindItem
aPara
(
sItem
);
((
SwSectionFmts
&
)
*
pSectionFmtTbl
).
ForEach
(
0
,
pSectionFmtTbl
->
Count
(),
((
SwSectionFmts
&
)
*
pSectionFmtTbl
).
ForEach
(
0
,
pSectionFmtTbl
->
Count
(),
bCaseSensitive
?
lcl_FindSectionCaseSensitive
:
lcl_FindSectionCaseInsensitive
,
&
aPara
);
bCaseSensitive
?
lcl_FindSectionCaseSensitive
:
lcl_FindSectionCaseInsensitive
,
&
aPara
);
if
(
aPara
.
pSectNd
)
if
(
aPara
.
pSectNd
)
{
{
//
gefunden, als erfrage die Daten
//
found, so get the data
return
SwServerObject
(
*
aPara
.
pSectNd
).
GetData
(
rValue
,
rMimeType
);
return
SwServerObject
(
*
aPara
.
pSectNd
).
GetData
(
rValue
,
rMimeType
);
}
}
if
(
!
bCaseSensitive
)
if
(
!
bCaseSensitive
)
...
@@ -200,7 +200,7 @@ bool SwDoc::GetData( const String& rItem, const String& rMimeType,
...
@@ -200,7 +200,7 @@ bool SwDoc::GetData( const String& rItem, const String& rMimeType,
bool
SwDoc
::
SetData
(
const
String
&
rItem
,
const
String
&
rMimeType
,
bool
SwDoc
::
SetData
(
const
String
&
rItem
,
const
String
&
rMimeType
,
const
uno
::
Any
&
rValue
)
const
uno
::
Any
&
rValue
)
{
{
//search for bookmarks and sections case senstive at first. If nothing is found then try again case insensitive
//
search for bookmarks and sections case senstive at first. If nothing is found then try again case insensitive
bool
bCaseSensitive
=
true
;
bool
bCaseSensitive
=
true
;
while
(
true
)
while
(
true
)
{
{
...
@@ -208,13 +208,13 @@ bool SwDoc::SetData( const String& rItem, const String& rMimeType,
...
@@ -208,13 +208,13 @@ bool SwDoc::SetData( const String& rItem, const String& rMimeType,
if
(
pBkmk
)
if
(
pBkmk
)
return
SwServerObject
(
*
pBkmk
).
SetData
(
rMimeType
,
rValue
);
return
SwServerObject
(
*
pBkmk
).
SetData
(
rMimeType
,
rValue
);
//
haben wir ueberhaupt das Item vorraetig
?
//
Do we already have the Item
?
String
sItem
(
bCaseSensitive
?
rItem
:
GetAppCharClass
().
lower
(
rItem
));
String
sItem
(
bCaseSensitive
?
rItem
:
GetAppCharClass
().
lower
(
rItem
));
_FindItem
aPara
(
sItem
);
_FindItem
aPara
(
sItem
);
pSectionFmtTbl
->
ForEach
(
0
,
pSectionFmtTbl
->
Count
(),
bCaseSensitive
?
lcl_FindSectionCaseSensitive
:
lcl_FindSectionCaseInsensitive
,
&
aPara
);
pSectionFmtTbl
->
ForEach
(
0
,
pSectionFmtTbl
->
Count
(),
bCaseSensitive
?
lcl_FindSectionCaseSensitive
:
lcl_FindSectionCaseInsensitive
,
&
aPara
);
if
(
aPara
.
pSectNd
)
if
(
aPara
.
pSectNd
)
{
{
//
gefunden, als erfrage die Daten
//
found, so get the data
return
SwServerObject
(
*
aPara
.
pSectNd
).
SetData
(
rMimeType
,
rValue
);
return
SwServerObject
(
*
aPara
.
pSectNd
).
SetData
(
rMimeType
,
rValue
);
}
}
if
(
!
bCaseSensitive
)
if
(
!
bCaseSensitive
)
...
@@ -239,7 +239,7 @@ bool SwDoc::SetData( const String& rItem, const String& rMimeType,
...
@@ -239,7 +239,7 @@ bool SwDoc::SetData( const String& rItem, const String& rMimeType,
{
{
SwServerObject
*
pObj
=
NULL
;
SwServerObject
*
pObj
=
NULL
;
//search for bookmarks and sections case senstive at first. If nothing is found then try again case insensitive
//
search for bookmarks and sections case senstive at first. If nothing is found then try again case insensitive
bool
bCaseSensitive
=
true
;
bool
bCaseSensitive
=
true
;
while
(
true
)
while
(
true
)
{
{
...
@@ -291,7 +291,7 @@ bool SwDoc::SetData( const String& rItem, const String& rMimeType,
...
@@ -291,7 +291,7 @@ bool SwDoc::SetData( const String& rItem, const String& rMimeType,
sal_Bool
SwDoc
::
SelectServerObj
(
const
String
&
rStr
,
SwPaM
*&
rpPam
,
sal_Bool
SwDoc
::
SelectServerObj
(
const
String
&
rStr
,
SwPaM
*&
rpPam
,
SwNodeRange
*&
rpRange
)
const
SwNodeRange
*&
rpRange
)
const
{
{
//
haben wir ueberhaupt das Item vorraetig
?
//
Do we actually have the Item
?
rpPam
=
0
;
rpPam
=
0
;
rpRange
=
0
;
rpRange
=
0
;
...
@@ -303,8 +303,8 @@ sal_Bool SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam,
...
@@ -303,8 +303,8 @@ sal_Bool SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam,
const
CharClass
&
rCC
=
GetAppCharClass
();
const
CharClass
&
rCC
=
GetAppCharClass
();
// E
rweiterung fuer die Bereiche, nicht nur Bookmarks/Bereiche linken,
// E
xtension for areas: not only link bookmarks/areas
//
sondern auch Rahmen(Text!), Tabellen, Gliederungen
:
//
but also frames (text!), tables, outlines
:
if
(
STRING_NOTFOUND
!=
nPos
)
if
(
STRING_NOTFOUND
!=
nPos
)
{
{
sal_Bool
bWeiter
=
sal_False
;
sal_Bool
bWeiter
=
sal_False
;
...
@@ -341,7 +341,7 @@ sal_Bool SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam,
...
@@ -341,7 +341,7 @@ sal_Bool SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam,
}
}
else
if
(
sCmp
.
EqualsAscii
(
pMarkToRegion
)
)
else
if
(
sCmp
.
EqualsAscii
(
pMarkToRegion
)
)
{
{
sItem
=
sName
;
//
wird unten behandelt
!
sItem
=
sName
;
//
Is being dealt with further down
!
bWeiter
=
sal_True
;
bWeiter
=
sal_True
;
}
}
else
if
(
sCmp
.
EqualsAscii
(
pMarkToOutline
)
)
else
if
(
sCmp
.
EqualsAscii
(
pMarkToOutline
)
)
...
@@ -358,14 +358,14 @@ sal_Bool SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam,
...
@@ -358,14 +358,14 @@ sal_Bool SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam,
rOutlNds
.
Seek_Entry
(
pNd
,
&
nTmpPos
);
rOutlNds
.
Seek_Entry
(
pNd
,
&
nTmpPos
);
rpRange
=
new
SwNodeRange
(
aPos
.
nNode
,
0
,
aPos
.
nNode
);
rpRange
=
new
SwNodeRange
(
aPos
.
nNode
,
0
,
aPos
.
nNode
);
//
dann suche jetzt noch das Ende vom Bereich
//
look for the area's end, now
for
(
++
nTmpPos
;
for
(
++
nTmpPos
;
nTmpPos
<
rOutlNds
.
Count
()
&&
nTmpPos
<
rOutlNds
.
Count
()
&&
nLvl
<
rOutlNds
[
nTmpPos
]
->
GetTxtNode
()
->
nLvl
<
rOutlNds
[
nTmpPos
]
->
GetTxtNode
()
->
//GetTxtColl()->GetOutlineLevel();//#outline level,zhaojianwei
//GetTxtColl()->GetOutlineLevel();//#outline level,zhaojianwei
GetAttrOutlineLevel
()
-
1
;
//<-end,zhaojianwei
GetAttrOutlineLevel
()
-
1
;
//<-end,zhaojianwei
++
nTmpPos
)
++
nTmpPos
)
;
//
es gibt keinen B
lock
;
//
there is no b
lock
if
(
nTmpPos
<
rOutlNds
.
Count
()
)
if
(
nTmpPos
<
rOutlNds
.
Count
()
)
rpRange
->
aEnd
=
*
rOutlNds
[
nTmpPos
];
rpRange
->
aEnd
=
*
rOutlNds
[
nTmpPos
];
...
@@ -379,7 +379,7 @@ sal_Bool SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam,
...
@@ -379,7 +379,7 @@ sal_Bool SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam,
return
sal_False
;
return
sal_False
;
}
}
//search for bookmarks and sections case senstive at first. If nothing is found then try again case insensitive
//
search for bookmarks and sections case senstive at first. If nothing is found then try again case insensitive
bool
bCaseSensitive
=
true
;
bool
bCaseSensitive
=
true
;
while
(
true
)
while
(
true
)
{
{
...
...
sw/source/core/doc/docdesc.cxx
Dosyayı görüntüle @
ed870efe
This diff is collapsed.
Click to expand it.
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