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
0987fc04
Kaydet (Commit)
0987fc04
authored
Mar 28, 2012
tarafından
Philipp Weissenbacher
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Translate German comments
üst
85adb267
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
94 additions
and
102 deletions
+94
-102
SingleSelectQueryComposer.cxx
dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+15
-15
itratr.hxx
sw/source/core/text/itratr.hxx
+12
-12
noteurl.cxx
sw/source/core/text/noteurl.cxx
+1
-1
pordrop.hxx
sw/source/core/text/pordrop.hxx
+9
-9
porfly.hxx
sw/source/core/text/porfly.hxx
+3
-3
porftn.hxx
sw/source/core/text/porftn.hxx
+3
-3
porglue.hxx
sw/source/core/text/porglue.hxx
+2
-2
porref.cxx
sw/source/core/text/porref.cxx
+2
-2
portab.hxx
sw/source/core/text/portab.hxx
+1
-1
portox.cxx
sw/source/core/text/portox.cxx
+3
-3
portxt.cxx
sw/source/core/text/portxt.cxx
+22
-29
portxt.hxx
sw/source/core/text/portxt.hxx
+2
-2
possiz.hxx
sw/source/core/text/possiz.hxx
+1
-1
txtinit.cxx
sw/source/core/text/txtinit.cxx
+14
-13
widorp.hxx
sw/source/core/text/widorp.hxx
+4
-6
No files found.
dbaccess/source/core/api/SingleSelectQueryComposer.cxx
Dosyayı görüntüle @
0987fc04
...
...
@@ -505,8 +505,8 @@ void SAL_CALL OSingleSelectQueryComposer::appendFilterByColumn( const Reference<
throw
SQLException
(
sError
,
*
this
,
SQLSTATE_GENERAL
,
1000
,
Any
()
);
}
//
filter anhaengen
//
select ohne where und order by aufbauen
//
Attach filter
//
Construct SELECT without WHERE and ORDER BY
::
rtl
::
OUString
aQuote
=
m_xMetaData
->
getIdentifierQuoteString
();
if
(
m_aCurrentColumns
[
SelectColumns
]
->
hasByName
(
aName
)
)
{
...
...
@@ -978,22 +978,22 @@ sal_Bool OSingleSelectQueryComposer::setORCriteria(OSQLParseNode* pCondition, OS
::
std
::
vector
<
::
std
::
vector
<
PropertyValue
>
>&
rFilters
,
const
Reference
<
::
com
::
sun
::
star
::
util
::
XNumberFormatter
>
&
xFormatter
)
const
{
RTL_LOGFILE_CONTEXT_AUTHOR
(
aLogger
,
"dbaccess"
,
"Ocke.Janssen@sun.com"
,
"OSingleSelectQueryComposer::setORCriteria"
);
// R
unde Klammern um den Ausdruck
// R
ound brackets around the expression
if
(
pCondition
->
count
()
==
3
&&
SQL_ISPUNCTUATION
(
pCondition
->
getChild
(
0
),
"("
)
&&
SQL_ISPUNCTUATION
(
pCondition
->
getChild
(
2
),
")"
))
{
return
setORCriteria
(
pCondition
->
getChild
(
1
),
_rIterator
,
rFilters
,
xFormatter
);
}
//
oder Verknuepfung
//
OR logic expression
// a searchcondition can only look like this: search_condition SQL_TOKEN_OR boolean_term
else
if
(
SQL_ISRULE
(
pCondition
,
search_condition
))
{
sal_Bool
bResult
=
sal_True
;
for
(
int
i
=
0
;
bResult
&&
i
<
3
;
i
+=
2
)
{
// Is
t das erste Element wieder eine OR-Verknuepfung
?
//
Dann rekursiv absteigen
...
// Is
the first element a OR logic expression again
?
//
Then descend recursively
...
if
(
SQL_ISRULE
(
pCondition
->
getChild
(
i
),
search_condition
))
bResult
=
setORCriteria
(
pCondition
->
getChild
(
i
),
_rIterator
,
rFilters
,
xFormatter
);
else
...
...
@@ -1015,14 +1015,14 @@ sal_Bool OSingleSelectQueryComposer::setANDCriteria( OSQLParseNode * pCondition,
OSQLParseTreeIterator
&
_rIterator
,
::
std
::
vector
<
PropertyValue
>&
rFilter
,
const
Reference
<
XNumberFormatter
>
&
xFormatter
)
const
{
RTL_LOGFILE_CONTEXT_AUTHOR
(
aLogger
,
"dbaccess"
,
"Ocke.Janssen@sun.com"
,
"OSingleSelectQueryComposer::setANDCriteria"
);
// R
unde Klammern
// R
ound brackets
if
(
SQL_ISRULE
(
pCondition
,
boolean_primary
))
{
// this should not occur
OSL_FAIL
(
"boolean_primary in And-Criteria"
);
return
sal_False
;
}
//
Das erste Element ist (wieder) eine AND-Verknuepfung
//
The first element is an AND logical expression again
else
if
(
SQL_ISRULE
(
pCondition
,
boolean_term
)
&&
pCondition
->
count
()
==
3
)
{
return
setANDCriteria
(
pCondition
->
getChild
(
0
),
_rIterator
,
rFilter
,
xFormatter
)
&&
...
...
@@ -1227,7 +1227,7 @@ sal_Bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCon
aItem
.
Handle
=
getPredicateType
(
pCondition
->
getChild
(
1
));
rFilter
.
push_back
(
aItem
);
}
else
//
kann sich nur um einen Expr. Ausdruck handel
n
else
//
Can only be an expressio
n
{
PropertyValue
aItem
;
::
rtl
::
OUString
aName
,
aValue
;
...
...
@@ -1235,12 +1235,12 @@ sal_Bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCon
OSQLParseNode
*
pLhs
=
pCondition
->
getChild
(
0
);
OSQLParseNode
*
pRhs
=
pCondition
->
getChild
(
2
);
// F
eldnamen
// F
ield names
sal_uInt16
i
;
for
(
i
=
0
;
i
<
pLhs
->
count
();
i
++
)
pLhs
->
getChild
(
i
)
->
parseNodeToPredicateStr
(
aName
,
m_xConnection
,
xFormatter
,
m_aLocale
,
static_cast
<
sal_Char
>
(
m_sDecimalSep
.
toChar
()
)
);
//
Kriterium
//
Criterion
aItem
.
Handle
=
getPredicateType
(
pCondition
->
getChild
(
1
));
aValue
=
pCondition
->
getChild
(
1
)
->
getTokenValue
();
for
(
i
=
0
;
i
<
pRhs
->
count
();
i
++
)
...
...
@@ -1253,7 +1253,7 @@ sal_Bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCon
return
sal_True
;
}
//
f
unctions for analysing SQL
//
F
unctions for analysing SQL
::
rtl
::
OUString
OSingleSelectQueryComposer
::
getColumnName
(
::
connectivity
::
OSQLParseNode
*
pColumnRef
,
OSQLParseTreeIterator
&
_rIterator
)
const
{
RTL_LOGFILE_CONTEXT_AUTHOR
(
aLogger
,
"dbaccess"
,
"Ocke.Janssen@sun.com"
,
"OSingleSelectQueryComposer::getColumnName"
);
...
...
@@ -1572,7 +1572,7 @@ void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropert
m_aCurrentColumns
[
SelectColumns
]
->
getByName
(
aName
)
>>=
xColumn
;
OSL_ENSURE
(
xColumn
->
getPropertySetInfo
()
->
hasPropertyByName
(
PROPERTY_REALNAME
),
"Property REALNAME not available!"
);
OSL_ENSURE
(
xColumn
->
getPropertySetInfo
()
->
hasPropertyByName
(
PROPERTY_TABLENAME
),
"Property TABLENAME not available!"
);
OSL_ENSURE
(
xColumn
->
getPropertySetInfo
()
->
hasPropertyByName
(
::
rtl
::
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"AggregateFunction"
))),
"Property AggregateFunctionnot available!"
);
OSL_ENSURE
(
xColumn
->
getPropertySetInfo
()
->
hasPropertyByName
(
::
rtl
::
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
"AggregateFunction"
))),
"Property AggregateFunction
not available!"
);
::
rtl
::
OUString
sRealName
,
sTableName
;
xColumn
->
getPropertyValue
(
PROPERTY_REALNAME
)
>>=
sRealName
;
...
...
@@ -1689,8 +1689,8 @@ void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropert
lcl_addFilterCriteria_throw
(
nFilterOp
,
sEmpty
,
aSQL
);
}
//
filter anhaengen
//
select ohne where und order by aufbauen
//
Attach filter
//
Construct SELECT without WHERE and ORDER BY
::
rtl
::
OUString
sFilter
=
getFilter
();
if
(
!
sFilter
.
isEmpty
()
&&
aSQL
.
getLength
()
)
...
...
sw/source/core/text/itratr.hxx
Dosyayı görüntüle @
0987fc04
...
...
@@ -58,7 +58,7 @@ protected:
ViewShell
*
pShell
;
SwFont
*
pFnt
;
SwpHints
*
pHints
;
const
SwAttrSet
*
pAttrSet
;
//
das Char-Attribut-S
et
const
SwAttrSet
*
pAttrSet
;
//
The char attribute s
et
SwScriptInfo
*
pScriptInfo
;
private
:
...
...
@@ -83,7 +83,7 @@ protected:
}
public
:
//
Konstruktor, Destruk
tor
//
Constructor, destruc
tor
inline
SwAttrIter
(
SwTxtNode
&
rTxtNode
,
SwScriptInfo
&
rScrInf
)
:
pShell
(
0
),
pFnt
(
0
),
pHints
(
0
),
pScriptInfo
(
0
),
pLastOut
(
0
),
nChgCnt
(
0
),
pRedln
(
0
),
nPropFont
(
0
),
m_pTxtNode
(
&
rTxtNode
)
{
CtorInitAttrIter
(
rTxtNode
,
rScrInf
);
}
...
...
@@ -91,25 +91,25 @@ public:
virtual
~
SwAttrIter
();
inline
SwRedlineItr
*
GetRedln
()
{
return
pRedln
;
}
// Liefert im Parameter die Position des naechsten Wechsels vor oder an
// der uebergebenen Characterposition zurueck. Liefert sal_False, wenn vor
// oder an dieser Position kein Wechsel mehr erfolgt, sal_True sonst.
// The parameter returns the position of the next change before or at the
// char position.
// Returns sal_False, if there's no change before or at the positon,
// else sal_True.
xub_StrLen
GetNextAttr
(
)
const
;
// Macht die an der Characterposition i gueltigen Attribute im
// logischen Font wirksam.
// Enables the attributes used at char pos nPos in the logical font
sal_Bool
Seek
(
const
xub_StrLen
nPos
);
//
Bastelt den Font an der gew. Position via Seek und fragt ihn,
//
ob er ein Symbolfont is
t.
//
Creates the font at the specified position via Seek() and checks
//
if it's a symbol fon
t.
sal_Bool
IsSymbol
(
const
xub_StrLen
nPos
);
//
Fuehrt ChgPhysFnt aus, wenn Seek() sal_True zurueckliefert.
//
Executes ChgPhysFnt if Seek() returns sal_True
sal_Bool
SeekAndChgAttrIter
(
const
xub_StrLen
nPos
,
OutputDevice
*
pOut
);
sal_Bool
SeekStartAndChgAttrIter
(
OutputDevice
*
pOut
,
const
sal_Bool
bParaFont
=
sal_False
);
//
Gibt es ueberhaupt Attributwechsel
?
//
Do we have an attribute change at all
?
inline
sal_Bool
HasHints
()
const
{
return
0
!=
pHints
;
}
//
liefert fuer eine Position das Attribut
//
Returns the attribute for a position
SwTxtAttr
*
GetAttr
(
const
xub_StrLen
nPos
)
const
;
inline
const
SwAttrSet
*
GetAttrSet
()
const
{
return
pAttrSet
;
}
...
...
sw/source/core/text/noteurl.cxx
Dosyayı görüntüle @
0987fc04
...
...
@@ -37,7 +37,7 @@
#include "txttypes.hxx"
#include "noteurl.hxx"
//
globale Variable, wird in noteurl.Hxx bekanntgegeben
//
Global variable
SwNoteURL
*
pNoteURL
=
NULL
;
SV_IMPL_PTRARR
(
SwURLNoteList
,
SwURLNotePtr
)
...
...
sw/source/core/text/pordrop.hxx
Dosyayı görüntüle @
0987fc04
...
...
@@ -32,7 +32,7 @@
class
SwFont
;
// DropCap
-Cache, globale Variable, in txtinit.cxx initialisiert/zerstoert
// DropCap
cache, global variable initialized/destroyed in txtinit.cxx
// und in txtdrop.cxx benutzt bei der Initialenberechnung
class
SwDropCapCache
;
...
...
@@ -72,14 +72,14 @@ public:
class
SwDropPortion
:
public
SwTxtPortion
{
friend
class
SwDropCapCache
;
SwDropPortionPart
*
pPart
;
// due to script
/
attribute changes
MSHORT
nLines
;
//
Anzahl der Zeilen
KSHORT
nDropHeight
;
// H
oehe
KSHORT
nDropDescent
;
//
Abstand zur naechsten Zeil
e
KSHORT
nDistance
;
//
Abstand zum T
ext
KSHORT
nFix
;
// Fixposition
short
nX
;
// X
-
PaintOffset
short
nY
;
// Y
-
Offset
SwDropPortionPart
*
pPart
;
// due to script
/
attribute changes
MSHORT
nLines
;
//
Line count
KSHORT
nDropHeight
;
// H
eight
KSHORT
nDropDescent
;
//
Distance to the next lin
e
KSHORT
nDistance
;
//
Distance to the t
ext
KSHORT
nFix
;
// Fix
ed
position
short
nX
;
// X
PaintOffset
short
nY
;
// Y
Offset
sal_Bool
FormatTxt
(
SwTxtFormatInfo
&
rInf
);
void
PaintTxt
(
const
SwTxtPaintInfo
&
rInf
)
const
;
...
...
sw/source/core/text/porfly.hxx
Dosyayı görüntüle @
0987fc04
...
...
@@ -61,10 +61,10 @@ public:
class
SwFlyCntPortion
:
public
SwLinePortion
{
void
*
pContact
;
// bDraw ? DrawContact : FlyInCntFrm
Point
aRef
;
// Relativ
zu diesem Point wird die AbsPos berechnet.
Point
aRef
;
// Relativ
ely to this point we calculate the AbsPos
sal_Bool
bDraw
:
1
;
// DrawContact?
sal_Bool
bMax
:
1
;
//
Zeilenausrichtung und Hoehe == Zeilenhoehe
sal_uInt8
nAlign
:
3
;
//
Zeilenausrichtung? Nein, oben, mitte, unten
sal_Bool
bMax
:
1
;
//
Line adjustment and height == line height
sal_uInt8
nAlign
:
3
;
//
Line adjustment? No, above, middle, bottom
virtual
xub_StrLen
GetCrsrOfst
(
const
KSHORT
nOfst
)
const
;
public
:
...
...
sw/source/core/text/porftn.hxx
Dosyayı görüntüle @
0987fc04
...
...
@@ -39,7 +39,7 @@ class SwTxtFtn;
class
SwFtnPortion
:
public
SwFldPortion
{
SwTxtFrm
*
pFrm
;
//
um im Dtor RemoveFtn rufen zu koennen.
SwTxtFrm
*
pFrm
;
//
To be able to call RemoveFtn in the dtor
SwTxtFtn
*
pFtn
;
KSHORT
nOrigHeight
;
// #i98418#
...
...
@@ -93,7 +93,7 @@ public:
inline
const
XubString
&
GetQuoTxt
()
const
{
return
aExpand
;
}
inline
const
XubString
&
GetContTxt
()
const
{
return
aErgo
;
}
// F
elder-Cloner fue
r SplitGlue
// F
ield cloner fo
r SplitGlue
virtual
SwFldPortion
*
Clone
(
const
XubString
&
rExpand
)
const
;
// Accessibility: pass information about this portion to the PortionHandler
...
...
@@ -113,7 +113,7 @@ public:
virtual
xub_StrLen
GetCrsrOfst
(
const
KSHORT
nOfst
)
const
;
virtual
sal_Bool
Format
(
SwTxtFormatInfo
&
rInf
);
// F
elder-Cloner fue
r SplitGlue
// F
ield cloner fo
r SplitGlue
virtual
SwFldPortion
*
Clone
(
const
XubString
&
rExpand
)
const
;
OUTPUT_OPERATOR
};
...
...
sw/source/core/text/porglue.hxx
Dosyayı görüntüle @
0987fc04
...
...
@@ -67,7 +67,7 @@ public:
class
SwFixPortion
:
public
SwGluePortion
{
KSHORT
nFix
;
//
der Width-Offset in der Zeil
e
KSHORT
nFix
;
//
The width offset in the lin
e
public
:
SwFixPortion
(
const
SwRect
&
rFlyRect
);
SwFixPortion
(
const
KSHORT
nFixWidth
,
const
KSHORT
nFixPos
);
...
...
@@ -97,7 +97,7 @@ inline short SwGluePortion::GetPrtGlue() const
/*************************************************************************
* inline SwGluePortion::AdjFixWidth()
*
Die FixWidth darf niemals groesser sein als die Gesamtbreite
!
*
The FixWidth MUST NEVER be larger than the accumulated width
!
*************************************************************************/
inline
void
SwGluePortion
::
AdjFixWidth
()
...
...
sw/source/core/text/porref.cxx
Dosyayı görüntüle @
0987fc04
...
...
@@ -65,8 +65,8 @@ SwIsoRefPortion::SwIsoRefPortion() : nViewWidth(0)
KSHORT
SwIsoRefPortion
::
GetViewWidth
(
const
SwTxtSizeInfo
&
rInf
)
const
{
//
Wir stehen zwar im const, aber nViewWidth sollte erst im letzten
//
Moment errechnet werden:
//
Although we are const, nViewWidth should be calculated in the last
//
moment possible
SwIsoRefPortion
*
pThis
=
(
SwIsoRefPortion
*
)
this
;
if
(
!
Width
()
&&
rInf
.
OnWin
()
&&
SwViewOption
::
IsFieldShadings
()
&&
!
rInf
.
GetOpt
().
IsReadonly
()
&&
!
rInf
.
GetOpt
().
IsPagePreview
()
)
...
...
sw/source/core/text/portab.hxx
Dosyayı görüntüle @
0987fc04
...
...
@@ -40,7 +40,7 @@ class SwTabPortion : public SwFixPortion
const
xub_Unicode
cFill
;
const
bool
bAutoTabStop
;
//
Das Format() verzweigt entweder in Pre- ode
r PostFormat()
//
Format() branches either into PreFormat() o
r PostFormat()
sal_Bool
PreFormat
(
SwTxtFormatInfo
&
rInf
);
public
:
SwTabPortion
(
const
KSHORT
nTabPos
,
const
xub_Unicode
cFill
=
'\0'
,
const
bool
bAutoTab
=
true
);
...
...
sw/source/core/text/portox.cxx
Dosyayı görüntüle @
0987fc04
...
...
@@ -65,10 +65,10 @@ SwIsoToxPortion::SwIsoToxPortion() : nViewWidth(0)
KSHORT
SwIsoToxPortion
::
GetViewWidth
(
const
SwTxtSizeInfo
&
rInf
)
const
{
//
Wir stehen zwar im const, aber nViewWidth sollte erst im letzten
//
Moment errechnet werden:
//
Although we are const, nViewWidth should be calculated in the last
//
moment possible
SwIsoToxPortion
*
pThis
=
(
SwIsoToxPortion
*
)
this
;
// nViewWidth
muss errechnet werden.
// nViewWidth
need to be calculated
if
(
!
Width
()
&&
rInf
.
OnWin
()
&&
!
rInf
.
GetOpt
().
IsPagePreview
()
&&
!
rInf
.
GetOpt
().
IsReadonly
()
&&
SwViewOption
::
IsFieldShadings
()
)
...
...
sw/source/core/text/portxt.cxx
Dosyayı görüntüle @
0987fc04
...
...
@@ -35,7 +35,7 @@
#include <SwPortionHandler.hxx>
#include <porlay.hxx>
#include <inftxt.hxx>
#include <guess.hxx> // SwTxtGuess,
Zeilenumbruch
#include <guess.hxx> // SwTxtGuess,
line break
#include <porglue.hxx>
#include <portab.hxx> // pLastTab->
#include <porfld.hxx> // SwFldPortion
...
...
@@ -235,9 +235,9 @@ SwTxtPortion::SwTxtPortion( const SwLinePortion &rPortion )
void
SwTxtPortion
::
BreakCut
(
SwTxtFormatInfo
&
rInf
,
const
SwTxtGuess
&
rGuess
)
{
//
Das Wort/Zeichen ist groesser als die Zeil
e
// S
onderfall Nr.1: Das Wort ist groesser als die Zeil
e
// W
ir kappen
...
//
The word/char is larger than the lin
e
// S
pecial case 1: The word is larger than the lin
e
// W
e truncate
...
const
KSHORT
nLineWidth
=
(
KSHORT
)(
rInf
.
Width
()
-
rInf
.
X
());
xub_StrLen
nLen
=
rGuess
.
CutPos
()
-
rInf
.
GetIdx
();
if
(
nLen
)
...
...
@@ -304,8 +304,8 @@ sal_Bool lcl_HasContent( const SwFldPortion& rFld, SwTxtFormatInfo &rInf )
sal_Bool
SwTxtPortion
::
_Format
(
SwTxtFormatInfo
&
rInf
)
{
// 5744:
wenn nur der Trennstrich nicht mehr passt,
//
muss trotzdem das Wort umgebrochen werden, ansonsten
return sal_True!
// 5744:
If only the hypen does not fit anymore, we still need to wrap
//
the word, or else
return sal_True!
if
(
rInf
.
IsUnderFlow
()
&&
rInf
.
GetSoftHyphPos
()
)
{
// soft hyphen portion has triggered an underflow event because
...
...
@@ -494,14 +494,13 @@ sal_Bool SwTxtPortion::Format( SwTxtFormatInfo &rInf )
*************************************************************************/
// Format end of line
// 5083: Es kann schon manchmal unguenstige Faelle geben...
// "vom {Nikolaus}", Nikolaus bricht um "vom " wird im Blocksatz
// zu "vom" und " ", wobei der Glue expandiert wird, statt in die
// MarginPortion aufzugehen.
// rInf.nIdx steht auf dem naechsten Wort, nIdx-1 ist der letzte
// Buchstabe der Portion.
// 5083: We can have awkward cases e.g.:
// "from {Santa}"
// Santa wraps, "from " turns into "from" and " " in a justified
// paragraph, in which the glue gets expanded instead of merged
// with the MarginPortion.
//
// rInf.nIdx points to the next word, nIdx-1 is the portion's last char
void
SwTxtPortion
::
FormatEOL
(
SwTxtFormatInfo
&
rInf
)
{
...
...
@@ -517,8 +516,8 @@ void SwTxtPortion::FormatEOL( SwTxtFormatInfo &rInf )
while
(
nX
&&
nHoleLen
<
GetLen
()
&&
CH_BLANK
==
rInf
.
GetChar
(
--
nX
)
)
nHoleLen
++
;
//
Erst uns einstellen und dann Inserten, weil wir ja auch ein
//
SwLineLayout sein koennten.
//
First set ourselves and the insert, because there could be
//
a SwLineLayout
KSHORT
nBlankSize
;
if
(
nHoleLen
==
GetLen
()
)
nBlankSize
=
Width
();
...
...
@@ -537,9 +536,6 @@ void SwTxtPortion::FormatEOL( SwTxtFormatInfo &rInf )
/*************************************************************************
* virtual SwTxtPortion::GetCrsrOfst()
*************************************************************************/
xub_StrLen
SwTxtPortion
::
GetCrsrOfst
(
const
KSHORT
nOfst
)
const
{
OSL_ENSURE
(
!
this
,
"SwTxtPortion::GetCrsrOfst: don't use this method!"
);
...
...
@@ -549,7 +545,7 @@ xub_StrLen SwTxtPortion::GetCrsrOfst( const KSHORT nOfst ) const
/*************************************************************************
* virtual SwTxtPortion::GetTxtSize()
*************************************************************************/
//
Das GetTxtSize() geht davon aus, dass die eigene Laenge korrekt is
t
//
The GetTxtSize() assumes that the own length is correc
t
SwPosSize
SwTxtPortion
::
GetTxtSize
(
const
SwTxtSizeInfo
&
rInf
)
const
{
...
...
@@ -559,9 +555,6 @@ SwPosSize SwTxtPortion::GetTxtSize( const SwTxtSizeInfo &rInf ) const
/*************************************************************************
* virtual SwTxtPortion::Paint()
*************************************************************************/
void
SwTxtPortion
::
Paint
(
const
SwTxtPaintInfo
&
rInf
)
const
{
if
(
rInf
.
OnWin
()
&&
1
==
rInf
.
GetLen
()
&&
CH_TXT_ATR_FIELDEND
==
rInf
.
GetTxt
().
GetChar
(
rInf
.
GetIdx
()))
...
...
@@ -614,8 +607,8 @@ sal_Bool SwTxtPortion::GetExpTxt( const SwTxtSizeInfo &, XubString & ) const
/*************************************************************************
* xub_StrLen SwTxtPortion::GetSpaceCnt()
* long SwTxtPortion::CalcSpacing()
*
sind fuer den Blocksatz zustaendig und ermitteln die Anzahl der Blanks
*
und den daraus resultierenden zusaetzlichen Zwischenraum
*
Are responsible for the justified paragraph. They calculate the blank
*
count and the resulting added space.
*************************************************************************/
xub_StrLen
SwTxtPortion
::
GetSpaceCnt
(
const
SwTxtSizeInfo
&
rInf
,
...
...
@@ -627,8 +620,8 @@ xub_StrLen SwTxtPortion::GetSpaceCnt( const SwTxtSizeInfo &rInf,
{
if
(
!
IsBlankPortion
()
&&
!
InNumberGrp
()
&&
!
IsCombinedPortion
()
)
{
//
Bei OnWin() wird anstatt eines Leerstrings gern mal ein Blank
//
zurueckgeliefert, das koennen wir hier aber gar nicht gebrauchen
//
OnWin() likes to return a blank instead of an empty string from
//
time to time. We cannot use that here at all, however.
sal_Bool
bOldOnWin
=
rInf
.
OnWin
();
((
SwTxtSizeInfo
&
)
rInf
).
SetOnWin
(
sal_False
);
...
...
@@ -657,8 +650,8 @@ long SwTxtPortion::CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) cons
{
if
(
!
IsBlankPortion
()
&&
!
InNumberGrp
()
&&
!
IsCombinedPortion
()
)
{
//
Bei OnWin() wird anstatt eines Leerstrings gern mal ein Blank
//
zurueckgeliefert, das koennen wir hier aber gar nicht gebrauchen
//
OnWin() likes to return a blank instead of an empty string from
//
time to time. We cannot use that here at all, however.
sal_Bool
bOldOnWin
=
rInf
.
OnWin
();
((
SwTxtSizeInfo
&
)
rInf
).
SetOnWin
(
sal_False
);
...
...
sw/source/core/text/portxt.hxx
Dosyayı görüntüle @
0987fc04
...
...
@@ -30,7 +30,7 @@
#ifdef GCC
#include <sys/types.h>
#else
#include <new.h> //
fuer size_t, FIXEDMEM aus
tools
#include <new.h> //
for size_t, FIXEDMEM from
tools
#endif
#include <tools/mempool.hxx>
...
...
@@ -59,7 +59,7 @@ public:
virtual
sal_Bool
GetExpTxt
(
const
SwTxtSizeInfo
&
rInf
,
XubString
&
rTxt
)
const
;
virtual
long
CalcSpacing
(
long
nSpaceAdd
,
const
SwTxtSizeInfo
&
rInf
)
const
;
//
zaehlt die Spaces fuer Blocksatz
//
Counts the spaces for justified paragraph
xub_StrLen
GetSpaceCnt
(
const
SwTxtSizeInfo
&
rInf
,
xub_StrLen
&
rCnt
)
const
;
sal_Bool
CreateHyphen
(
SwTxtFormatInfo
&
rInf
,
SwTxtGuess
&
rGuess
);
...
...
sw/source/core/text/possiz.hxx
Dosyayı görüntüle @
0987fc04
...
...
@@ -32,7 +32,7 @@
#include <tools/gen.hxx>
#include "txttypes.hxx"
//
Im Gegensazt zu den SV-Sizes ist die SwPosSize immer positiv
//
Compared to the SV sizes SwPosSize is always positive
class
SwPosSize
{
KSHORT
nWidth
;
...
...
sw/source/core/text/txtinit.cxx
Dosyayı görüntüle @
0987fc04
...
...
@@ -28,8 +28,8 @@
#include "swcache.hxx"
#include "fntcache.hxx" // pFntCache
( SwFont/ScrFont-PrtFont C
ache )
#include "swfntcch.hxx" // pSwFontCache
( SwAttrSet/SwFont C
ache )
#include "fntcache.hxx" // pFntCache
( SwFont/ScrFont-PrtFont c
ache )
#include "swfntcch.hxx" // pSwFontCache
( SwAttrSet/SwFont c
ache )
#include "txtfrm.hxx"
#include "txtcache.hxx"
#include "porlay.hxx"
...
...
@@ -43,10 +43,10 @@
#include "porftn.hxx"
#include "porhyph.hxx"
#include "pordrop.hxx"
#include "blink.hxx" // Blink
-M
anager
#include "init.hxx"
// Deklarationen fuer _TextInit() u
nd _TextFinit()
#include "blink.hxx" // Blink
m
anager
#include "init.hxx"
// Declarations for _TextInit() a
nd _TextFinit()
#include "txtfly.hxx" // SwContourCache
#include "dbg_lay.hxx" // Layout Debug
Fileausgabe
#include "dbg_lay.hxx" // Layout Debug
file output
SwCache
*
SwTxtFrm
::
pTxtCache
=
0
;
long
SwTxtFrm
::
nMinPrtLine
=
0
;
...
...
@@ -54,22 +54,23 @@ SwContourCache *pContourCache = 0;
SwDropCapCache
*
pDropCapCache
=
0
;
IMPL_FIXEDMEMPOOL_NEWDEL
(
SwTxtLine
)
IMPL_FIXEDMEMPOOL_NEWDEL
(
SwParaPortion
)
//
Absaetze
IMPL_FIXEDMEMPOOL_NEWDEL
(
SwLineLayout
)
//
Zeilen
IMPL_FIXEDMEMPOOL_NEWDEL
(
SwHolePortion
)
//
z.B. Blanks am Zeilenende
IMPL_FIXEDMEMPOOL_NEWDEL
(
SwTxtPortion
)
//
Attributwechsel
IMPL_FIXEDMEMPOOL_NEWDEL
(
SwParaPortion
)
//
Paragraphs
IMPL_FIXEDMEMPOOL_NEWDEL
(
SwLineLayout
)
//
Lines
IMPL_FIXEDMEMPOOL_NEWDEL
(
SwHolePortion
)
//
e.g. Blanks at the line end
IMPL_FIXEDMEMPOOL_NEWDEL
(
SwTxtPortion
)
//
Attribute change
/*************************************************************************
* _TextInit(), _TextFinit()
*************************************************************************/
// Werden _nur_ in init.cxx verwendet, dort stehen extern void _TextFinit()
// und extern void _TextInit(...)
// Are ONLY used in init.cxx.
// There we have extern void _TextFinit()
// and extern void _TextInit(...)
void
_TextInit
()
{
pFntCache
=
new
SwFntCache
;
// Cache for SwSubFont -> SwFntObj = { Font aFont, Font* pScrFont, Font* pPrtFont, OutputDevice* pPrinter, ... }
pSwFontCache
=
new
SwFontCache
;
// Cache for SwTxtFmtColl -> SwFontObj = { SwFont aSwFont, SfxPoolItem* pDefaultArray }
pFntCache
=
new
SwFntCache
;
// Cache for SwSubFont -> SwFntObj = { Font aFont, Font* pScrFont, Font* pPrtFont, OutputDevice* pPrinter, ... }
pSwFontCache
=
new
SwFontCache
;
// Cache for SwTxtFmtColl -> SwFontObj = { SwFont aSwFont, SfxPoolItem* pDefaultArray }
SwCache
*
pTxtCache
=
new
SwCache
(
250
// Cache for SwTxtFrm -> SwTxtLine = { SwParaPortion* pLine }
#ifdef DBG_UTIL
,
"static SwTxtFrm::pTxtCache"
...
...
sw/source/core/text/widorp.hxx
Dosyayı görüntüle @
0987fc04
...
...
@@ -55,12 +55,10 @@ public:
sal_Bool
IsInside
(
SwTxtMargin
&
rLine
)
const
;
// Um Sonderfaelle mit Ftn behandeln zu koennen.
// Mit SetRstHeight wird dem SwTxtFrmBreak die Resthoehe eingestellt,
// Um TruncLines() rufen zu koennen, ohne dass IsBreakNow() einen
// anderen Wert zurueckliefert.
// Es wird dabei davon ausgegangen, dass rLine auf der letzten Zeile
// steht, die nicht mehr passt.
// In order to be able to handle special cases with Ftn.
// SetRstHeight sets the rest height for SwTxtFrmBreak. This is needed
// to call TruncLines() without IsBreakNow() returning another value.
// We assume that rLine is pointing to the last non-fitting line.
// OD 2004-02-27 #106629# - no longer inline
void
SetRstHeight
(
const
SwTxtMargin
&
rLine
);
...
...
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