mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renaissance1: #i107215# Fixed problem with loading of icons.

Browse Source
This commit is contained in:
Andre Fischer<Andre.W.Fischer
2010-04-29 10:38:29 +02:00
parent ecb6bc55ff
commit 735c902c49
4 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sd/source/ui/slidesorter/shell/SlsDebugDialog.cxx
View File

@@ -265,9 +265,11 @@ public:
const char* pTitle,
const Theme::GradientColorType eType,
const Rectangle& rBoundingBox,
SlideSorter& rSlideSorter)
SlideSorter& rSlideSorter,
const Updater& rUpdater = Updater())
: mpTheme(rSlideSorter.GetTheme()),
mrSlideSorter(rSlideSorter),
maUpdater(rUpdater),
meType(eType),
mpContainer(new ::Window(pParent, WB_BORDER)),
mpColorControl(new ColorControl(mpContainer, pTitle,
@@ -411,6 +413,7 @@ public:
private:
::boost::shared_ptr<view::Theme> mpTheme;
SlideSorter& mrSlideSorter;
Updater maUpdater;
Theme::GradientColorType meType;
::Window* mpContainer;
ColorControl* mpColorControl;
@@ -500,6 +503,8 @@ IMPL_LINK(GradientControl, Update, void*, EMPTYARG)
mpFillOffset2Slider->GetThumbPos(),
mpBorderOffset1Slider->GetThumbPos(),
mpBorderOffset2Slider->GetThumbPos());
if (maUpdater)
maUpdater();
UpdateDisplay();
return 0;
@@ -840,7 +845,9 @@ SlideSorterDebugDialog::SlideSorterDebugDialog (SlideSorter& rSlideSorter)
"Button Background",
Theme::Gradient_ButtonBackground,
Rectangle(10,nY,285,nY+220),
rSlideSorter));
rSlideSorter,
::boost::bind(&view::ButtonBar::RequestLayout,
::boost::ref(rSlideSorter.GetView().GetButtonBar()))));
nY += maControls.back()->GetHeight() + nGap;
maControls.push_back(new SliderControl(
@@ -876,17 +883,6 @@ SlideSorterDebugDialog::SlideSorterDebugDialog (SlideSorter& rSlideSorter)
::boost::bind(&GradientControl::SetType, pControl, _1)));
nY += maControls.back()->GetHeight() + nGap;
maControls.push_back(new BoolControl(
mpTopLevelWindow,
"Alternative Button Paint Style",
Rectangle(10,nY,290,nY+20),
1,0,
::boost::bind(&view::Theme::GetIntegerValue, pTheme, view::Theme::Integer_ButtonPaintType),
::boost::bind(&view::Theme::SetIntegerValue, pTheme, view::Theme::Integer_ButtonPaintType, _1),
::boost::bind(&view::SlideSorterView::RequestRepaint,
::boost::ref(rSlideSorter.GetView()))));
nY += maControls.back()->GetHeight() + nGap;
maControls.push_back(new TextButton(
mpTopLevelWindow,
"Close",

2
sd/source/ui/slidesorter/view/SlsButtonBar.cxx
View File

@@ -255,7 +255,7 @@ sal_Int32 ButtonBar::GetButtonCount (const bool bIsExcluded) const
if (nIndex<0 || sal_uInt32(nIndex)>=rButtons.size())
{
OSL_ASSERT(nIndex<0 || nIndex>=rButtons.size());
OSL_ASSERT(nIndex<0 || sal_uInt32(nIndex)>=rButtons.size());
return ::boost::shared_ptr<Button>();
}
else

8
sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
View File

@@ -170,9 +170,9 @@ void LayeredDevice::Invalidate (
const Rectangle& rInvalidationArea,
const sal_Int32 nLayer)
{
if (nLayer<0 || sal_uInt32(nLayer)>=mpLayers->size())
if (nLayer<0 || size_t(nLayer)>=mpLayers->size())
{
OSL_ASSERT(nLayer>=0 && nLayer<mpLayers->size());
OSL_ASSERT(nLayer>=0 && size_t(nLayer)<mpLayers->size());
return;
}
@@ -250,9 +250,9 @@ void LayeredDevice::RemovePainter (
OSL_ASSERT(rpPainter);
return;
}
if (nLayer<0 || sal_uInt32(nLayer)>=mpLayers->size())
if (nLayer<0 || size_t(nLayer)>=mpLayers->size())
{
OSL_ASSERT(nLayer>=0 && nLayer<mpLayers->size());
OSL_ASSERT(nLayer>=0 && size_t(nLayer)<mpLayers->size());
return;
}

10
sd/source/ui/slidesorter/view/SlsTheme.cxx
View File

@@ -189,7 +189,7 @@ void Theme::Update (const ::boost::shared_ptr<controller::Properties>& rpPropert
const bool bSavedHighContrastMode (mbIsHighContrastMode);
mbIsHighContrastMode = rpProperties->IsHighContrastModeActive();
if (bSavedHighContrastMode != mbIsHighContrastMode)
if (bSavedHighContrastMode != mbIsHighContrastMode || maIcons.empty())
{
LocalResource aResource (RID_SLIDESORTER_ICONS);
@@ -436,7 +436,7 @@ BitmapEx Theme::GetIcon (const IconType eType)
return maIcons[eType];
else
{
OSL_ASSERT(eType>=0 && eType<maIcons.size());
OSL_ASSERT(eType>=0 && size_t(eType)<maIcons.size());
return BitmapEx();
}
}
@@ -509,7 +509,7 @@ void Theme::SetIntegerValue (const IntegerValueType eType, const sal_Int32 nValu
return maStrings[eType];
else
{
OSL_ASSERT(eType>=0 && eType<maStrings.size());
OSL_ASSERT(eType>=0 && size_t(eType)<maStrings.size());
return ::rtl::OUString();
}
}
@@ -523,7 +523,7 @@ Theme::GradientDescriptor& Theme::GetGradient (const GradientColorType eType)
return maGradients[eType];
else
{
OSL_ASSERT(eType>=0 && eType<maGradients.size());
OSL_ASSERT(eType>=0 && size_t(eType)<maGradients.size());
return maGradients[0];
}
}
@@ -537,7 +537,7 @@ void Theme::InitializeIcon (const IconType eType, USHORT nResourceId)
maIcons[eType] = Image(SdResId(nResourceId)).GetBitmapEx();
else
{
OSL_ASSERT(eType>=0 && eType<maIcons.size());
OSL_ASSERT(eType>=0 && size_t(eType)<maIcons.size());
}
}