You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2013/08/08 17:01:58 UTC
svn commit: r1511822 [2/5] - in /openoffice/branches/alg/aw080/main:
basegfx/source/point/ basegfx/source/vector/
chart2/source/controller/dialogs/ chart2/source/controller/drawinglayer/
chart2/source/controller/inc/ chart2/source/controller/main/ char...
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/framework/module/ModuleController.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/framework/module/ModuleController.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/framework/module/ModuleController.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/framework/module/ModuleController.cxx Thu Aug 8 15:01:55 2013
@@ -312,7 +312,7 @@ void SAL_CALL ModuleController::requestR
iFactory->second,
aArguments);
}
- catch(Exception&e)
+ catch(Exception& /*e*/)
{
OSL_TRACE("caught exception while creating factory.");
}
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/func/fuconbez.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/func/fuconbez.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/func/fuconbez.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/func/fuconbez.cxx Thu Aug 8 15:01:55 2013
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sd.hxx"
@@ -39,7 +37,6 @@
#include <svx/svdlegacy.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
-
#include "app.hrc"
#include "ViewShell.hxx"
#include "ViewShellBase.hxx"
@@ -49,6 +46,7 @@
#include "drawdoc.hxx"
#include "res_bmp.hrc"
#include "CustomAnimationEffect.hxx"
+#include <svx/sdrobjecttools.hxx>
using namespace ::com::sun::star::uno;
@@ -382,153 +380,200 @@ void FuConstructBezierPolygon::SetEditMo
// #97016#
SdrObject* FuConstructBezierPolygon::CreateDefaultObject(const sal_uInt16 nID, const basegfx::B2DRange& rRange)
{
- // case SID_DRAW_POLYGON:
- // case SID_DRAW_POLYGON_NOFILL:
- // case SID_DRAW_XPOLYGON:
- // case SID_DRAW_XPOLYGON_NOFILL:
- // case SID_DRAW_FREELINE:
- // case SID_DRAW_FREELINE_NOFILL:
- // case SID_DRAW_BEZIER_FILL: // BASIC
- // case SID_DRAW_BEZIER_NOFILL: // BASIC
-
- SdrObject* pObj = SdrObjFactory::MakeNewObject(
- mpView->getSdrModelFromSdrView(),
- mpView->getSdrObjectCreationInfo());
-
- if(pObj)
- {
- SdrPathObj* pSdrPathObj = dynamic_cast< SdrPathObj* >(pObj);
-
- if(pSdrPathObj)
- {
- basegfx::B2DPolyPolygon aPoly;
-
- switch(nID)
- {
- case SID_DRAW_BEZIER_FILL:
- {
- const double fWdt(rRange.getWidth() * 0.5);
- const double fHgt(rRange.getHeight() * 0.5);
- const basegfx::B2DPolygon aInnerPoly(basegfx::tools::createPolygonFromEllipse(rRange.getCenter(), fWdt, fHgt));
-
- aPoly.append(aInnerPoly);
- break;
- }
- case SID_DRAW_BEZIER_NOFILL:
- {
- basegfx::B2DPolygon aInnerPoly;
-
- aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX(), rRange.getMaxY()));
-
- const basegfx::B2DPoint aCenterBottom(rRange.getCenterX(), rRange.getMaxY());
- aInnerPoly.appendBezierSegment(
- aCenterBottom,
- aCenterBottom,
- rRange.getCenter());
-
- const basegfx::B2DPoint aCenterTop(rRange.getCenterX(), rRange.getMinY());
- aInnerPoly.appendBezierSegment(
- aCenterTop,
- aCenterTop,
- basegfx::B2DPoint(rRange.getMaxX(), rRange.getMinY()));
-
- aPoly.append(aInnerPoly);
- break;
- }
- case SID_DRAW_FREELINE:
- case SID_DRAW_FREELINE_NOFILL:
- {
- basegfx::B2DPolygon aInnerPoly;
-
- aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX(), rRange.getMaxY()));
-
- aInnerPoly.appendBezierSegment(
- rRange.getMinimum(),
- basegfx::B2DPoint(rRange.getCenterX(), rRange.getMinY()),
- rRange.getCenter());
-
- aInnerPoly.appendBezierSegment(
- basegfx::B2DPoint(rRange.getCenterX(), rRange.getMaxY()),
- rRange.getMaximum(),
- basegfx::B2DPoint(rRange.getMaxX(), rRange.getMinY()));
-
- if(SID_DRAW_FREELINE == nID)
- {
- aInnerPoly.append(rRange.getMaximum());
- }
- else
- {
- aInnerPoly.setClosed(true);
- }
-
- aPoly.append(aInnerPoly);
- break;
- }
- case SID_DRAW_XPOLYGON:
- case SID_DRAW_XPOLYGON_NOFILL:
- {
- basegfx::B2DPolygon aInnerPoly;
-
- aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX(), rRange.getMaxY()));
- aInnerPoly.append(rRange.getMinimum());
- aInnerPoly.append(basegfx::B2DPoint(rRange.getCenterX(), rRange.getMinY()));
- aInnerPoly.append(rRange.getCenter());
- aInnerPoly.append(basegfx::B2DPoint(rRange.getMaxX(), rRange.getCenterY()));
- aInnerPoly.append(rRange.getMaximum());
-
- if(SID_DRAW_XPOLYGON_NOFILL == nID)
- {
- aInnerPoly.append(basegfx::B2DPoint(rRange.getCenterX(), rRange.getMaxY()));
- }
- else
- {
- aInnerPoly.setClosed(true);
- }
-
- aPoly.append(aInnerPoly);
- break;
- }
- case SID_DRAW_POLYGON:
- case SID_DRAW_POLYGON_NOFILL:
- {
- basegfx::B2DPolygon aInnerPoly;
- const double fWdt(rRange.getWidth());
- const double fHgt(rRange.getHeight());
-
- aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX(), rRange.getMaxY()));
- aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX() + fWdt * 0.3, rRange.getMinY() + fHgt * 0.7));
- aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX(), rRange.getMinY() + fHgt * 0.15));
- aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX() + fWdt * 0.65, rRange.getMinY()));
- aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX() + fWdt, rRange.getMinY() + fHgt * 0.3));
- aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX() + fWdt * 0.8, rRange.getMinY() + fHgt * 0.5));
- aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX() + fWdt * 0.8, rRange.getMinY() + fHgt * 075));
- aInnerPoly.append(basegfx::B2DPoint(rRange.getMaxY(), rRange.getMaxX()));
-
- if(SID_DRAW_POLYGON_NOFILL == nID)
- {
- aInnerPoly.append(basegfx::B2DPoint(rRange.getCenterX(), rRange.getMaxY()));
- }
- else
- {
- aInnerPoly.setClosed(true);
- }
-
- aPoly.append(aInnerPoly);
- break;
- }
- }
-
- pSdrPathObj->setB2DPolyPolygonInObjectCoordinates(aPoly);
- }
- else
- {
- DBG_ERROR("Object is NO path object");
- }
-
- sdr::legacy::SetLogicRange(*pObj, rRange);
- }
-
- return pObj;
+ // case SID_DRAW_POLYGON:
+ // case SID_DRAW_POLYGON_NOFILL:
+ // case SID_DRAW_XPOLYGON:
+ // case SID_DRAW_XPOLYGON_NOFILL:
+ // case SID_DRAW_FREELINE:
+ // case SID_DRAW_FREELINE_NOFILL:
+ // case SID_DRAW_BEZIER_FILL: // BASIC
+ // case SID_DRAW_BEZIER_NOFILL: // BASIC
+
+ SdrPathObj* pObj = dynamic_cast< SdrPathObj* >(
+ SdrObjFactory::MakeNewObject(
+ mpView->getSdrModelFromSdrView(),
+ mpView->getSdrObjectCreationInfo()));
+
+ if(pObj)
+ {
+ DefaultSdrPathObjType eType(DefaultSdrPathObjType_Line);
+ bool bClosed(false);
+
+ switch(nID)
+ {
+ case SID_DRAW_BEZIER_FILL:
+ eType = DefaultSdrPathObjType_BezierFill;
+ bClosed = true;
+ break;
+ case SID_DRAW_BEZIER_NOFILL:
+ eType = DefaultSdrPathObjType_Bezier;
+ break;
+ case SID_DRAW_FREELINE:
+ eType = DefaultSdrPathObjType_Freeline;
+ bClosed = true;
+ break;
+ case SID_DRAW_FREELINE_NOFILL:
+ eType = DefaultSdrPathObjType_Freeline;
+ break;
+ case SID_DRAW_XPOLYGON:
+ eType = DefaultSdrPathObjType_XPolygon;
+ bClosed = true;
+ break;
+ case SID_DRAW_XPOLYGON_NOFILL:
+ eType = DefaultSdrPathObjType_XPolygon;
+ break;
+ case SID_DRAW_POLYGON:
+ eType = DefaultSdrPathObjType_Polygon;
+ bClosed = true;
+ break;
+ case SID_DRAW_POLYGON_NOFILL:
+ eType = DefaultSdrPathObjType_Polygon;
+ break;
+ }
+
+ initializeDefaultSdrPathObjByObjectType(*pObj, eType, rRange, bClosed);
+ }
+ else
+ {
+ DBG_ERROR("Object is NO path object");
+ }
+
+ return pObj;
+
+ // TTTT
+ //{
+ // SdrPathObj* pSdrPathObj = dynamic_cast< SdrPathObj* >(pObj);
+ //
+ // if(pSdrPathObj)
+ // {
+ // basegfx::B2DPolyPolygon aPoly;
+ //
+ // switch(nID)
+ // {
+ // case SID_DRAW_BEZIER_FILL:
+ // {
+ // const double fWdt(rRange.getWidth() * 0.5);
+ // const double fHgt(rRange.getHeight() * 0.5);
+ // const basegfx::B2DPolygon aInnerPoly(basegfx::tools::createPolygonFromEllipse(rRange.getCenter(), fWdt, fHgt));
+ //
+ // aPoly.append(aInnerPoly);
+ // break;
+ // }
+ // case SID_DRAW_BEZIER_NOFILL:
+ // {
+ // basegfx::B2DPolygon aInnerPoly;
+ //
+ // aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX(), rRange.getMaxY()));
+ //
+ // const basegfx::B2DPoint aCenterBottom(rRange.getCenterX(), rRange.getMaxY());
+ // aInnerPoly.appendBezierSegment(
+ // aCenterBottom,
+ // aCenterBottom,
+ // rRange.getCenter());
+ //
+ // const basegfx::B2DPoint aCenterTop(rRange.getCenterX(), rRange.getMinY());
+ // aInnerPoly.appendBezierSegment(
+ // aCenterTop,
+ // aCenterTop,
+ // basegfx::B2DPoint(rRange.getMaxX(), rRange.getMinY()));
+ //
+ // aPoly.append(aInnerPoly);
+ // break;
+ // }
+ // case SID_DRAW_FREELINE:
+ // case SID_DRAW_FREELINE_NOFILL:
+ // {
+ // basegfx::B2DPolygon aInnerPoly;
+ //
+ // aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX(), rRange.getMaxY()));
+ //
+ // aInnerPoly.appendBezierSegment(
+ // rRange.getMinimum(),
+ // basegfx::B2DPoint(rRange.getCenterX(), rRange.getMinY()),
+ // rRange.getCenter());
+ //
+ // aInnerPoly.appendBezierSegment(
+ // basegfx::B2DPoint(rRange.getCenterX(), rRange.getMaxY()),
+ // rRange.getMaximum(),
+ // basegfx::B2DPoint(rRange.getMaxX(), rRange.getMinY()));
+ //
+ // if(SID_DRAW_FREELINE == nID)
+ // {
+ // aInnerPoly.append(rRange.getMaximum());
+ // }
+ // else
+ // {
+ // aInnerPoly.setClosed(true);
+ // }
+ //
+ // aPoly.append(aInnerPoly);
+ // break;
+ // }
+ // case SID_DRAW_XPOLYGON:
+ // case SID_DRAW_XPOLYGON_NOFILL:
+ // {
+ // basegfx::B2DPolygon aInnerPoly;
+ //
+ // aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX(), rRange.getMaxY()));
+ // aInnerPoly.append(rRange.getMinimum());
+ // aInnerPoly.append(basegfx::B2DPoint(rRange.getCenterX(), rRange.getMinY()));
+ // aInnerPoly.append(rRange.getCenter());
+ // aInnerPoly.append(basegfx::B2DPoint(rRange.getMaxX(), rRange.getCenterY()));
+ // aInnerPoly.append(rRange.getMaximum());
+ //
+ // if(SID_DRAW_XPOLYGON_NOFILL == nID)
+ // {
+ // aInnerPoly.append(basegfx::B2DPoint(rRange.getCenterX(), rRange.getMaxY()));
+ // }
+ // else
+ // {
+ // aInnerPoly.setClosed(true);
+ // }
+ //
+ // aPoly.append(aInnerPoly);
+ // break;
+ // }
+ // case SID_DRAW_POLYGON:
+ // case SID_DRAW_POLYGON_NOFILL:
+ // {
+ // basegfx::B2DPolygon aInnerPoly;
+ // const double fWdt(rRange.getWidth());
+ // const double fHgt(rRange.getHeight());
+ //
+ // aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX(), rRange.getMaxY()));
+ // aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX() + fWdt * 0.3, rRange.getMinY() + fHgt * 0.7));
+ // aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX(), rRange.getMinY() + fHgt * 0.15));
+ // aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX() + fWdt * 0.65, rRange.getMinY()));
+ // aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX() + fWdt, rRange.getMinY() + fHgt * 0.3));
+ // aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX() + fWdt * 0.8, rRange.getMinY() + fHgt * 0.5));
+ // aInnerPoly.append(basegfx::B2DPoint(rRange.getMinX() + fWdt * 0.8, rRange.getMinY() + fHgt * 0.75));
+ // aInnerPoly.append(basegfx::B2DPoint(rRange.getMaxY(), rRange.getMaxX()));
+ //
+ // if(SID_DRAW_POLYGON_NOFILL == nID)
+ // {
+ // aInnerPoly.append(basegfx::B2DPoint(rRange.getCenterX(), rRange.getMaxY()));
+ // }
+ // else
+ // {
+ // aInnerPoly.setClosed(true);
+ // }
+ //
+ // aPoly.append(aInnerPoly);
+ // break;
+ // }
+ // }
+ //
+ // pSdrPathObj->setB2DPolyPolygonInObjectCoordinates(aPoly);
+ // }
+ // else
+ // {
+ // DBG_ERROR("Object is NO path object");
+ // }
+ //
+ // sdr::legacy::SetLogicRange(*pObj, rRange);
+ //}
+ //
+ //return pObj;
}
} // end of namespace sd
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/func/fuconrec.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/func/fuconrec.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/func/fuconrec.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/func/fuconrec.cxx Thu Aug 8 15:01:55 2013
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sd.hxx"
@@ -54,7 +52,6 @@
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <svx/svdlegacy.hxx>
-
#include "sdresid.hxx"
#include "View.hxx"
#include "sdpage.hxx"
@@ -63,6 +60,7 @@
#include "drawdoc.hxx"
#include "res_bmp.hrc"
#include "glob.hrc"
+#include <svx/sdrobjecttools.hxx>
namespace sd {
@@ -847,16 +845,20 @@ SdrObject* FuConstructRectangle::CreateD
case SID_LINE_ARROW_SQUARE:
case SID_LINE_SQUARE_ARROW:
{
- SdrPathObj* pSdrPathObj = dynamic_cast< SdrPathObj* >(pObj);
-
- if(pSdrPathObj)
- {
- const double fYMiddle((aRange.getMinY() + aRange.getMaxY()) * 0.5);
-
- ::basegfx::B2DPolygon aB2DPolygon;
- aB2DPolygon.append(::basegfx::B2DPoint(aStart.getX(), fYMiddle));
- aB2DPolygon.append(::basegfx::B2DPoint(aEnd.getX(), fYMiddle));
- pSdrPathObj->setB2DPolyPolygonInObjectCoordinates(::basegfx::B2DPolyPolygon(aB2DPolygon));
+ SdrPathObj* pSdrPathObj = dynamic_cast< SdrPathObj* >(pObj);
+
+ if(pSdrPathObj)
+ {
+ initializeDefaultSdrPathObjByObjectType(*pSdrPathObj, DefaultSdrPathObjType_Line, rRange, false);
+ //pSdrPathObj->initializeDefaultSdrPathObjBySlotID(nID, aRange);
+
+ // TTTT
+ //const double fYMiddle((aRange.getMinY() + aRange.getMaxY()) * 0.5);
+ //
+ //::basegfx::B2DPolygon aB2DPolygon;
+ //aB2DPolygon.append(::basegfx::B2DPoint(aStart.getX(), fYMiddle));
+ //aB2DPolygon.append(::basegfx::B2DPoint(aEnd.getX(), fYMiddle));
+ //pSdrPathObj->setB2DPolyPolygonInObjectCoordinates(::basegfx::B2DPolyPolygon(aB2DPolygon));
}
else
{
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/func/fuolbull.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/func/fuolbull.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/func/fuolbull.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/func/fuolbull.cxx Thu Aug 8 15:01:55 2013
@@ -211,7 +211,7 @@ void FuOutlineBullet::SetCurrentBulletsN
}
nIdx--;
- sal_uInt32 nNumItemId = SID_ATTR_NUMBERING_RULE;
+ sal_uInt16 nNumItemId = SID_ATTR_NUMBERING_RULE;
const SfxPoolItem* pTmpItem = GetNumBulletItem( aNewAttr, nNumItemId );
SvxNumRule* pNumRule = NULL;
if ( pTmpItem )
@@ -316,7 +316,7 @@ void FuOutlineBullet::SetCurrentBulletsN
rReq.Done();
}
-const SfxPoolItem* FuOutlineBullet::GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt32& nNumItemId)
+const SfxPoolItem* FuOutlineBullet::GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16& nNumItemId)
{
//SvxNumBulletItem* pRetItem = NULL;
const SfxPoolItem* pTmpItem = NULL;
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/func/fupoor.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/func/fupoor.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/func/fupoor.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/func/fupoor.cxx Thu Aug 8 15:01:55 2013
@@ -382,7 +382,7 @@ bool FuPoor::KeyInput(const KeyEvent& rK
if (!mpView->IsTextEdit() && !bSlideShow && !mpDocSh->IsUIActive())
{
// Zoom vergroessern
- mpViewShell->SetZoom(mpWindow->GetZoom() * 3 / 2);
+ mpViewShell->SetZoom(basegfx::fround(mpWindow->GetZoom() * (3.0 / 2.0)));
DrawViewShell* pDrawViewShell = dynamic_cast< DrawViewShell* >(mpViewShell);
@@ -401,7 +401,7 @@ bool FuPoor::KeyInput(const KeyEvent& rK
if (!mpView->IsTextEdit() && !bSlideShow && !mpDocSh->IsUIActive())
{
// Zoom verringern
- mpViewShell->SetZoom(mpWindow->GetZoom() * 2 / 3);
+ mpViewShell->SetZoom(basegfx::fround(mpWindow->GetZoom() * (2.0 / 3.0)));
DrawViewShell* pDrawViewShell = dynamic_cast< DrawViewShell* >(mpViewShell);
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/inc/AccessibleSlideSorterObject.hxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/inc/AccessibleSlideSorterObject.hxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/inc/AccessibleSlideSorterObject.hxx Thu Aug 8 15:01:55 2013
@@ -72,7 +72,7 @@ public:
const ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible >& rxParent,
::sd::slidesorter::SlideSorter& rSlideSorter,
- sal_uInt16 nPageNumber);
+ sal_uInt32 nPageNumber);
~AccessibleSlideSorterObject (void);
/** Return the page that is made accessible by the called object.
@@ -81,7 +81,7 @@ public:
/** The page number as given to the constructor.
*/
- sal_uInt16 GetPageNumber (void) const;
+ sal_uInt32 GetPageNumber (void) const;
void FireAccessibleEvent (
short nEventId,
@@ -217,7 +217,7 @@ public:
private:
::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible> mxParent;
- sal_uInt16 mnPageNumber;
+ sal_uInt32 mnPageNumber;
::sd::slidesorter::SlideSorter& mrSlideSorter;
sal_uInt32 mnClientId;
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/inc/ClientView.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/inc/ClientView.hxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/inc/ClientView.hxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/inc/ClientView.hxx Thu Aug 8 15:01:55 2013
@@ -29,6 +29,7 @@
namespace sd {
class DrawViewShell;
+class Window;
/************************************************************************
|*
@@ -46,13 +47,13 @@ public:
DrawViewShell* pShell);
virtual ~ClientView (void);
- virtual void CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L);
+ virtual void CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) const;
// Wenn die View kein Invalidate() an den Fenstern durchfuehren soll, muss
// man diese beiden folgenden Methoden ueberladen und entsprechend anders
// reagieren.
- virtual void InvalidateOneWin(::Window& rWin);
- virtual void InvalidateOneWin(::Window& rWin, const basegfx::B2DRange& rRange);
+ virtual void InvalidateOneWin(::Window& rWin) const;
+ virtual void InvalidateOneWin(::Window& rWin, const ::basegfx::B2DRange& rRange) const;
};
} // end of namespace sd
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/inc/DrawDocShell.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/inc/DrawDocShell.hxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/inc/DrawDocShell.hxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/inc/DrawDocShell.hxx Thu Aug 8 15:01:55 2013
@@ -110,7 +110,7 @@ public:
using SfxObjectShell::GetVisArea;
using SfxShell::GetViewShell;
- sd::ViewShell* GetViewShell() { return mpViewShell; }
+ sd::ViewShell* GetViewShell();
::sd::FrameView* GetFrameView();
::sd::FunctionReference GetDocShellFunction() const { return mxDocShellFunction; }
void SetDocShellFunction( const ::sd::FunctionReference& xFunction );
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/inc/FrameView.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/inc/FrameView.hxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/inc/FrameView.hxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/inc/FrameView.hxx Thu Aug 8 15:01:55 2013
@@ -194,7 +194,7 @@ private:
bool mbNoAttribs; // Gliederungsmodus
Rectangle maVisArea; // Sichtbarer Bereich
PageKind mePageKind; // Seitentyp (Standard, Notizen, Handzettel)
- sal_uInt16 mnSelectedPage; // Selektierte Seite
+ sal_uInt32 mnSelectedPage; // Selektierte Seite
PageKind mePageKindOnLoad;
sal_uInt32 mnSelectedPageOnLoad;
EditMode meStandardEditMode; // Editmode im Zeichenmodus (Page/MasterPage)
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/inc/PresentationViewShell.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/inc/PresentationViewShell.hxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/inc/PresentationViewShell.hxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/inc/PresentationViewShell.hxx Thu Aug 8 15:01:55 2013
@@ -60,7 +60,7 @@ protected:
private:
Rectangle maOldVisArea;
- virtual void Activate (bool bIsMDIActivate);
+ virtual void Activate (sal_Bool bIsMDIActivate);
virtual void Paint (const Rectangle& rRect, ::sd::Window* pWin);
};
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/inc/SlideView.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/inc/SlideView.hxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/inc/SlideView.hxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/inc/SlideView.hxx Thu Aug 8 15:01:55 2013
@@ -74,8 +74,8 @@ public:
sal_uInt16 ChangePagesPerRow( sal_uInt16 nNum );
sal_uInt16 GetPagesPerRow() const { return nPagesPerRow; }
- virtual void InvalidateOneWin( ::Window& rWin );
- virtual void InvalidateOneWin( ::Window& rWin, const basegfx::B2DRange& rRange );
+ virtual void InvalidateOneWin( ::Window& rWin ) const;
+ virtual void InvalidateOneWin( ::Window& rWin, const ::basegfx::B2DRange& rRange ) const;
void SetAllowInvalidate( bool bFlag );
bool IsInvalidateAllowed() const;
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/inc/SlideViewShell.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/inc/SlideViewShell.hxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/inc/SlideViewShell.hxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/inc/SlideViewShell.hxx Thu Aug 8 15:01:55 2013
@@ -144,7 +144,7 @@ public:
/** On activation the preview is turned off.
*/
- virtual void Activate (bool IsMDIActivate);
+ virtual void Activate (sal_Bool IsMDIActivate);
protected:
virtual Size GetOptimalSizePixel() const;
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/inc/View.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/inc/View.hxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/inc/View.hxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/inc/View.hxx Thu Aug 8 15:01:55 2013
@@ -76,7 +76,7 @@ public:
ViewShell* pViewSh=NULL);
virtual ~View (void);
- void CompleteRedraw( OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L);
+ void CompleteRedraw( OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) const;
virtual bool GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr = false ) const;
virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll = false);
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/inc/ViewClipboard.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/inc/ViewClipboard.hxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/inc/ViewClipboard.hxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/inc/ViewClipboard.hxx Thu Aug 8 15:01:55 2013
@@ -66,7 +66,7 @@ protected:
/** Return an index of a page after which the pages of the transferable
are to be inserted into the target document.
*/
- virtual sal_uInt16 DetermineInsertPosition (
+ virtual sal_uInt32 DetermineInsertPosition (
const SdTransferable& rTransferable);
/** Insert the slides in the given transferable behind the last selected
@@ -79,9 +79,9 @@ protected:
@return
Returns the number of inserted slides.
*/
- virtual sal_uInt16 InsertSlides (
+ virtual sal_uInt32 InsertSlides (
const SdTransferable& rTransferable,
- sal_uInt16 nInsertPosition);
+ sal_uInt32 nInsertPosition);
};
} // end of namespace ::sd
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/inc/ViewShell.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/inc/ViewShell.hxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/inc/ViewShell.hxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/inc/ViewShell.hxx Thu Aug 8 15:01:55 2013
@@ -267,11 +267,11 @@ public:
void SetStartShowWithDialog( bool bIn = true ) { mbStartShowWithDialog = bIn; }
bool IsStartShowWithDialog() const { return mbStartShowWithDialog; }
- sal_uInt16 GetPrintedHandoutPageNum (void) const { return mnPrintedHandoutPageNum; }
- void SetPrintedHandoutPageNum (sal_uInt16 nPageNumber) {mnPrintedHandoutPageNum=nPageNumber; }
+ sal_uInt32 GetPrintedHandoutPageNum (void) const { return mnPrintedHandoutPageNum; }
+ void SetPrintedHandoutPageNum (sal_uInt32 nPageNumber) {mnPrintedHandoutPageNum=nPageNumber; }
- sal_uInt16 GetPrintedHandoutPageCount(void) const { return mnPrintedHandoutPageCount; }
- void SetPrintedHandoutPageCount (sal_uInt16 nPageCount) {mnPrintedHandoutPageCount=nPageCount; }
+ sal_uInt32 GetPrintedHandoutPageCount(void) const { return mnPrintedHandoutPageCount; }
+ void SetPrintedHandoutPageCount (sal_uInt32 nPageCount) {mnPrintedHandoutPageCount=nPageCount; }
virtual sal_uInt16 PrepareClose( bool bUI = true, bool bForBrowsing = false );
@@ -488,8 +488,8 @@ protected:
bool mbCenterAllowed; // wird an Fenster weitergegeben
bool mbStartShowWithDialog; // Praesentation wurde ueber Dialog gestartet
- sal_uInt16 mnPrintedHandoutPageNum; // Page number of the handout page that is to be printed.
- sal_uInt16 mnPrintedHandoutPageCount; // Page count of the handout pages that are to be printed.
+ sal_uInt32 mnPrintedHandoutPageNum; // Page number of the handout page that is to be printed.
+ sal_uInt32 mnPrintedHandoutPageCount; // Page count of the handout pages that are to be printed.
/** Area covered by all windows, i.e. the area of the parent window
without the controls at the borders like rulers, scroll bars, tab
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/inc/drawview.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/inc/drawview.hxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/inc/drawview.hxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/inc/drawview.hxx Thu Aug 8 15:01:55 2013
@@ -52,7 +52,7 @@ public:
virtual ~DrawView (void);
virtual void handleSelectionChange();
- void CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L);
+ void CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) const;
virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll = false);
@@ -66,7 +66,7 @@ public:
virtual void MakeVisibleAtView(const basegfx::B2DRange& rRange, ::Window& rWin);
virtual void HideSdrPage();
- void PresPaint(const Region& rRegion);
+ void PresPaint(const Region& rRegion) const;
virtual void DeleteMarked(); // from SdrView
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/inc/fuolbull.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/inc/fuolbull.hxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/inc/fuolbull.hxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/inc/fuolbull.hxx Thu Aug 8 15:01:55 2013
@@ -60,7 +60,7 @@ private:
void SetCurrentBulletsNumbering(SfxRequest& rReq);
- const SfxPoolItem* GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt32& nNumItemId);
+ const SfxPoolItem* GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16& nNumItemId);
};
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/inc/sdpreslt.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/inc/sdpreslt.hxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/inc/sdpreslt.hxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/inc/sdpreslt.hxx Thu Aug 8 15:01:55 2013
@@ -71,10 +71,11 @@ private:
const SfxItemSet& mrOutAttrs;
- List* mpLayoutNames;
+ std::vector< String > maLayoutNames;
+ // List* mpLayoutNames;
String maName; // Layoutname oder Dateiname
- long mnLayoutCount; // Anzahl, der im Dokument vorhandenen MasterPages
+ sal_uInt32 mnLayoutCount; // Anzahl, der im Dokument vorhandenen MasterPages
const String maStrNone;
void FillValueSet();
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx Thu Aug 8 15:01:55 2013
@@ -139,12 +139,12 @@ void CurrentMasterPagesSelector::LateIni
void CurrentMasterPagesSelector::Fill (ItemList& rItemList)
{
- sal_uInt16 nPageCount = mrDocument.GetMasterSdPageCount(PK_STANDARD);
+ sal_uInt32 nPageCount = mrDocument.GetMasterSdPageCount(PK_STANDARD);
SdPage* pMasterPage;
// Remember the names of the master pages that have been inserted to
// avoid double insertion.
::std::set<String> aMasterPageNames;
- for (sal_uInt16 nIndex=0; nIndex<nPageCount; nIndex++)
+ for (sal_uInt32 nIndex=0; nIndex<nPageCount; nIndex++)
{
pMasterPage = mrDocument.GetMasterSdPage (nIndex, PK_STANDARD);
if (pMasterPage == NULL)
@@ -192,10 +192,10 @@ void CurrentMasterPagesSelector::UpdateS
{
// Iterate over all pages and for the selected ones put the name of
// their master page into a set.
- sal_uInt16 nPageCount = mrDocument.GetSdPageCount(PK_STANDARD);
+ sal_uInt32 nPageCount = mrDocument.GetSdPageCount(PK_STANDARD);
SdPage* pPage;
::std::set<String> aNames;
- sal_uInt16 nIndex;
+ sal_uInt32 nIndex;
bool bLoop (true);
for (nIndex=0; nIndex<nPageCount && bLoop; nIndex++)
{
@@ -226,10 +226,10 @@ void CurrentMasterPagesSelector::UpdateS
sal_uInt16 nItemCount (PreviewValueSet::GetItemCount());
for (nIndex=1; nIndex<=nItemCount && bLoop; nIndex++)
{
- String sName (PreviewValueSet::GetItemText (nIndex));
+ String sName (PreviewValueSet::GetItemText (static_cast< sal_uInt16 >(nIndex)));
if (aNames.find(sName) != aNames.end())
{
- PreviewValueSet::SelectItem (nIndex);
+ PreviewValueSet::SelectItem (static_cast< sal_uInt16 >(nIndex));
}
}
}
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx Thu Aug 8 15:01:55 2013
@@ -80,7 +80,8 @@ private:
virtual void LateInit (void);
DECL_LINK(EventMultiplexerListener,sd::tools::EventMultiplexerEvent*);
- void Notify (SfxBroadcaster&, const SfxHint& rHint);
+ using MasterPagesSelector::Notify;
+ virtual void Notify (SfxBroadcaster&, const SfxHint& rHint);
};
} } // end of namespace sd::sidebar
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/CustomAnimationPanel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/CustomAnimationPanel.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/CustomAnimationPanel.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/CustomAnimationPanel.cxx Thu Aug 8 15:01:55 2013
@@ -69,7 +69,7 @@ CustomAnimationPanel::~CustomAnimationPa
-css::ui::LayoutSize CustomAnimationPanel::GetHeightForWidth (const sal_Int32 nWidth)
+css::ui::LayoutSize CustomAnimationPanel::GetHeightForWidth (const sal_Int32 /*nWidth*/)
{
const sal_Int32 nMinimumHeight(getCustomAnimationPanelMinimumHeight(mpWrappedControl.get()));
return css::ui::LayoutSize(nMinimumHeight,-1, nMinimumHeight);
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/DocumentHelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/DocumentHelper.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/DocumentHelper.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/DocumentHelper.cxx Thu Aug 8 15:01:55 2013
@@ -71,13 +71,13 @@ SdPage* DocumentHelper::CopyMasterPageTo
// present. This is not the case when we are called during the
// creation of the slide master page because then the notes master
// page is not there.
- sal_uInt16 nSourceMasterPageCount = pSourceDocument->GetMasterPageCount();
+ const sal_uInt32 nSourceMasterPageCount(pSourceDocument->GetMasterPageCount());
if (nSourceMasterPageCount%2 == 0)
// There should be 1 handout page + n slide masters + n notes
// masters = 2*n+1. An even value indicates that a new slide
// master but not yet the notes master has been inserted.
break;
- sal_uInt16 nIndex = pMasterPage->GetPageNumber();
+ const sal_uInt32 nIndex(pMasterPage->GetPageNumber());
if (nSourceMasterPageCount <= nIndex+1)
break;
// Get the slide master page.
@@ -94,7 +94,7 @@ SdPage* DocumentHelper::CopyMasterPageTo
// Check if a master page with the same name as that of the given
// master page already exists.
bool bPageExists (false);
- sal_uInt16 nMasterPageCount(rTargetDocument.GetMasterSdPageCount(PK_STANDARD));
+ const sal_uInt32 nMasterPageCount(rTargetDocument.GetMasterSdPageCount(PK_STANDARD));
for (sal_uInt16 nMaster=0; nMaster<nMasterPageCount; nMaster++)
{
SdPage* pCandidate = static_cast<SdPage*>(
@@ -173,7 +173,7 @@ SdPage* DocumentHelper::GetSlideForMaste
{
// In most cases a new slide has just been inserted so start with
// the last page.
- sal_uInt16 nPageIndex (pDocument->GetSdPageCount(PK_STANDARD)-1);
+ sal_uInt32 nPageIndex(pDocument->GetSdPageCount(PK_STANDARD) - 1);
bool bFound (false);
while ( ! bFound)
{
@@ -233,7 +233,7 @@ SdPage* DocumentHelper::AddMasterPage (
// master page.
rTargetDocument.InsertMasterPage (pClonedMasterPage);
}
- catch (uno::Exception& rException)
+ catch (uno::Exception& /*rException*/)
{
pClonedMasterPage = NULL;
DBG_UNHANDLED_EXCEPTION();
@@ -361,7 +361,7 @@ void DocumentHelper::AssignMasterPageToP
SdPage* DocumentHelper::AddMasterPage (
SdDrawDocument& rTargetDocument,
SdPage* pMasterPage,
- sal_uInt16 nInsertionIndex)
+ sal_uInt32 nInsertionIndex)
{
SdPage* pClonedMasterPage = NULL;
@@ -456,8 +456,8 @@ void DocumentHelper::AssignMasterPageToP
{
// Find first slide that uses the master page.
SdPage* pSlide = NULL;
- sal_uInt16 nPageCount = pDocument->GetSdPageCount(PK_STANDARD);
- for (sal_uInt16 nPage=0; nPage<nPageCount&&pSlide==NULL; nPage++)
+ const sal_uInt32 nPageCount(pDocument->GetSdPageCount(PK_STANDARD));
+ for (sal_uInt32 nPage=0; nPage<nPageCount&&pSlide==NULL; nPage++)
{
SdrPage* pCandidate = pDocument->GetSdPage(nPage,PK_STANDARD);
if (pCandidate != NULL
@@ -526,7 +526,7 @@ SdPage* DocumentHelper::ProvideMasterPag
// Search for a master page with the same name as the given one in
// the target document.
const XubString sMasterPageLayoutName (pMasterPage->GetLayoutName());
- for (sal_uInt16 nIndex=0,nCount=rTargetDocument.GetMasterPageCount(); nIndex<nCount; ++nIndex)
+ for (sal_uInt32 nIndex=0,nCount=rTargetDocument.GetMasterPageCount(); nIndex<nCount; ++nIndex)
{
SdPage* pCandidate = static_cast<SdPage*>(rTargetDocument.GetMasterPage(nIndex));
if (pCandidate!=NULL
@@ -545,7 +545,7 @@ SdPage* DocumentHelper::ProvideMasterPag
// Determine the position where the new master pages are inserted.
// By default they are inserted at the end. When we assign to a
// master page then insert after the last of the (selected) pages.
- sal_uInt16 nInsertionIndex = rTargetDocument.GetMasterPageCount();
+ sal_uInt32 nInsertionIndex(rTargetDocument.GetMasterPageCount());
if (rpPageList->front()->IsMasterPage())
{
nInsertionIndex = rpPageList->back()->GetPageNumber();
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/DocumentHelper.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/DocumentHelper.hxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/DocumentHelper.hxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/DocumentHelper.hxx Thu Aug 8 15:01:55 2013
@@ -78,7 +78,7 @@ private:
static SdPage* AddMasterPage (
SdDrawDocument& rTargetDocument,
SdPage* pMasterPage,
- sal_uInt16 nInsertionIndex);
+ sal_uInt32 nInsertionIndex);
static SdPage* ProvideMasterPage (
SdDrawDocument& rTargetDocument,
SdPage* pMasterPage,
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/MasterPageObserver.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/MasterPageObserver.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/MasterPageObserver.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/MasterPageObserver.cxx Thu Aug 8 15:01:55 2013
@@ -187,8 +187,8 @@ void MasterPageObserver::Implementation:
{
// Gather the names of all the master pages in the given document.
MasterPageContainer::data_type aMasterPageSet;
- sal_uInt16 nMasterPageCount = rDocument.GetMasterSdPageCount(PK_STANDARD);
- for (sal_uInt16 nIndex=0; nIndex<nMasterPageCount; nIndex++)
+ sal_uInt32 nMasterPageCount = rDocument.GetMasterSdPageCount(PK_STANDARD);
+ for (sal_uInt32 nIndex=0; nIndex<nMasterPageCount; nIndex++)
{
SdPage* pMasterPage = rDocument.GetMasterSdPage (nIndex, PK_STANDARD);
if (pMasterPage != NULL)
@@ -325,9 +325,9 @@ void MasterPageObserver::Implementation:
SdDrawDocument& rDocument)
{
// Create a set of names of the master pages used by the given document.
- sal_uInt16 nMasterPageCount = rDocument.GetMasterSdPageCount(PK_STANDARD);
+ sal_uInt32 nMasterPageCount = rDocument.GetMasterSdPageCount(PK_STANDARD);
::std::set<String> aCurrentMasterPages;
- for (sal_uInt16 nIndex=0; nIndex<nMasterPageCount; nIndex++)
+ for (sal_uInt32 nIndex=0; nIndex<nMasterPageCount; nIndex++)
{
SdPage* pMasterPage = rDocument.GetMasterSdPage (nIndex, PK_STANDARD);
if (pMasterPage != NULL)
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/MasterPagesSelector.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/MasterPagesSelector.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/MasterPagesSelector.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/MasterPagesSelector.cxx Thu Aug 8 15:01:55 2013
@@ -421,7 +421,7 @@ void MasterPagesSelector::AssignMasterPa
if (pMasterPage == NULL)
break;
- sal_uInt16 nPageCount = mrDocument.GetSdPageCount(PK_STANDARD);
+ sal_uInt32 nPageCount = mrDocument.GetSdPageCount(PK_STANDARD);
if (nPageCount == 0)
break;
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/MasterPagesSelector.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/MasterPagesSelector.hxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/MasterPagesSelector.hxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/MasterPagesSelector.hxx Thu Aug 8 15:01:55 2013
@@ -84,10 +84,10 @@ public:
page, is cloned and inserted into mrDocument. The necessary styles
are copied as well.
*/
- static SdPage* AddMasterPage (
- SdDrawDocument* pTargetDocument,
- SdPage* pMasterPage,
- sal_uInt16 nInsertionIndex);
+ //static SdPage* AddMasterPage (
+ // SdDrawDocument* pTargetDocument,
+ // SdPage* pMasterPage,
+ // sal_uInt32 nInsertionIndex);
virtual Size GetPreferredSize (void);
virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeight);
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/PanelBase.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/PanelBase.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/PanelBase.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/PanelBase.cxx Thu Aug 8 15:01:55 2013
@@ -66,7 +66,7 @@ void PanelBase::Dispose (void)
-css::ui::LayoutSize PanelBase::GetHeightForWidth (const sal_Int32 nWidth)
+css::ui::LayoutSize PanelBase::GetHeightForWidth (const sal_Int32 /*nWidth*/)
{
sal_Int32 nHeight (0);
if (ProvideWrappedControl())
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/PanelFactory.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/PanelFactory.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/PanelFactory.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/PanelFactory.cxx Thu Aug 8 15:01:55 2013
@@ -105,7 +105,7 @@ Sequence<rtl::OUString> SAL_CALL PanelFa
//----- PanelFactory --------------------------------------------------------
PanelFactory::PanelFactory(
- const css::uno::Reference<css::uno::XComponentContext>& rxContext)
+ const css::uno::Reference<css::uno::XComponentContext>& /*rxContext*/)
: PanelFactoryInterfaceBase(m_aMutex)
{
}
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/PreviewValueSet.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/PreviewValueSet.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/PreviewValueSet.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/PreviewValueSet.cxx Thu Aug 8 15:01:55 2013
@@ -97,7 +97,7 @@ void PreviewValueSet::Resize (void)
-void PreviewValueSet::Rearrange (bool bForceRequestResize)
+void PreviewValueSet::Rearrange (bool /*bForceRequestResize*/)
{
sal_uInt16 nNewColumnCount (CalculateColumnCount (
GetOutputSizePixel().Width()));
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx Thu Aug 8 15:01:55 2013
@@ -113,8 +113,8 @@ void RecentMasterPagesSelector::Fill (It
{
// Create a set of names of the master pages used by the document.
MasterPageObserver::MasterPageNameSet aCurrentNames;
- sal_uInt16 nMasterPageCount = mrDocument.GetMasterSdPageCount(PK_STANDARD);
- sal_uInt16 nIndex;
+ sal_uInt32 nMasterPageCount = mrDocument.GetMasterSdPageCount(PK_STANDARD);
+ sal_uInt32 nIndex;
for (nIndex=0; nIndex<nMasterPageCount; nIndex++)
{
SdPage* pMasterPage = mrDocument.GetMasterSdPage (nIndex, PK_STANDARD);
@@ -125,7 +125,7 @@ void RecentMasterPagesSelector::Fill (It
// Insert the recently used master pages that are currently not used.
RecentlyUsedMasterPages& rInstance (RecentlyUsedMasterPages::Instance());
- int nPageCount = rInstance.GetMasterPageCount();
+ const sal_uInt32 nPageCount = rInstance.GetMasterPageCount();
for (nIndex=0; nIndex<nPageCount; nIndex++)
{
// Add an entry when a) the page is already known to the
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/SlideTransitionPanel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/SlideTransitionPanel.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/SlideTransitionPanel.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/sidebar/SlideTransitionPanel.cxx Thu Aug 8 15:01:55 2013
@@ -67,7 +67,7 @@ SlideTransitionPanel::~SlideTransitionPa
-css::ui::LayoutSize SlideTransitionPanel::GetHeightForWidth (const sal_Int32 nWidth)
+css::ui::LayoutSize SlideTransitionPanel::GetHeightForWidth (const sal_Int32 /*nWidth*/)
{
const sal_Int32 nMinimumHeight(getSlideTransitionPanelMinimumHeight(mpWrappedControl.get()));
return css::ui::LayoutSize(nMinimumHeight,-1, nMinimumHeight);
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/controller/SlsClipboard.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/controller/SlsClipboard.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/controller/SlsClipboard.cxx Thu Aug 8 15:01:55 2013
@@ -343,7 +343,7 @@ sal_Int32 Clipboard::PasteTransferable (
SdTransferable* pClipTransferable = SD_MOD()->pTransferClip;
model::SlideSorterModel& rModel (mrSlideSorter.GetModel());
bool bMergeMasterPages = !pClipTransferable->HasSourceDoc (rModel.GetDocument());
- sal_uInt16 nInsertIndex (rModel.GetCoreIndex(nInsertPosition));
+ sal_uInt32 nInsertIndex (rModel.GetCoreIndex(nInsertPosition));
sal_Int32 nInsertPageCount (0);
if (pClipTransferable->HasPageBookmarks())
{
@@ -567,7 +567,7 @@ void Clipboard::CreateSlideTransferable
if (pTransferableDocument == NULL)
break;
bool bIsMasterPage(false);
- const sal_uInt16 nPageIndex (pTransferableDocument->GetPageByName(sBookmark, bIsMasterPage));
+ const sal_uInt32 nPageIndex (pTransferableDocument->GetPageByName(sBookmark, bIsMasterPage));
if (nPageIndex == SDRPAGE_NOTFOUND)
break;
@@ -912,7 +912,7 @@ void Clipboard::Abort (void)
-sal_uInt16 Clipboard::DetermineInsertPosition (const SdTransferable& )
+sal_uInt32 Clipboard::DetermineInsertPosition (const SdTransferable& )
{
// Tell the model to move the dragged pages behind the one with the
// index nInsertionIndex which first has to be transformed into an index
@@ -930,11 +930,11 @@ sal_uInt16 Clipboard::DetermineInsertPos
-sal_uInt16 Clipboard::InsertSlides (
+sal_uInt32 Clipboard::InsertSlides (
const SdTransferable& rTransferable,
- sal_uInt16 nInsertPosition)
+ sal_uInt32 nInsertPosition)
{
- sal_uInt16 nInsertedPageCount = ViewClipboard::InsertSlides (
+ sal_uInt32 nInsertedPageCount = ViewClipboard::InsertSlides (
rTransferable,
nInsertPosition);
@@ -943,7 +943,7 @@ sal_uInt16 Clipboard::InsertSlides (
maPagesToSelect.clear();
SdDrawDocument* pDocument = mrSlideSorter.GetModel().GetDocument();
if (pDocument != NULL)
- for (sal_Int32 i=0; i<=nInsertedPageCount; i+=2)
+ for (sal_uInt32 i=0; i<=nInsertedPageCount; i+=2)
maPagesToSelect.push_back(
dynamic_cast<SdPage*>(pDocument->GetPage(nInsertPosition+i)));
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx Thu Aug 8 15:01:55 2013
@@ -210,7 +210,7 @@ void CurrentSlideManager::SetCurrentSlid
{
sal_uInt32 nPageNumber = (rpDescriptor->GetPage()->GetPageNumber()-1)/2;
pDrawViewShell->SwitchPage(nPageNumber);
- pDrawViewShell->GetPageTabControl()->SetCurPageId(nPageNumber+1);
+ pDrawViewShell->GetPageTabControl()->SetCurPageId(static_cast< sal_uInt16 >(nPageNumber + 1));
}
}
}
@@ -229,8 +229,8 @@ void CurrentSlideManager::SetCurrentSlid
::boost::dynamic_pointer_cast<DrawViewShell>(pBase->GetMainViewShell()));
if (pDrawViewShell)
{
- sal_uInt32 nPageNumber = (rpDescriptor->GetPage()->GetPageNumber()-1)/2;
- pDrawViewShell->GetPageTabControl()->SetCurPageId(sal_uInt16(nPageNumber+1));
+ const sal_uInt32 nPageNumber = (rpDescriptor->GetPage()->GetPageNumber()-1)/2;
+ pDrawViewShell->GetPageTabControl()->SetCurPageId(static_cast< sal_uInt16 >(nPageNumber + 1));
}
}
}
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx Thu Aug 8 15:01:55 2013
@@ -1536,15 +1536,15 @@ void NormalModeHandler::RangeSelect (con
{
// Select all pages between the anchor and the given one, including
// the two.
- const sal_uInt16 nAnchorIndex ((pAnchor->GetPage()->GetPageNumber()-1) / 2);
- const sal_uInt16 nOtherIndex ((rpDescriptor->GetPage()->GetPageNumber()-1) / 2);
+ const sal_uInt32 nAnchorIndex ((pAnchor->GetPage()->GetPageNumber()-1) / 2);
+ const sal_uInt32 nOtherIndex ((rpDescriptor->GetPage()->GetPageNumber()-1) / 2);
// Iterate over all pages in the range. Start with the anchor
// page. This way the PageSelector will recognize it again as
// anchor (the first selected page after a DeselectAllPages()
// becomes the anchor.)
- const sal_uInt16 nStep ((nAnchorIndex < nOtherIndex) ? +1 : -1);
- sal_uInt16 nIndex (nAnchorIndex);
+ const sal_uInt32 nStep ((nAnchorIndex < nOtherIndex) ? +1 : -1);
+ sal_uInt32 nIndex (nAnchorIndex);
while (true)
{
rSelector.SelectPage(nIndex);
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx Thu Aug 8 15:01:55 2013
@@ -106,12 +106,12 @@ public:
void Abort (void);
protected:
- virtual sal_uInt16 DetermineInsertPosition (
+ virtual sal_uInt32 DetermineInsertPosition (
const SdTransferable& rTransferable);
- virtual sal_uInt16 InsertSlides (
+ virtual sal_uInt32 InsertSlides (
const SdTransferable& rTransferable,
- sal_uInt16 nInsertPosition);
+ sal_uInt32 nInsertPosition);
private:
SlideSorter& mrSlideSorter;
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx Thu Aug 8 15:01:55 2013
@@ -151,7 +151,7 @@ public:
the n*2+1 magic. Only when a special model is set, like a custom
slide show, then the returned value is different.
*/
- sal_uInt16 GetCoreIndex (const sal_Int32 nIndex) const;
+ sal_uInt32 GetCoreIndex (const sal_Int32 nIndex) const;
/** Call this method after the document has changed its structure. This
will get the model in sync with the SdDrawDocument. This method
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx Thu Aug 8 15:01:55 2013
@@ -137,7 +137,7 @@ public:
virtual void CompleteRedraw (
OutputDevice* pDevice,
const Region& rPaintArea,
- sdr::contact::ViewObjectContactRedirector* pRedirector = NULL);
+ sdr::contact::ViewObjectContactRedirector* pRedirector = NULL) const;
void Paint (OutputDevice& rDevice, const Rectangle& rRepaintArea);
virtual void ConfigurationChanged (
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/model/SlideSorterModel.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/model/SlideSorterModel.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/model/SlideSorterModel.cxx Thu Aug 8 15:01:55 2013
@@ -294,7 +294,7 @@ sal_Int32 SlideSorterModel::GetIndex (co
::osl::MutexGuard aGuard (maMutex);
// First try to guess the right index.
- sal_Int16 nNumber ((pPage->GetPageNumber()-1)/2);
+ sal_Int32 nNumber ((pPage->GetPageNumber()-1)/2);
SharedPageDescriptor pDescriptor (GetPageDescriptor(nNumber, false));
if (pDescriptor.get() != NULL
&& pDescriptor->GetPage() == pPage)
@@ -327,7 +327,7 @@ sal_Int32 SlideSorterModel::GetIndex (co
-sal_uInt16 SlideSorterModel::GetCoreIndex (const sal_Int32 nIndex) const
+sal_uInt32 SlideSorterModel::GetCoreIndex (const sal_Int32 nIndex) const
{
SharedPageDescriptor pDescriptor (GetPageDescriptor(nIndex));
if (pDescriptor)
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlideSorterView.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlideSorterView.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlideSorterView.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlideSorterView.cxx Thu Aug 8 15:01:55 2013
@@ -719,7 +719,7 @@ static double gnLastFrameStart = 0;
void SlideSorterView::CompleteRedraw (
OutputDevice* pDevice,
const Region& rPaintArea,
- sdr::contact::ViewObjectContactRedirector* pRedirector)
+ sdr::contact::ViewObjectContactRedirector* pRedirector) const
{
(void)pRedirector;
#ifdef DEBUG_TIMING
@@ -742,13 +742,13 @@ void SlideSorterView::CompleteRedraw (
{
mrSlideSorter.GetContentWindow()->IncrementLockCount();
if (mpLayeredDevice->HandleMapModeChange())
- DeterminePageObjectVisibilities();
+ const_cast< SlideSorterView* >(this)->DeterminePageObjectVisibilities();
mpLayeredDevice->Repaint(rPaintArea);
mrSlideSorter.GetContentWindow()->DecrementLockCount();
}
else
{
- maRedrawRegion.Union(rPaintArea);
+ const_cast< SlideSorterView* >(this)->maRedrawRegion.Union(rPaintArea);
}
#ifdef DEBUG_TIMING
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlsButtonBar.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlsButtonBar.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlsButtonBar.cxx Thu Aug 8 15:01:55 2013
@@ -71,6 +71,7 @@ public:
/** Set the preview bounding box, the maximal area in which to display
buttons. A call to this method triggers a call to Layout().
*/
+ virtual ~BackgroundTheme();
void SetPreviewBoundingBox (const Rectangle& rPreviewBoundingBox);
Button::IconSize GetIconSize (void) const;
@@ -104,6 +105,7 @@ namespace {
RectangleBackgroundTheme(
const ::boost::shared_ptr<Theme>& rpTheme,
const ::std::vector<SharedButton>& rButtons);
+ virtual ~RectangleBackgroundTheme();
virtual BitmapEx CreateBackground (
const OutputDevice& rTemplateDevice,
const bool bIsButtonDown) const;
@@ -125,6 +127,7 @@ namespace {
BitmapBackgroundTheme(
const ::boost::shared_ptr<Theme>& rpTheme,
const ::std::vector<SharedButton>& rButtons);
+ virtual ~BitmapBackgroundTheme();
virtual BitmapEx CreateBackground (
const OutputDevice& rTemplateDevice,
const bool bIsButtonDown) const;
@@ -804,6 +807,11 @@ ButtonBar::BackgroundTheme::BackgroundTh
+ButtonBar::BackgroundTheme::~BackgroundTheme()
+{
+}
+
+
void ButtonBar::BackgroundTheme::SetPreviewBoundingBox (const Rectangle& rPreviewBoundingBox)
{
@@ -876,6 +884,12 @@ RectangleBackgroundTheme::RectangleBackg
+RectangleBackgroundTheme::~RectangleBackgroundTheme()
+{
+}
+
+
+
BitmapEx RectangleBackgroundTheme::CreateBackground (
const OutputDevice& rTemplateDevice,
const bool bIsButtonDown) const
@@ -993,6 +1007,12 @@ BitmapBackgroundTheme::BitmapBackgroundT
+BitmapBackgroundTheme::~BitmapBackgroundTheme()
+{
+}
+
+
+
BitmapEx BitmapBackgroundTheme::CreateBackground (
const OutputDevice& rTemplateDevice,
const bool bIsButtonDown) const
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx Thu Aug 8 15:01:55 2013
@@ -49,7 +49,11 @@ public:
mnLayer(nLayer)
{
}
-
+
+ virtual ~LayerInvalidator()
+ {
+ }
+
virtual void Invalidate (const Rectangle& rInvalidationBox)
{
mpLayeredDevice->Invalidate(rInvalidationBox, mnLayer);
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx Thu Aug 8 15:01:55 2013
@@ -542,7 +542,7 @@ Bitmap PageObjectPainter::CreateBackgrou
else
{
Color aColor (aTopColor);
- aColor.Merge(aBottomColor, 255 * (nY2-nY) / (nY2-nY1));
+ aColor.Merge(aBottomColor, static_cast< sal_uInt8 >(255 * (nY2-nY) / (nY2-nY1)));
aBitmapDevice.SetLineColor(aColor);
}
aBitmapDevice.DrawLine(
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlsTheme.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlsTheme.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlsTheme.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlsTheme.cxx Thu Aug 8 15:01:55 2013
@@ -40,20 +40,20 @@ const static ColorData White = 0xffffff;
-ColorData ChangeLuminance (const ColorData aColorData, const int nValue)
+ColorData ChangeLuminance (const ColorData aColorData, const sal_uInt8 nValue)
{
Color aColor (aColorData);
if (nValue > 0)
aColor.IncreaseLuminance(nValue);
else
- aColor.DecreaseLuminance(-nValue);
+ aColor.DecreaseLuminance(nValue);
return aColor.GetColor();
}
ColorData HGBAdapt (
const ColorData aColorData,
- const sal_Int32 nNewSaturation,
- const sal_Int32 nNewBrightness)
+ const sal_Int16 nNewSaturation,
+ const sal_Int16 nNewBrightness)
{
sal_uInt16 nHue (0);
sal_uInt16 nSaturation (0);
@@ -376,13 +376,16 @@ void Theme::SetGradient (
rGradient.mnSaturationOverride = nSaturationOverride;
rGradient.mnBrightnessOverride = nBrightnessOverride;
const ColorData aColor (nSaturationOverride>=0 || nBrightnessOverride>=0
- ? HGBAdapt(aBaseColor, nSaturationOverride, nBrightnessOverride)
+ ? HGBAdapt(
+ aBaseColor,
+ static_cast< sal_uInt16 >(nSaturationOverride),
+ static_cast< sal_uInt16 >(nBrightnessOverride))
: aBaseColor);
- rGradient.maFillColor1 = ChangeLuminance(aColor, nFillStartOffset);
- rGradient.maFillColor2 = ChangeLuminance(aColor, nFillEndOffset);
- rGradient.maBorderColor1 = ChangeLuminance(aColor, nBorderStartOffset);
- rGradient.maBorderColor2 = ChangeLuminance(aColor, nBorderEndOffset);
+ rGradient.maFillColor1 = ChangeLuminance(aColor, static_cast< sal_uInt8 >(nFillStartOffset));
+ rGradient.maFillColor2 = ChangeLuminance(aColor, static_cast< sal_uInt8 >(nFillEndOffset));
+ rGradient.maBorderColor1 = ChangeLuminance(aColor, static_cast< sal_uInt8 >(nBorderStartOffset));
+ rGradient.maBorderColor2 = ChangeLuminance(aColor, static_cast< sal_uInt8 >(nBorderEndOffset));
rGradient.mnFillOffset1 = nFillStartOffset;
rGradient.mnFillOffset2 = nFillEndOffset;
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx Thu Aug 8 15:01:55 2013
@@ -129,7 +129,9 @@ const SdrPage* ViewCacheContext::GetPage
sal_Int32 ViewCacheContext::GetPriority (cache::CacheKey aKey)
{
- return - (static_cast<const SdrPage*>(aKey)->GetPageNumber()-1) / 2;
+ const sal_uInt32 nPageNumber((static_cast< const SdrPage* >(aKey)->GetPageNumber() - 1) / 2);
+
+ return -static_cast< sal_Int32 >(nPageNumber);
}
@@ -137,7 +139,8 @@ sal_Int32 ViewCacheContext::GetPriority
model::SharedPageDescriptor ViewCacheContext::GetDescriptor (cache::CacheKey aKey)
{
- sal_uInt16 nPageIndex ((static_cast<const SdrPage*>(aKey)->GetPageNumber() - 1) / 2);
+ sal_uInt32 nPageIndex ((static_cast<const SdrPage*>(aKey)->GetPageNumber() - 1) / 2);
+
return mrModel.GetPageDescriptor(nPageIndex);
}
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/table/tableobjectbar.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/table/tableobjectbar.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/table/tableobjectbar.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/table/tableobjectbar.cxx Thu Aug 8 15:01:55 2013
@@ -149,9 +149,9 @@ void TableObjectBar::Execute( SfxRequest
{
SdrView* pView = mpView;
SfxBindings* pBindings = &mpViewSh->GetViewFrame()->GetBindings();
-
rtl::Reference< sdr::SelectionController > xController( mpView->getSelectionController() );
- sal_uLong nSlotId = rReq.GetSlot();
+ sal_uInt16 nSlotId = rReq.GetSlot();
+
if( xController.is() )
{
switch( nSlotId )
@@ -160,7 +160,12 @@ void TableObjectBar::Execute( SfxRequest
case SID_TABLE_INSERT_COL_DLG:
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- ::std::auto_ptr<SvxAbstractInsRowColDlg> pDlg( pFact ? pFact->CreateSvxInsRowColDlg( mpView->GetViewShell()->GetParentWindow(), nSlotId == SID_TABLE_INSERT_COL_DLG, SD_MOD()->GetSlotPool()->GetSlot(nSlotId)->GetCommand()) : 0);
+ ::std::auto_ptr<SvxAbstractInsRowColDlg> pDlg( pFact
+ ? pFact->CreateSvxInsRowColDlg(
+ mpView->GetViewShell()->GetParentWindow(),
+ nSlotId == SID_TABLE_INSERT_COL_DLG,
+ SD_MOD()->GetSlotPool()->GetSlot(nSlotId)->GetCommand())
+ : 0);
if( pDlg.get() && (pDlg->Execute() == 1) )
{
@@ -169,10 +174,10 @@ void TableObjectBar::Execute( SfxRequest
else
nSlotId = SID_TABLE_INSERT_COL;
- rReq.AppendItem( SfxInt16Item( (sal_uInt16)nSlotId, (sal_uInt16)pDlg->getInsertCount() ) );
+ rReq.AppendItem( SfxInt16Item( nSlotId, (sal_uInt16)pDlg->getInsertCount() ) );
rReq.AppendItem( SfxBoolItem( SID_TABLE_PARAM_INSERT_AFTER, !pDlg->isInsertBefore() ) );
- rReq.SetSlot( (sal_uInt16)nSlotId );
+ rReq.SetSlot( nSlotId );
}
}
}
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/unoidl/unolayer.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/unoidl/unolayer.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/unoidl/unolayer.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/unoidl/unolayer.cxx Thu Aug 8 15:01:55 2013
@@ -543,8 +543,8 @@ uno::Reference< drawing::XLayer > SAL_CA
if( mpModel->mpDoc )
{
SdrLayerAdmin& rLayerAdmin = mpModel->mpDoc->GetModelLayerAdmin();
- sal_uInt16 nLayerCnt = rLayerAdmin.GetLayerCount();
- sal_uInt16 nLayer = nLayerCnt - 2 + 1;
+ sal_uInt32 nLayerCnt = rLayerAdmin.GetLayerCount();
+ sal_uInt32 nLayer = nLayerCnt - 2 + 1;
String aLayerName;
// Ueberpruefung auf schon vorhandene Namen
@@ -697,7 +697,7 @@ uno::Sequence< OUString > SAL_CALL SdLay
throw lang::DisposedException();
SdrLayerAdmin& rLayerAdmin = mpModel->mpDoc->GetModelLayerAdmin();
- const sal_uInt16 nLayerCount = rLayerAdmin.GetLayerCount();
+ const sal_uInt32 nLayerCount = rLayerAdmin.GetLayerCount();
uno::Sequence< OUString > aSeq( nLayerCount );
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/unoidl/unomodel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/unoidl/unomodel.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/unoidl/unomodel.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/unoidl/unomodel.cxx Thu Aug 8 15:01:55 2013
@@ -2517,7 +2517,7 @@ void SAL_CALL SdDrawPagesAccess::remove(
SdDrawDocument& rDoc = *mpModel->mpDoc;
- sal_uInt16 nPageCount = rDoc.GetSdPageCount( PK_STANDARD );
+ const sal_uInt32 nPageCount(rDoc.GetSdPageCount( PK_STANDARD ));
if( nPageCount > 1 )
{
// pPage von xPage besorgen und dann die Id (nPos )ermitteln
@@ -2990,10 +2990,9 @@ SdPage* SdDocLinkTargets::FindPage( cons
if( mpDoc == NULL )
return NULL;
- const sal_uInt16 nMaxPages = mpDoc->GetPageCount();
- const sal_uInt16 nMaxMasterPages = mpDoc->GetMasterPageCount();
-
- sal_uInt16 nPage;
+ const sal_uInt32 nMaxPages = mpDoc->GetPageCount();
+ const sal_uInt32 nMaxMasterPages = mpDoc->GetMasterPageCount();
+ sal_uInt32 nPage;
SdPage* pPage;
const String aName( rName );
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/view/DocumentRenderer.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/view/DocumentRenderer.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/view/DocumentRenderer.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/view/DocumentRenderer.cxx Thu Aug 8 15:01:55 2013
@@ -879,9 +879,11 @@ namespace {
const Size aPrintSize(rPrinter.GetOutputSize());
const sal_Int32 nPageWidth (aPageSize.Width() + mnGap
- - pPageToPrint->GetLeftPageBorder() - pPageToPrint->GetRightPageBorder());
+ - basegfx::fround(pPageToPrint->GetLeftPageBorder())
+ - basegfx::fround(pPageToPrint->GetRightPageBorder()));
const sal_Int32 nPageHeight (aPageSize.Height() + mnGap
- - pPageToPrint->GetTopPageBorder() - pPageToPrint->GetBottomPageBorder());
+ - basegfx::fround(pPageToPrint->GetTopPageBorder())
+ - basegfx::fround(pPageToPrint->GetBottomPageBorder()));
if (nPageWidth<=0 || nPageHeight<=0)
return;
@@ -925,8 +927,8 @@ namespace {
{
public:
BookletPrinterPage (
- const sal_uInt16 nFirstPageIndex,
- const sal_uInt16 nSecondPageIndex,
+ const sal_uInt32 nFirstPageIndex,
+ const sal_uInt32 nSecondPageIndex,
const Point& rFirstOffset,
const Point& rSecondOffset,
const PageKind ePageKind,
@@ -1725,14 +1727,14 @@ private:
long nPageH = aOutRect.GetHeight();
- for (sal_uInt16
+ for (sal_uInt32
nIndex=0,
nCount=mrBase.GetDocument()->GetSdPageCount(PK_STANDARD);
nIndex < nCount;
)
{
pOutliner->Clear();
- pOutliner->SetFirstPageNumber(nIndex+1);
+ pOutliner->SetFirstPageNumber(static_cast< sal_uInt16 >(nIndex+1));
Paragraph* pPara = NULL;
sal_Int32 nH (0);
@@ -1920,8 +1922,8 @@ private:
++nShapeCount;
}
- const sal_uInt16 nPageCount = mrBase.GetDocument()->GetSdPageCount(PK_STANDARD);
- const sal_uInt16 nHandoutPageCount = nShapeCount ? (nPageCount + nShapeCount - 1) / nShapeCount : 0;
+ const sal_uInt32 nPageCount = mrBase.GetDocument()->GetSdPageCount(PK_STANDARD);
+ const sal_uInt32 nHandoutPageCount = nShapeCount ? (nPageCount + nShapeCount - 1) / nShapeCount : 0;
pViewShell->SetPrintedHandoutPageCount( nHandoutPageCount );
mrBase.GetDocument()->setHandoutPageCount( nHandoutPageCount );
@@ -2008,7 +2010,7 @@ private:
pViewShell->WriteFrameViewData();
Point aPtZero;
- for (sal_uInt16
+ for (sal_uInt32
nIndex=0,
nCount=mrBase.GetDocument()->GetSdPageCount(PK_STANDARD);
nIndex < nCount;
@@ -2047,8 +2049,8 @@ private:
rInfo.msPageString = ::rtl::OUString();
rInfo.msPageString += rInfo.msTimeDate;
- long aPageWidth = aPageSize.Width() - pPage->GetLeftPageBorder() - pPage->GetRightPageBorder();
- long aPageHeight = aPageSize.Height() - pPage->GetTopPageBorder() - pPage->GetBottomPageBorder();
+ const long aPageWidth(basegfx::fround(pPage->GetInnerPageScale().getX()));
+ const long aPageHeight(basegfx::fround(pPage->GetInnerPageScale().getY()));
// Bugfix zu 44530:
// Falls implizit umgestellt wurde (Landscape/Portrait)
// wird dies beim Kacheln, bzw. aufteilen (Poster) beruecksichtigt
@@ -2134,8 +2136,8 @@ private:
}
// create vector of pages to print
- ::std::vector< sal_uInt16 > aPageVector;
- for (sal_uInt16
+ ::std::vector< sal_uInt32 > aPageVector;
+ for (sal_uInt32
nIndex=0,
nCount=mrBase.GetDocument()->GetSdPageCount(ePageKind);
nIndex < nCount;
@@ -2147,14 +2149,14 @@ private:
}
// create pairs of pages to print on each page
- typedef ::std::vector< ::std::pair< sal_uInt16, sal_uInt16 > > PairVector;
+ typedef ::std::vector< ::std::pair< sal_uInt32, sal_uInt32 > > PairVector;
PairVector aPairVector;
if ( ! aPageVector.empty())
{
sal_uInt32 nFirstIndex = 0, nLastIndex = aPageVector.size() - 1;
if( aPageVector.size() & 1 )
- aPairVector.push_back( ::std::make_pair( (sal_uInt16) 65535, aPageVector[ nFirstIndex++ ] ) );
+ aPairVector.push_back( ::std::make_pair( (sal_uInt32) 0xffffffff, aPageVector[ nFirstIndex++ ] ) );
else
aPairVector.push_back( ::std::make_pair( aPageVector[ nLastIndex-- ], aPageVector[ nFirstIndex++ ] ) );
@@ -2177,7 +2179,7 @@ private:
if ((!bIsIndexOdd && mpOptions->IsPrintFrontPage())
|| (bIsIndexOdd && mpOptions->IsPrintBackPage()))
{
- const ::std::pair<sal_uInt16, sal_uInt16> aPair (aPairVector[nIndex]);
+ const ::std::pair<sal_uInt32, sal_uInt32> aPair (aPairVector[nIndex]);
Point aSecondOffset (aOffset);
if (rInfo.meOrientation == ORIENTATION_LANDSCAPE)
aSecondOffset.X() += aAdjustedPrintSize.Width() / 2;
@@ -2296,9 +2298,13 @@ private:
// keep the page content at its position if it fits, otherwise
// move it to the printable area
const long nPageWidth (
- rInfo.maPageSize.Width() - rPage.GetLeftPageBorder() - rPage.GetRightPageBorder());
+ rInfo.maPageSize.Width()
+ - basegfx::fround(rPage.GetLeftPageBorder())
+ - basegfx::fround(rPage.GetRightPageBorder()));
const long nPageHeight (
- rInfo.maPageSize.Height() - rPage.GetTopPageBorder() - rPage.GetBottomPageBorder());
+ rInfo.maPageSize.Height()
+ - basegfx::fround(rPage.GetTopPageBorder())
+ - basegfx::fround(rPage.GetBottomPageBorder()));
#if 0
Point aOrigin (
nPageWidth < rInfo.maPrintSize.Width() ? -aPageOffset.X() : 0,
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/view/ViewClipboard.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/view/ViewClipboard.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/view/ViewClipboard.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/view/ViewClipboard.cxx Thu Aug 8 15:01:55 2013
@@ -185,7 +185,7 @@ void ViewClipboard::AssignMasterPage (
-sal_uInt16 ViewClipboard::DetermineInsertPosition (
+sal_uInt32 ViewClipboard::DetermineInsertPosition (
const SdTransferable& )
{
SdDrawDocument* pDoc = mrView.GetDoc();
@@ -208,13 +208,13 @@ sal_uInt16 ViewClipboard::DetermineInser
-sal_uInt16 ViewClipboard::InsertSlides (
+sal_uInt32 ViewClipboard::InsertSlides (
const SdTransferable& rTransferable,
- sal_uInt16 nInsertPosition)
+ sal_uInt32 nInsertPosition)
{
SdDrawDocument* pDoc = mrView.GetDoc();
- sal_uInt16 nInsertPgCnt = 0;
+ sal_uInt32 nInsertPgCnt = 0;
bool bMergeMasterPages = !rTransferable.HasSourceDoc( pDoc );
// Prepare the insertion.
@@ -226,7 +226,7 @@ sal_uInt16 ViewClipboard::InsertSlides (
// pages are inserted.
pBookmarkList = &rTransferable.GetPageBookmarks();
pDataDocSh = rTransferable.GetPageDocShell();
- nInsertPgCnt = (sal_uInt16)pBookmarkList->Count();
+ nInsertPgCnt = pBookmarkList->Count();
}
else
{
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/view/ViewTabBar.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/view/ViewTabBar.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/view/ViewTabBar.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/view/ViewTabBar.cxx Thu Aug 8 15:01:55 2013
@@ -624,11 +624,11 @@ void ViewTabBar::UpdateActiveButton (voi
if (xView.is())
{
Reference<XResourceId> xViewId (xView->getResourceId());
- for (sal_uInt16 nIndex=0; nIndex<maTabBarButtons.size(); ++nIndex)
+ for (sal_uInt32 nIndex=0; nIndex<maTabBarButtons.size(); ++nIndex)
{
if (maTabBarButtons[nIndex].ResourceId->compareTo(xViewId) == 0)
{
- mpTabControl->SetCurPageId(nIndex+1);
+ mpTabControl->SetCurPageId(static_cast< sal_uInt16 >(nIndex+1));
mpTabControl->::TabControl::ActivatePage();
break;
}
@@ -647,18 +647,21 @@ void ViewTabBar::UpdateTabBarButtons (vo
for (iTab=maTabBarButtons.begin(),nIndex=1; iTab!=maTabBarButtons.end(); ++iTab,++nIndex)
{
// Create a new tab when there are not enough.
+ const sal_uInt16 nIndex16(static_cast< sal_uInt16 >(nIndex));
if (nPageCount < nIndex)
- mpTabControl->InsertPage(nIndex, iTab->ButtonLabel);
+ mpTabControl->InsertPage(nIndex16, iTab->ButtonLabel);
// Update the tab.
- mpTabControl->SetPageText(nIndex, iTab->ButtonLabel);
- mpTabControl->SetHelpText(nIndex, iTab->HelpText);
- mpTabControl->SetTabPage(nIndex, mpTabPage.get());
+ mpTabControl->SetPageText(nIndex16, iTab->ButtonLabel);
+ mpTabControl->SetHelpText(nIndex16, iTab->HelpText);
+ mpTabControl->SetTabPage(nIndex16, mpTabPage.get());
}
// Delete tabs that are no longer used.
for (; nIndex<=nPageCount; ++nIndex)
- mpTabControl->RemovePage(nIndex);
+ {
+ mpTabControl->RemovePage(static_cast< sal_uInt16 >(nIndex));
+ }
mpTabPage->Hide();
}
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/view/clview.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/view/clview.cxx?rev=1511822&r1=1511821&r2=1511822&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/view/clview.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/view/clview.cxx Thu Aug 8 15:01:55 2013
@@ -69,10 +69,11 @@ ClientView::~ClientView()
|*
\************************************************************************/
-void ClientView::InvalidateOneWin(::Window& rWin)
+void ClientView::InvalidateOneWin(::Window& rWin) const
{
- Region aRegion;
- CompleteRedraw(&rWin, aRegion);
+ Region aRegion;
+
+ CompleteRedraw(&rWin, aRegion);
}
/*************************************************************************
@@ -82,7 +83,7 @@ void ClientView::InvalidateOneWin(::Wind
|*
\************************************************************************/
-void ClientView::InvalidateOneWin(::Window& rWin, const basegfx::B2DRange& rRange)
+void ClientView::InvalidateOneWin(::Window& rWin, const ::basegfx::B2DRange& rRange) const
{
if(!rRange.isEmpty())
{
@@ -101,7 +102,7 @@ void ClientView::InvalidateOneWin(::Wind
|*
\************************************************************************/
-void ClientView::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector )
+void ClientView::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector ) const
{
DrawView::CompleteRedraw(pOutDev, rReg, pRedirector);
}