[Libreoffice-commits] .: 2 commits - sw/source
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Apr 7 09:40:24 PDT 2011
sw/source/core/layout/fly.cxx | 4 ----
sw/source/core/view/vprint.cxx | 6 +-----
2 files changed, 1 insertion(+), 9 deletions(-)
New commits:
commit ce0f1d7550238a9f8ccaf8090d195e5667cebff1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Apr 7 12:50:29 2011 +0100
Resolves: #i117749# bVert unused
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 47cb131..8798a82 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -125,15 +125,12 @@ SwFlyFrm::SwFlyFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) :
//Grosseneinstellung, Fixe groesse ist immer die Breite
const SwFmtFrmSize &rFrmSize = pFmt->GetFrmSize();
- sal_Bool bVert = sal_False;
sal_uInt16 nDir =
((SvxFrameDirectionItem&)pFmt->GetFmtAttr( RES_FRAMEDIR )).GetValue();
if( FRMDIR_ENVIRONMENT == nDir )
{
bDerivedVert = 1;
bDerivedR2L = 1;
- if( pAnch && pAnch->IsVertical() )
- bVert = sal_True;
}
else
{
@@ -166,7 +163,6 @@ SwFlyFrm::SwFlyFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) :
}
}
- bVert = bVertical;
bInvalidR2L = 0;
if( FRMDIR_HORI_RIGHT_TOP == nDir )
bRightToLeft = 1;
commit ab241e750ae93fbacadee3db142f8f7b526fe5ae
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Apr 7 12:48:11 2011 +0100
Resolves: #i117748# pOutDevDoc unused
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index da0e3e5..f3cd6ed 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -456,17 +456,13 @@ sal_Bool ViewShell::PrintOrPDFExport(
// output device is now provided by a call from outside the Writer)
pOutDev->Push();
- ViewShell *pShell;
- SwDoc *pOutDevDoc;
-
// Print/PDF export for (multi-)selection has already generated a
// temporary document with the selected text.
// (see XRenderable implementation in unotxdoc.cxx)
// It is implemented this way because PDF export calls this Prt function
// once per page and we do not like to always have the temporary document
// to be created that often here.
- pOutDevDoc = GetDoc();
- pShell = new ViewShell( *this, 0, pOutDev );
+ ViewShell *pShell = new ViewShell( *this, 0, pOutDev );
SdrView *pDrawView = pShell->GetDrawView();
if (pDrawView)
More information about the Libreoffice-commits
mailing list