summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-02-02 11:29:28 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-02-02 11:34:38 +0000
commitfc59bf1406ad69a85787b59d5db233e9ab5f2171 (patch)
tree8ea71c472a920b45c9ec1e6f8bd806ea0454da75 /sw/source
parente15a9e2fb666b9c6e6de5a0bb9a16c858b4d486c (diff)
WaE: throw out some warnings
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx21
-rw-r--r--sw/source/ui/fldui/flddok.cxx2
2 files changed, 0 insertions, 23 deletions
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index a2bae7f8ba68..f09b6a242c90 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -4163,10 +4163,6 @@ void SwWW8ImplReader::Read_LineSpace( USHORT, const BYTE* pData, short nLen )
// bei proportional betraegt er min( 0cm, FontSize*(nFach-1) ) sowohl "vor"
// wie auch "nach"
- USHORT nWwPre = 0;
- USHORT nWwPost = 0;
- USHORT nSwPre = 0;
- USHORT nSwPost = 0;
USHORT nSpaceTw = 0;
SvxLineSpacingItem aLSpc( LINE_SPACE_DEFAULT_HEIGHT, RES_PARATR_LINESPACING );
@@ -4181,10 +4177,6 @@ void SwWW8ImplReader::Read_LineSpace( USHORT, const BYTE* pData, short nLen )
const SvxFontHeightItem* pH = (const SvxFontHeightItem*)
GetFmtAttr( RES_CHRATR_FONTSIZE );
nSpaceTw = (USHORT)( n * pH->GetHeight() / 100 );
-
- if( n > 100 )
- nWwPost = nSwPre = nSwPost = (USHORT)( ( n - 100 )
- * pH->GetHeight() / 100 );
}
else // Fixed / Minimum
{
@@ -4192,19 +4184,6 @@ void SwWW8ImplReader::Read_LineSpace( USHORT, const BYTE* pData, short nLen )
nSpaceTw = (USHORT)nSpace;
aLSpc.SetLineHeight( nSpaceTw );
aLSpc.GetLineSpaceRule() = eLnSpc;
- nSwPre = nSpace;
-
- if( SVX_LINE_SPACE_FIX == eLnSpc ) // Genau
- {
- nWwPre = (USHORT)( 8L * nSpace / 10 );
- nWwPost = (USHORT)( 2L * nSpace / 10 );
- nSwPre = nSpace;
- }
- else // Minimum
- {
- nWwPre = (USHORT)( 129L * nSpace / 100 - 95 );// erst bei groesseren
- // Zeilenabstaenden
- }
}
NewAttr( aLSpc );
if( pSFlyPara )
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index 4230e40a022b..e2b25738c39f 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -555,7 +555,6 @@ IMPL_LINK( SwFldDokPage, FormatHdl, ListBox *, EMPTYARG )
BOOL SwFldDokPage::FillItemSet(SfxItemSet& )
{
- BOOL bPage = FALSE;
USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel());
if (nTypeId == USHRT_MAX)
@@ -564,7 +563,6 @@ BOOL SwFldDokPage::FillItemSet(SfxItemSet& )
if(nPos == LISTBOX_ENTRY_NOTFOUND)
nPos = 0;
nTypeId = (USHORT)(ULONG)aSelectionLB.GetEntryData(nPos);
- bPage = TRUE;
}
String aVal(aValueED.GetText());