[Libreoffice-commits] .: 4 commits - sd/source sw/source
Lubos Lunak
llunak at kemper.freedesktop.org
Fri Apr 13 12:10:38 PDT 2012
sd/source/core/sdpage.cxx | 1
sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 1
sd/source/ui/dlg/headerfooterdlg.cxx | 3 --
sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx | 2 -
sd/source/ui/func/fucon3d.cxx | 1
sd/source/ui/func/fuconarc.cxx | 2 -
sd/source/ui/func/fuconuno.cxx | 1
sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx | 13 ----------
sd/source/ui/toolpanel/TitleBar.cxx | 3 --
sw/source/core/draw/dflyobj.cxx | 1
sw/source/core/layout/paintfrm.cxx | 1
sw/source/core/layout/virtoutp.cxx | 1
sw/source/ui/ribbar/conpoly.cxx | 1
sw/source/ui/ribbar/conrect.cxx | 2 -
sw/source/ui/uiview/swcli.cxx | 3 --
sw/source/ui/uiview/view.cxx | 4 +--
16 files changed, 4 insertions(+), 36 deletions(-)
New commits:
commit 9758b9aaf0909b94bd8845a694f1a775fe18777b
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Fri Apr 13 20:20:37 2012 +0200
sal_Int32 conversion warning
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index c8be512..bd9a726 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/ui/uiview/view.cxx
@@ -1119,9 +1119,9 @@ void SwView::WriteUserData( String &rUserData, sal_Bool bBrowse )
rUserData += ';';
rUserData += String::CreateFromInt32( rVis.Top() );
rUserData += ';';
- rUserData += String::CreateFromInt32( bBrowse ? LONG_MIN : rVis.Right());
+ rUserData += String::CreateFromInt32( bBrowse ? SAL_MIN_INT32 : rVis.Right());
rUserData += ';';
- rUserData += String::CreateFromInt32( bBrowse ? LONG_MIN : rVis.Bottom());
+ rUserData += String::CreateFromInt32( bBrowse ? SAL_MIN_INT32 : rVis.Bottom());
rUserData += ';';
rUserData += String::CreateFromInt32(
(sal_uInt16)pWrtShell->GetViewOptions()->GetZoomType());//eZoom;
commit 87e2f7709b0541958cb5f4cecf24857593777952
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Fri Apr 13 20:17:06 2012 +0200
remove unused variables
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index 6eac605..8e1e0a9 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -962,7 +962,6 @@ SdrObject* SwVirtFlyDrawObj::CheckMacroHit( const SdrObjMacroHitRec& rRec ) cons
if( aRect.IsInside( rRec.aPos ) )
{
SwRect aActRect( aRect );
- Size aActSz( aRect.SSize() );
aRect.Pos().X() += rRec.nTol;
aRect.Pos().Y() += rRec.nTol;
aRect.SSize().Height()-= 2 * rRec.nTol;
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 80ec5a1..9ad1a02 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2062,7 +2062,6 @@ void lcl_AdjustRectToPixelSize( SwRect& io_aSwRect, const OutputDevice &aOut )
Rectangle aTestNewPxRect = aOut.LogicToPixel( aSizedRect );
OSL_ENSURE( aTestOrgPxRect == aTestNewPxRect,
"Error in lcl_AlignRectToPixelSize(..): Adjusted rectangle has incorrect position or size");
- Rectangle aTestNewRect( aSizedRect );
/// check Left()
--aSizedRect.Left();
aTestNewPxRect = aOut.LogicToPixel( aSizedRect );
diff --git a/sw/source/core/layout/virtoutp.cxx b/sw/source/core/layout/virtoutp.cxx
index 831b9e0..715c63a 100644
--- a/sw/source/core/layout/virtoutp.cxx
+++ b/sw/source/core/layout/virtoutp.cxx
@@ -245,7 +245,6 @@ void SwLayVout::Enter( ViewShell *pShell, SwRect &rRect, sal_Bool bOn )
void SwLayVout::_Flush()
{
OSL_ENSURE( pVirDev, "SwLayVout::DrawOut: nothing left Toulouse" );
- Rectangle aTmp( aRect.SVRect() );
pOut->DrawOutDev( aRect.Pos(), aRect.SSize(),
aRect.Pos(), aRect.SSize(), *pVirDev );
SetOutDev( pSh, pOut );
diff --git a/sw/source/ui/ribbar/conpoly.cxx b/sw/source/ui/ribbar/conpoly.cxx
index 0c7b802..1869d7f 100644
--- a/sw/source/ui/ribbar/conpoly.cxx
+++ b/sw/source/ui/ribbar/conpoly.cxx
@@ -113,7 +113,6 @@ sal_Bool ConstPolygon::MouseButtonUp(const MouseEvent& rMEvt)
}
else
{
- Point aPnt(m_pWin->PixelToLogic(rMEvt.GetPosPixel()));
bReturn = SwDrawBase::MouseButtonUp(rMEvt);
// #i85045# removed double mechanism to check for AutoClose polygon
diff --git a/sw/source/ui/ribbar/conrect.cxx b/sw/source/ui/ribbar/conrect.cxx
index fbeb3f5..6de2216 100644
--- a/sw/source/ui/ribbar/conrect.cxx
+++ b/sw/source/ui/ribbar/conrect.cxx
@@ -94,8 +94,6 @@ sal_Bool ConstRectangle::MouseButtonDown(const MouseEvent& rMEvt)
sal_Bool ConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
{
- Point aPnt(m_pWin->PixelToLogic(rMEvt.GetPosPixel()));
-
sal_Bool bRet = SwDrawBase::MouseButtonUp(rMEvt);
if( bRet )
{
diff --git a/sw/source/ui/uiview/swcli.cxx b/sw/source/ui/uiview/swcli.cxx
index 7ef0d90..53a7e05 100644
--- a/sw/source/ui/uiview/swcli.cxx
+++ b/sw/source/ui/uiview/swcli.cxx
@@ -96,8 +96,7 @@ void SwOleClient::RequestNewObjectArea( Rectangle& aLogRect )
void SwOleClient::ObjectAreaChanged()
{
SwWrtShell &rSh = ((SwView*)GetViewShell())->GetWrtShell();
- SwRect aFrm( rSh.GetAnyCurRect( RECT_FLY_EMBEDDED, 0, GetObject() )),
- aPrt( rSh.GetAnyCurRect( RECT_FLY_PRT_EMBEDDED, 0, GetObject() ));
+ SwRect aFrm( rSh.GetAnyCurRect( RECT_FLY_EMBEDDED, 0, GetObject() ));
if ( !aFrm.IsOver( rSh.VisArea() ) )
rSh.MakeVisible( aFrm );
}
commit 73be7d0a7bff557e71534ba45cef9205cfa44520
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Fri Apr 13 20:06:26 2012 +0200
remove unused variables
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 268a7ea..76e84f9 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1193,7 +1193,6 @@ static void CalcAutoLayoutRectangles( SdPage& rPage, int nLayout, Rectangle* rRe
for( i = 1; i < MAX_PRESOBJS; i++ )
rRectangle[i] = aLayoutRect;
- Size aTitleSize( aTitleRect.GetSize() );
Point aTitlePos( aTitleRect.TopLeft() );
Size aLayoutSize( aLayoutRect.GetSize() );
Point aLayoutPos( aLayoutRect.TopLeft() );
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index 76f3b5a..ced683a 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -678,7 +678,6 @@ void CustomAnimationCreateDialog::setPosition()
{
Point aPos( GetPosPixel());
Size aSize( GetSizePixel());
- Point aParentPos( pParent->GetPosPixel());
Size aParentSize( pParent->GetSizePixel());
// right center
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index 0fa1c7e..183f297 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -891,9 +891,6 @@ void PresLayoutPreview::Paint( const Rectangle& )
{
Push();
- svtools::ColorConfig aColorConfig;
- svtools::ColorConfigValue aColor( aColorConfig.GetColorValue( svtools::APPBACKGROUND ) );
-
maOutRect = Rectangle( Point(0,0), GetOutputSize() );
// calculate page size with correct aspect ratio
diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx
index d136d33..dc5a70c 100644
--- a/sd/source/ui/func/fucon3d.cxx
+++ b/sd/source/ui/func/fucon3d.cxx
@@ -380,7 +380,6 @@ sal_Bool FuConstruct3dObject::MouseButtonUp(const MouseEvent& rMEvt)
if ( mpView->IsCreateObj() && rMEvt.IsLeft() )
{
- Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
mpView->EndCreateObj(SDRCREATE_FORCEEND);
bReturn = sal_True;
}
diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx
index 1c02bf2..a4ead37 100644
--- a/sd/source/ui/func/fuconarc.cxx
+++ b/sd/source/ui/func/fuconarc.cxx
@@ -173,8 +173,6 @@ sal_Bool FuConstructArc::MouseButtonUp( const MouseEvent& rMEvt )
if ( mpView->IsCreateObj() && rMEvt.IsLeft() )
{
- Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
-
sal_uLong nCount = mpView->GetSdrPageView()->GetObjList()->GetObjCount();
if (mpView->EndCreateObj(SDRCREATE_NEXTPOINT) )
diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx
index 32db518..8bdfd8c 100644
--- a/sd/source/ui/func/fuconuno.cxx
+++ b/sd/source/ui/func/fuconuno.cxx
@@ -139,7 +139,6 @@ sal_Bool FuConstructUnoControl::MouseButtonUp(const MouseEvent& rMEvt)
if ( mpView->IsCreateObj() && rMEvt.IsLeft() )
{
- Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
mpView->EndCreateObj(SDRCREATE_FORCEEND);
bReturn = sal_True;
}
diff --git a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx
index 838b39f..165ff8f 100644
--- a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx
@@ -199,19 +199,6 @@ void InsertionIndicatorHandler::SetPosition (
maIconSize,
mrSlideSorter.GetModel()));
- static sal_Int32 TargetIndex (1);
- if (aInsertPosition.GetIndex() == TargetIndex)
- {
- const view::InsertPosition aPosition (rLayouter.GetInsertPosition(
- rPoint,
- maIconSize,
- mrSlideSorter.GetModel()));
- const view::InsertPosition aPosition2 (rLayouter.GetInsertPosition(
- rPoint,
- maIconSize,
- mrSlideSorter.GetModel()));
- }
-
if (maInsertPosition != aInsertPosition
|| meMode != eMode
// || ! mpInsertionIndicatorOverlay->IsVisible()
diff --git a/sd/source/ui/toolpanel/TitleBar.cxx b/sd/source/ui/toolpanel/TitleBar.cxx
index e25539d..a122caf 100644
--- a/sd/source/ui/toolpanel/TitleBar.cxx
+++ b/sd/source/ui/toolpanel/TitleBar.cxx
@@ -384,9 +384,6 @@ sal_uInt16 TitleBar::GetTextStyle (void)
void TitleBar::PaintBackground (const Rectangle& rTitleBarBox)
{
// Fill a slightly rounded rectangle.
- Color aFillColor (GetFillColor());
- Color aLineColor (GetLineColor());
-
switch (meType)
{
case TBT_SUB_CONTROL_HEADLINE:
commit c3ff98d54ddaa1728a08117283dce2d41d0cd568
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Fri Apr 13 19:57:11 2012 +0200
put "unused" function into the right #ifdef
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
index cbefb08..26941cb 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
@@ -44,7 +44,7 @@ using namespace ::com::sun::star::drawing::framework;
namespace {
-#if OSL_DEBUG_LEVEL > 0
+#if OSL_DEBUG_LEVEL >= 2
void TraceRequest (const Reference<XConfigurationChangeRequest>& rxRequest)
{
More information about the Libreoffice-commits
mailing list