strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

renaissance1: #107215# Resolved minor compilation problems.

Browse source
This commit is contained in:
Andre Fischer<Andre.W.Fischer 2010-02-12 15:51:03 +01:00
parent a3d0b08067
commit 1c239d78bc
6 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx vendored
View file

@ -76,7 +76,7 @@ BitmapFactory::~BitmapFactory (void)
const bool bDoSuperSampling)
{
Size aSize (rPixelSize);
bool bDo (true);
bool bDo (bDoSuperSampling);
if (bDo)
{
aSize.Width() *= gnSuperSampleFactor;

9
sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
View file

@ -353,7 +353,6 @@ BOOL SelectionFunction::MouseMove (const MouseEvent& rEvent)
(rEvent.GetButtons() & MOUSE_LEFT)!=0);
}
view::ViewOverlay& rOverlay (mrSlideSorter.GetView().GetOverlay());
Rectangle aRectangle (Point(0,0),mpWindow->GetOutputSizePixel());
if ( ! aRectangle.IsInside(aMousePosition)
&& mpSubstitutionHandler)
@ -952,7 +951,6 @@ sal_uInt32 SelectionFunction::EncodeState (
}
// Detect whether we are dragging pages or dragging a selection rectangle.
view::ViewOverlay& rOverlay (mrSlideSorter.GetView().GetOverlay());
if (mpSubstitutionHandler)
nEventCode |= SUBSTITUTION_VISIBLE;
if (mpMouseMultiSelector)
@ -1569,6 +1567,7 @@ SelectionFunction::MouseMultiSelector::MouseMultiSelector (
meSelectionMode(SM_Normal),
maInitialSelection()
{
(void)rMouseModelPosition;
// Remember the current selection.
model::PageEnumeration aPages (
model::PageEnumerationProvider::CreateAllPagesEnumeration(
@ -1835,8 +1834,6 @@ void RangeSelector::UpdateSelection (void)
{
view::SlideSorterView::DrawLock aLock (mrSlideSorter);
PageSelector& rSelector (mrSlideSorter.GetController().GetPageSelector());
const sal_Int32 nIndexUnderMouse (
mrSlideSorter.GetView().GetLayouter().GetIndexAtPoint (
maSecondCorner,
@ -1855,10 +1852,6 @@ void RangeSelector::UpdateSelection (void)
{
model::SharedPageDescriptor pDescriptor (rModel.GetPageDescriptor(nIndex));
// Determine whether the page was selected before the rectangle
// selection was started.
const bool bWasSelected (pDescriptor->HasState(model::PageDescriptor::ST_WasSelected));
UpdateSelectionState(pDescriptor, aRange.IsInside(nIndex));
}

3
sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
View file

@ -49,8 +49,6 @@ namespace sd { namespace slidesorter { namespace view {
class Layouter;
class PageObjectLayouter;
namespace { class FramePainter; }
class PageObjectPainter
{
@ -74,6 +72,7 @@ private:
BitmapEx maStartPresentationIcon;
BitmapEx maShowSlideIcon;
BitmapEx maNewSlideIcon;
class FramePainter;
::boost::scoped_ptr<FramePainter> mpShadowPainter;
Bitmap maNormalBackground;
Bitmap maSelectionBackground;

2
sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
View file

@ -215,7 +215,7 @@ void LayeredDevice::RegisterPainter (
const sal_Int32 nOldLayerCount (mpLayers->size());
mpLayers->resize(nLayer+1);
for (sal_Int32 nIndex=nOldLayerCount; nIndex<mpLayers->size(); ++nIndex)
for (size_t nIndex=nOldLayerCount; nIndex<mpLayers->size(); ++nIndex)
(*mpLayers)[nIndex].reset(new Layer());
}

1
sd/source/ui/slidesorter/view/SlsLayouter.cxx
View file

@ -510,6 +510,7 @@ Range Layouter::GetSelectionRange (
const Point& rOther,
const Range& rCurrentSelectionRange) const
{
(void)rCurrentSelectionRange;
sal_Int32 nIndexA (GetInsertionIndex(rAnchor, true));
sal_Int32 nIndexB (GetInsertionIndex(rOther, true));

17
sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
View file

@ -194,7 +194,12 @@ private:
Point maOffset;
};
class FramePainter
} // end of anonymous namespace
class PageObjectPainter::FramePainter
{
public:
FramePainter (const BitmapEx& rBitmap);
@ -214,10 +219,6 @@ private:
};
} // end of anonymous namespace
//===== PageObjectPainter =====================================================
PageObjectPainter::PageObjectPainter (
@ -599,7 +600,7 @@ Bitmap PageObjectPainter::CreateBackgroundBitmap(
//===== FramePainter ==========================================================
FramePainter::FramePainter (const BitmapEx& rShadowBitmap)
PageObjectPainter::FramePainter::FramePainter (const BitmapEx& rShadowBitmap)
: maShadowTopLeft(rShadowBitmap,-1,-1),
maShadowTop(rShadowBitmap,0,-1),
maShadowTopRight(rShadowBitmap,+1,-1),
@ -627,14 +628,14 @@ FramePainter::FramePainter (const BitmapEx& rShadowBitmap)
FramePainter::~FramePainter (void)
PageObjectPainter::FramePainter::~FramePainter (void)
{
}
void FramePainter::PaintFrame (
void PageObjectPainter::FramePainter::PaintFrame (
OutputDevice& rDevice,
const Rectangle aBox) const
{