[Libreoffice-commits] .: 2 commits - sd/source
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Nov 16 09:11:20 PST 2010
sd/source/ui/animations/CustomAnimation.hrc | 28 --
sd/source/ui/animations/CustomAnimation.src | 52 ----
sd/source/ui/animations/CustomAnimationList.cxx | 12 -
sd/source/ui/animations/CustomAnimationList.hxx | 4
sd/source/ui/annotations/annotationmanager.cxx | 3
sd/source/ui/app/res_bmp.src | 113 ----------
sd/source/ui/app/tbxww.cxx | 3
sd/source/ui/controller/slidelayoutcontroller.cxx | 66 ++---
sd/source/ui/dlg/navigatr.cxx | 4
sd/source/ui/dlg/navigatr.src | 6
sd/source/ui/inc/navigatr.hrc | 1
sd/source/ui/inc/navigatr.hxx | 1
sd/source/ui/inc/res_bmp.hrc | 25 --
sd/source/ui/slideshow/slideshowimpl.cxx | 8
sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx | 4
sd/source/ui/toolpanel/LayoutMenu.cxx | 58 ++---
sd/source/ui/view/outlview.cxx | 2
17 files changed, 85 insertions(+), 305 deletions(-)
New commits:
commit 058199136d235091ab9585018587ba2b7a76430d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Nov 16 14:33:03 2010 +0000
get this building again
diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx
index 4952592..a079a98 100644
--- a/sd/source/ui/toolpanel/LayoutMenu.cxx
+++ b/sd/source/ui/toolpanel/LayoutMenu.cxx
@@ -156,15 +156,15 @@ static snewfoil_value_info standard[] =
{
{BMP_LAYOUT_EMPTY, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB, AUTOLAYOUT_NONE},
{BMP_LAYOUT_HEAD03, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB, AUTOLAYOUT_TITLE},
- {BMP_LAYOUT_HEAD02, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_ENUM},
+ {BMP_LAYOUT_HEAD02, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_ENUM},
{BMP_LAYOUT_HEAD02A, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2TEXT},
- {BMP_LAYOUT_HEAD01, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TITLE},
+ {BMP_LAYOUT_HEAD01, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TITLE},
{BMP_LAYOUT_TEXTONLY, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TEXT},
{BMP_LAYOUT_HEAD03B, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2OBJTEXT},
{BMP_LAYOUT_HEAD03C, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TEXT2OBJ},
- {BMP_LAYOUT_HEAD03A, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT},
+ {BMP_LAYOUT_HEAD03A, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT},
{BMP_LAYOUT_HEAD02B, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT},
- {BMP_LAYOUT_HEAD04, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB, AUTOLAYOUT_4OBJ},
+ {BMP_LAYOUT_HEAD04, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB, AUTOLAYOUT_4OBJ},
{BMP_LAYOUT_HEAD06, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB, AUTOLAYOUT_6CLIPART},
// vertical
commit 089f63d72a16c5af690d549594c5beef45c6ca7f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Nov 16 14:32:34 2010 +0000
get this building again
diff --git a/sd/source/ui/animations/CustomAnimation.hrc b/sd/source/ui/animations/CustomAnimation.hrc
index 6016a80..cd6a4b5 100644
--- a/sd/source/ui/animations/CustomAnimation.hrc
+++ b/sd/source/ui/animations/CustomAnimation.hrc
@@ -56,25 +56,15 @@
#define RID_CUSTOMANIMATION_FONTSTYLE_POPUP RID_CUSTOMANIMATION_START+12
#define IMG_CUSTOMANIMATION_ON_CLICK RID_CUSTOMANIMATION_START+0
-#define IMG_CUSTOMANIMATION_ON_CLICK_H RID_CUSTOMANIMATION_START+1
-#define IMG_CUSTOMANIMATION_AFTER_PREVIOUS RID_CUSTOMANIMATION_START+2
-#define IMG_CUSTOMANIMATION_AFTER_PREVIOUS_H RID_CUSTOMANIMATION_START+3
-#define IMG_CUSTOMANIMATION_ENTRANCE_EFFECT RID_CUSTOMANIMATION_START+4
-#define IMG_CUSTOMANIMATION_ENTRANCE_EFFECT_H RID_CUSTOMANIMATION_START+5
-#define IMG_CUSTOMANIMATION_EMPHASIS_EFFECT RID_CUSTOMANIMATION_START+6
-#define IMG_CUSTOMANIMATION_EMPHASIS_EFFECT_H RID_CUSTOMANIMATION_START+7
-#define IMG_CUSTOMANIMATION_EXIT_EFFECT RID_CUSTOMANIMATION_START+8
-#define IMG_CUSTOMANIMATION_EXIT_EFFECT_H RID_CUSTOMANIMATION_START+9
-#define IMG_CUSTOMANIMATION_MOTION_PATH RID_CUSTOMANIMATION_START+10
-#define IMG_CUSTOMANIMATION_MOTION_PATH_H RID_CUSTOMANIMATION_START+11
-#define IMG_CUSTOMANIMATION_OLE RID_CUSTOMANIMATION_START+12
-#define IMG_CUSTOMANIMATION_OLE_H RID_CUSTOMANIMATION_START+13
-#define IMG_CUSTOMANIMATION_MEDIA_PLAY RID_CUSTOMANIMATION_START+14
-#define IMG_CUSTOMANIMATION_MEDIA_PLAY_H RID_CUSTOMANIMATION_START+15
-#define IMG_CUSTOMANIMATION_MEDIA_PAUSE RID_CUSTOMANIMATION_START+16
-#define IMG_CUSTOMANIMATION_MEDIA_PAUSE_H RID_CUSTOMANIMATION_START+17
-#define IMG_CUSTOMANIMATION_MEDIA_STOP RID_CUSTOMANIMATION_START+18
-#define IMG_CUSTOMANIMATION_MEDIA_STOP_H RID_CUSTOMANIMATION_START+19
+#define IMG_CUSTOMANIMATION_AFTER_PREVIOUS RID_CUSTOMANIMATION_START+1
+#define IMG_CUSTOMANIMATION_ENTRANCE_EFFECT RID_CUSTOMANIMATION_START+2
+#define IMG_CUSTOMANIMATION_EMPHASIS_EFFECT RID_CUSTOMANIMATION_START+3
+#define IMG_CUSTOMANIMATION_EXIT_EFFECT RID_CUSTOMANIMATION_START+4
+#define IMG_CUSTOMANIMATION_MOTION_PATH RID_CUSTOMANIMATION_START+5
+#define IMG_CUSTOMANIMATION_OLE RID_CUSTOMANIMATION_START+6
+#define IMG_CUSTOMANIMATION_MEDIA_PLAY RID_CUSTOMANIMATION_START+7
+#define IMG_CUSTOMANIMATION_MEDIA_PAUSE RID_CUSTOMANIMATION_START+8
+#define IMG_CUSTOMANIMATION_MEDIA_STOP RID_CUSTOMANIMATION_START+9
#define STR_CUSTOMANIMATION_DURATION_VERY_SLOW RID_CUSTOMANIMATION_START+0
#define STR_CUSTOMANIMATION_DURATION_SLOW RID_CUSTOMANIMATION_START+1
diff --git a/sd/source/ui/animations/CustomAnimation.src b/sd/source/ui/animations/CustomAnimation.src
index adc0c2b..dc4a468 100644
--- a/sd/source/ui/animations/CustomAnimation.src
+++ b/sd/source/ui/animations/CustomAnimation.src
@@ -397,99 +397,47 @@ Image IMG_CUSTOMANIMATION_ON_CLICK
ImageBitmap = Bitmap { File = "click_16.png" ; };
};
-Image IMG_CUSTOMANIMATION_ON_CLICK_H
-{
- ImageBitmap = Bitmap { File = "click_16_h.png" ; };
-};
-
Image IMG_CUSTOMANIMATION_AFTER_PREVIOUS
{
ImageBitmap = Bitmap { File = "time_16.png" ; };
};
-Image IMG_CUSTOMANIMATION_AFTER_PREVIOUS_H
-{
- ImageBitmap = Bitmap { File = "time_16_h.png" ; };
-};
-
Image IMG_CUSTOMANIMATION_ENTRANCE_EFFECT
{
ImageBitmap = Bitmap { File = "effect_16.png" ; };
};
-Image IMG_CUSTOMANIMATION_ENTRANCE_EFFECT_H
-{
- ImageBitmap = Bitmap { File = "effect_16_h.png" ; };
-};
-
Image IMG_CUSTOMANIMATION_EMPHASIS_EFFECT
{
ImageBitmap = Bitmap { File = "effectshape_16.png" ; };
};
-Image IMG_CUSTOMANIMATION_EMPHASIS_EFFECT_H
-{
- ImageBitmap = Bitmap { File = "effectshape_16_h.png" ; };
-};
-
Image IMG_CUSTOMANIMATION_EXIT_EFFECT
{
ImageBitmap = Bitmap { File = "effectfade_16.png" ; };
};
-Image IMG_CUSTOMANIMATION_EXIT_EFFECT_H
-{
- ImageBitmap = Bitmap { File = "effectfade_16_h.png" ; };
-};
-
Image IMG_CUSTOMANIMATION_MOTION_PATH
{
ImageBitmap = Bitmap { File = "effectpath_16.png" ; };
};
-Image IMG_CUSTOMANIMATION_MOTION_PATH_H
-{
- ImageBitmap = Bitmap { File = "effectpath_16_h.png" ; };
-};
-
Image IMG_CUSTOMANIMATION_OLE
{
ImageBitmap = Bitmap { File = "effectole_16.png"; } ;
};
-Image IMG_CUSTOMANIMATION_OLE_H
-{
- ImageBitmap = Bitmap { File = "effectole_16_h.png"; } ;
-};
-
Image IMG_CUSTOMANIMATION_MEDIA_PLAY
{
ImageBitmap = Bitmap { File = "playblue_16.png"; } ;
};
-Image IMG_CUSTOMANIMATION_MEDIA_PLAY_H
-{
- ImageBitmap = Bitmap { File = "playblue_16_h.png"; } ;
-};
-
Image IMG_CUSTOMANIMATION_MEDIA_PAUSE
{
ImageBitmap = Bitmap { File = "breakplayingblue_16.png"; } ;
};
-Image IMG_CUSTOMANIMATION_MEDIA_PAUSE_H
-{
- ImageBitmap = Bitmap { File = "breakplayingblue_16_h.png"; } ;
-};
-
Image IMG_CUSTOMANIMATION_MEDIA_STOP
{
ImageBitmap = Bitmap { File = "stopplayingblue_16.png"; } ;
};
-
-Image IMG_CUSTOMANIMATION_MEDIA_STOP_H
-{
- ImageBitmap = Bitmap { File = "stopplayingblue_16_h.png"; } ;
-};
-
-
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index caff36f..a9556a6 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -257,7 +257,6 @@ void CustomAnimationListEntryItem::InitViewData( SvLBox* pView, SvLBoxEntry* pEn
void CustomAnimationListEntryItem::Paint( const Point& rPos, SvLBox& rDev, USHORT, SvLBoxEntry* pEntry )
{
- const bool bHighContrast = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
SvViewDataItem* pViewData = mpParent->GetViewDataItem( pEntry, this );
@@ -267,11 +266,11 @@ void CustomAnimationListEntryItem::Paint( const Point& rPos, SvLBox& rDev, USHOR
sal_Int16 nNodeType = mpEffect->getNodeType();
if( nNodeType == EffectNodeType::ON_CLICK )
{
- rDev.DrawImage( aPos, mpParent->getImage( IMG_CUSTOMANIMATION_ON_CLICK, bHighContrast ) );
+ rDev.DrawImage( aPos, mpParent->getImage( IMG_CUSTOMANIMATION_ON_CLICK ) );
}
else if( nNodeType == EffectNodeType::AFTER_PREVIOUS )
{
- rDev.DrawImage( aPos, mpParent->getImage( IMG_CUSTOMANIMATION_AFTER_PREVIOUS, bHighContrast ) );
+ rDev.DrawImage( aPos, mpParent->getImage( IMG_CUSTOMANIMATION_AFTER_PREVIOUS ) );
}
aPos.X() += 19;
@@ -298,7 +297,7 @@ void CustomAnimationListEntryItem::Paint( const Point& rPos, SvLBox& rDev, USHOR
if( nImage != 0xffff )
{
- const Image& rImage = mpParent->getImage( nImage, bHighContrast );
+ const Image& rImage = mpParent->getImage( nImage );
Point aImagePos( aPos );
aImagePos.Y() += ( aSize.Height() - rImage.GetSizePixel().Height() ) >> 1;
rDev.DrawImage( aImagePos, rImage );
@@ -484,13 +483,10 @@ CustomAnimationList::CustomAnimationList( ::Window* pParent, const ResId& rResId
// --------------------------------------------------------------------
-const Image& CustomAnimationList::getImage( USHORT nId, bool bHighContrast )
+const Image& CustomAnimationList::getImage( USHORT nId )
{
DBG_ASSERT( (nId >= IMG_CUSTOMANIMATION_ON_CLICK) && (nId <= IMG_CUSTOMANIMATION_MEDIA_STOP), "sd::CustomAnimationList::getImage(), illegal index!" );
- if( bHighContrast )
- nId += 1;
-
Image& rImage = maImages[nId - IMG_CUSTOMANIMATION_ON_CLICK];
// load on demand
diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx
index 35d2199..3051543 100644
--- a/sd/source/ui/animations/CustomAnimationList.hxx
+++ b/sd/source/ui/animations/CustomAnimationList.hxx
@@ -96,7 +96,7 @@ public:
virtual void notify_change();
- const Image& getImage( USHORT nId, bool bHighContrast );
+ const Image& getImage( USHORT nId );
bool isExpanded( const CustomAnimationEffectPtr& pEffect ) const;
@@ -115,7 +115,7 @@ private:
Image maImgEmpty;
- Image maImages[ IMG_CUSTOMANIMATION_MEDIA_STOP_H - IMG_CUSTOMANIMATION_ON_CLICK + 1];
+ Image maImages[ IMG_CUSTOMANIMATION_MEDIA_STOP - IMG_CUSTOMANIMATION_ON_CLICK + 1];
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxLastTargetShape;
sal_Int32 mnLastGroupId;
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index f67755e..2609cde 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -1053,7 +1053,6 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation
Reference< ::com::sun::star::frame::XFrame > xFrame( mrBase.GetMainViewShell()->GetViewFrame()->GetFrame().GetFrameInterface() );
if( xFrame.is() )
{
- const bool bHighContrast = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
for( USHORT nPos = 0; nPos < pMenu->GetItemCount(); nPos++ )
{
nId = pMenu->GetItemId( nPos );
@@ -1062,7 +1061,7 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation
OUString sSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
sSlotURL += OUString::valueOf( sal_Int32( nId ));
- Image aImage( GetImage( xFrame, sSlotURL, false, bHighContrast ) );
+ Image aImage( GetImage( xFrame, sSlotURL, false ) );
if( !!aImage )
pMenu->SetItemImage( nId, aImage );
}
diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src
index e78d099..3f95026 100755
--- a/sd/source/ui/app/res_bmp.src
+++ b/sd/source/ui/app/res_bmp.src
@@ -35,165 +35,82 @@ Bitmap BMP_LAYOUT_EMPTY
{
File = "layout_empty.png";
};
-Bitmap BMP_LAYOUT_EMPTY_H
-{
- File = "layout_empty_h.png";
-};
Bitmap BMP_LAYOUT_HEAD01
{
File = "layout_head01.png";
};
-Bitmap BMP_LAYOUT_HEAD01_H
-{
- File = "layout_head01_h.png";
-};
Bitmap BMP_LAYOUT_HEAD02
{
File = "layout_head02.png";
};
-Bitmap BMP_LAYOUT_HEAD02_H
-{
- File = "layout_head02_h.png";
-};
Bitmap BMP_LAYOUT_HEAD02A
{
File = "layout_head02a.png";
};
-Bitmap BMP_LAYOUT_HEAD02A_H
-{
- File = "layout_head02a_h.png";
-};
Bitmap BMP_LAYOUT_HEAD02B
{
File = "layout_head02b.png";
};
-Bitmap BMP_LAYOUT_HEAD02B_H
-{
- File = "layout_head02b_h.png";
-};
Bitmap BMP_LAYOUT_HEAD03
{
File = "layout_head03.png";
};
-Bitmap BMP_LAYOUT_HEAD03_H
-{
- File = "layout_head03_h.png";
-};
Bitmap BMP_LAYOUT_HEAD03A
{
File = "layout_head03a.png";
};
-Bitmap BMP_LAYOUT_HEAD03A_H
-{
- File = "layout_head03a_h.png";
-};
Bitmap BMP_LAYOUT_HEAD03B
{
File = "layout_head03b.png";
};
-Bitmap BMP_LAYOUT_HEAD03B_H
-{
- File = "layout_head03b_h.png";
-};
Bitmap BMP_LAYOUT_HEAD03C
{
File = "layout_head03c.png";
};
-Bitmap BMP_LAYOUT_HEAD03C_H
-{
- File = "layout_head03c_h.png";
-};
Bitmap BMP_LAYOUT_HEAD04
{
File = "layout_head04.png";
};
-Bitmap BMP_LAYOUT_HEAD04_H
-{
- File = "layout_head04_h.png";
-};
Bitmap BMP_LAYOUT_HEAD06
{
File = "layout_head06.png";
};
-Bitmap BMP_LAYOUT_HEAD06_H
-{
- File = "layout_head06_h.png";
-};
Bitmap BMP_LAYOUT_TEXTONLY
{
File = "layout_textonly.png";
};
-Bitmap BMP_LAYOUT_TEXTONLY_H
-{
- File = "layout_textonly_h.png";
-};
Bitmap BMP_LAYOUT_VERTICAL01
{
File = "layout_vertical01.png";
};
-Bitmap BMP_LAYOUT_VERTICAL01_H
-{
- File = "layout_vertical01_h.png";
-};
Bitmap BMP_LAYOUT_VERTICAL02
{
File = "layout_vertical02.png";
};
-Bitmap BMP_LAYOUT_VERTICAL02_H
-{
- File = "layout_vertical02_h.png";
-};
-
Bitmap BMP_FOILH_01
{
File = "foilh01.png";
};
-Bitmap BMP_FOILH_01_H
-{
- File = "foilh01_h.png";
-};
Bitmap BMP_FOILH_02
{
File = "foilh02.png";
};
-Bitmap BMP_FOILH_02_H
-{
- File = "foilh02_h.png";
-};
Bitmap BMP_FOILH_03
{
File = "foilh03.png";
};
-Bitmap BMP_FOILH_03_H
-{
- File = "foilh03_h.png";
-};
Bitmap BMP_FOILH_04
{
File = "foilh04.png";
};
-Bitmap BMP_FOILH_04_H
-{
- File = "foilh04_h.png";
-};
Bitmap BMP_FOILH_06
{
File = "foilh06.png";
};
-Bitmap BMP_FOILH_06_H
-{
- File = "foilh06_h.png";
-};
Bitmap BMP_FOILH_09
{
File = "foilh09.png";
};
-Bitmap BMP_FOILH_09_H
-{
- File = "foilh09_h.png";
-};
-
-
Bitmap BMP_PLACEHOLDER_CHART_SMALL
{
File = "placeholder_chart_small.png";
@@ -265,21 +182,11 @@ Bitmap BMP_FOILN_01
File = "foiln01.bmp" ;
};
-Bitmap BMP_FOILN_01_H
-{
- File = "foiln01_h.bmp" ;
-};
-
Bitmap BMP_PAGE
{
File = "page.bmp" ;
};
-Bitmap BMP_PAGE_H
-{
- File = "page_h.bmp" ;
-};
-
Bitmap BMP_PAGE_EXCLUDED
{
File = "pageexcl.bmp" ;
@@ -374,9 +281,9 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
#define STYLE_IMAGE_LISTEF \
IdList = \
{ \
- 1; 2; \
+ 1; \
}; \
- IdCount = 2;
+ IdCount = 1;
ImageList 1 // == BMP_COLOR_NORMAL + 1
{
@@ -384,12 +291,6 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
MaskColor = IMAGE_MASK_STDCOLOR;
STYLE_IMAGE_LISTEF
};
- ImageList 2 // == BMP_COLOR_HIGHCONTRAST + 1
- {
- Prefix = "sfh";
- MaskColor = IMAGE_MASK_STDCOLOR_HC;
- STYLE_IMAGE_LISTEF
- };
#undef STYLE_IMAGE_LISTEF
};
@@ -430,17 +331,7 @@ Bitmap BMP_FADE_EFFECT_INDICATOR
File = "fade_effect_indicator.bmp";
};
-Bitmap BMP_FADE_EFFECT_INDICATOR_H
-{
- File = "fade_effect_indicator_hc.bmp";
-};
-
Bitmap BMP_COMMENTS_INDICATOR
{
File = "comments_indicator.bmp";
};
-
-Bitmap BMP_COMMENTS_INDICATOR_H
-{
- File = "comments_indicator_hc.bmp";
-};
diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx
index 6effd23..c86c6fb 100644
--- a/sd/source/ui/app/tbxww.cxx
+++ b/sd/source/ui/app/tbxww.cxx
@@ -306,8 +306,7 @@ void SdTbxControl::StateChanged( USHORT nSId,
aSlotURL += rtl::OUString::valueOf( sal_Int32( nImage ));
Image aImage = GetImage( m_xFrame,
aSlotURL,
- hasBigImages(),
- GetToolBox().GetSettings().GetStyleSettings().GetHighContrastMode() );
+ hasBigImages() );
// !-Operator prueft, ob Image nicht vorhanden ist
if( !!aImage )
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 63da147..606fd81 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -103,7 +103,6 @@ private:
struct snewfoil_value_info
{
USHORT mnBmpResId;
- USHORT mnHCBmpResId;
USHORT mnStrResId;
WritingMode meWritingMode;
AutoLayout maAutoLayout;
@@ -111,64 +110,64 @@ struct snewfoil_value_info
static snewfoil_value_info notes[] =
{
- {BMP_FOILN_01, BMP_FOILN_01_H, STR_AUTOLAYOUT_NOTES, WritingMode_LR_TB,
+ {BMP_FOILN_01, STR_AUTOLAYOUT_NOTES, WritingMode_LR_TB,
AUTOLAYOUT_NOTES},
- {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE},
+ {0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE},
};
static snewfoil_value_info handout[] =
{
- {BMP_FOILH_01, BMP_FOILH_01_H, STR_AUTOLAYOUT_HANDOUT1, WritingMode_LR_TB,
+ {BMP_FOILH_01, STR_AUTOLAYOUT_HANDOUT1, WritingMode_LR_TB,
AUTOLAYOUT_HANDOUT1},
- {BMP_FOILH_02, BMP_FOILH_02_H, STR_AUTOLAYOUT_HANDOUT2, WritingMode_LR_TB,
+ {BMP_FOILH_02, STR_AUTOLAYOUT_HANDOUT2, WritingMode_LR_TB,
AUTOLAYOUT_HANDOUT2},
- {BMP_FOILH_03, BMP_FOILH_03_H, STR_AUTOLAYOUT_HANDOUT3, WritingMode_LR_TB,
+ {BMP_FOILH_03, STR_AUTOLAYOUT_HANDOUT3, WritingMode_LR_TB,
AUTOLAYOUT_HANDOUT3},
- {BMP_FOILH_04, BMP_FOILH_04_H, STR_AUTOLAYOUT_HANDOUT4, WritingMode_LR_TB,
+ {BMP_FOILH_04, STR_AUTOLAYOUT_HANDOUT4, WritingMode_LR_TB,
AUTOLAYOUT_HANDOUT4},
- {BMP_FOILH_06, BMP_FOILH_06_H, STR_AUTOLAYOUT_HANDOUT6, WritingMode_LR_TB,
+ {BMP_FOILH_06, STR_AUTOLAYOUT_HANDOUT6, WritingMode_LR_TB,
AUTOLAYOUT_HANDOUT6},
- {BMP_FOILH_09, BMP_FOILH_09_H, STR_AUTOLAYOUT_HANDOUT9, WritingMode_LR_TB,
+ {BMP_FOILH_09, STR_AUTOLAYOUT_HANDOUT9, WritingMode_LR_TB,
AUTOLAYOUT_HANDOUT9},
- {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE},
+ {0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE},
};
static snewfoil_value_info standard[] =
{
- {BMP_LAYOUT_EMPTY, BMP_LAYOUT_EMPTY_H, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB, AUTOLAYOUT_NONE},
- {BMP_LAYOUT_HEAD03, BMP_LAYOUT_HEAD03_H, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB, AUTOLAYOUT_TITLE},
- {BMP_LAYOUT_HEAD02, BMP_LAYOUT_HEAD02_H, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_ENUM},
- {BMP_LAYOUT_HEAD02A, BMP_LAYOUT_HEAD02A_H, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2TEXT},
- {BMP_LAYOUT_HEAD01, BMP_LAYOUT_HEAD01_H, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TITLE},
- {BMP_LAYOUT_TEXTONLY, BMP_LAYOUT_TEXTONLY_H, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TEXT},
- {BMP_LAYOUT_HEAD03B, BMP_LAYOUT_HEAD03B_H, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2OBJTEXT},
- {BMP_LAYOUT_HEAD03C, BMP_LAYOUT_HEAD03C_H, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TEXT2OBJ},
- {BMP_LAYOUT_HEAD03A, BMP_LAYOUT_HEAD03A_H, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT},
- {BMP_LAYOUT_HEAD02B, BMP_LAYOUT_HEAD02B_H, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT},
- {BMP_LAYOUT_HEAD04, BMP_LAYOUT_HEAD04_H, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB, AUTOLAYOUT_4OBJ},
- {BMP_LAYOUT_HEAD06, BMP_LAYOUT_HEAD06_H, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB, AUTOLAYOUT_6CLIPART},
- {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}
+ {BMP_LAYOUT_EMPTY, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB, AUTOLAYOUT_NONE},
+ {BMP_LAYOUT_HEAD03, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB, AUTOLAYOUT_TITLE},
+ {BMP_LAYOUT_HEAD02, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_ENUM},
+ {BMP_LAYOUT_HEAD02A, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2TEXT},
+ {BMP_LAYOUT_HEAD01, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TITLE},
+ {BMP_LAYOUT_TEXTONLY, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TEXT},
+ {BMP_LAYOUT_HEAD03B, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2OBJTEXT},
+ {BMP_LAYOUT_HEAD03C, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TEXT2OBJ},
+ {BMP_LAYOUT_HEAD03A, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT},
+ {BMP_LAYOUT_HEAD02B, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT},
+ {BMP_LAYOUT_HEAD04, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB, AUTOLAYOUT_4OBJ},
+ {BMP_LAYOUT_HEAD06, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB, AUTOLAYOUT_6CLIPART},
+ {0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}
};
static snewfoil_value_info v_standard[] =
{
// vertical
- {BMP_LAYOUT_VERTICAL02, BMP_LAYOUT_VERTICAL02_H, STR_AL_VERT_TITLE_TEXT_CHART, WritingMode_TB_RL,AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART},
- {BMP_LAYOUT_VERTICAL01, BMP_LAYOUT_VERTICAL01_H, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE},
- {BMP_LAYOUT_HEAD02, BMP_LAYOUT_HEAD02_H, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE},
- {BMP_LAYOUT_HEAD02A, BMP_LAYOUT_HEAD02A_H, STR_AL_TITLE_VERT_OUTLINE_CLIPART, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART},
- {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}
+ {BMP_LAYOUT_VERTICAL02, STR_AL_VERT_TITLE_TEXT_CHART, WritingMode_TB_RL,AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART},
+ {BMP_LAYOUT_VERTICAL01, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE},
+ {BMP_LAYOUT_HEAD02, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE},
+ {BMP_LAYOUT_HEAD02A, STR_AL_TITLE_VERT_OUTLINE_CLIPART, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART},
+ {0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}
};
// -----------------------------------------------------------------------
-static void fillLayoutValueSet( ValueSet* pValue, snewfoil_value_info* pInfo, const bool bHighContrast )
+static void fillLayoutValueSet( ValueSet* pValue, snewfoil_value_info* pInfo )
{
Size aLayoutItemSize;
for( ; pInfo->mnBmpResId; pInfo++ )
{
String aText( SdResId( pInfo->mnStrResId ) );
- BitmapEx aBmp( SdResId( (bHighContrast ? pInfo->mnHCBmpResId : pInfo->mnBmpResId) ) );
+ BitmapEx aBmp( SdResId( pInfo->mnBmpResId ) );
pValue->InsertItem( static_cast<USHORT>(pInfo->maAutoLayout)+1, aBmp, aText );
@@ -209,7 +208,6 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const
String aTitle1( SdResId( STR_GLUE_ESCDIR_HORZ ) );
String aTitle2( SdResId( STR_GLUE_ESCDIR_VERT ) );
- const bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
SvtLanguageOptions aLanguageOptions;
const bool bVerticalEnabled = aLanguageOptions.IsVerticalTextEnabled();
@@ -230,7 +228,7 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const
mpLayoutSet1->SetColCount( nColCount );
- fillLayoutValueSet( mpLayoutSet1, pInfo, bHighContrast );
+ fillLayoutValueSet( mpLayoutSet1, pInfo );
Size aSize( mpLayoutSet1->GetOutputSizePixel() );
aSize.Width() += (mpLayoutSet1->GetColCount() + 1) * LAYOUT_BORDER_PIX;
@@ -251,7 +249,7 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const
mpLayoutSet2->EnableFullItemMode( FALSE );
mpLayoutSet2->SetColor( GetControlBackground() );
- fillLayoutValueSet( mpLayoutSet2, &v_standard[0], bHighContrast );
+ fillLayoutValueSet( mpLayoutSet2, &v_standard[0] );
aSize = mpLayoutSet2->GetOutputSizePixel();
aSize.Width() += (mpLayoutSet2->GetColCount() + 1) * LAYOUT_BORDER_PIX;
@@ -274,7 +272,7 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const
sSlotStr = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DuplicatePage" ) );
else
sSlotStr = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Undo" ) );
- aSlotImage = ::GetImage( mxFrame, sSlotStr, FALSE, bHighContrast );
+ aSlotImage = ::GetImage( mxFrame, sSlotStr, FALSE );
String sSlotTitle;
if( bInsertPage )
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index c3acb30..37025cf 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -87,7 +87,6 @@ SdNavigatorWin::SdNavigatorWin(
, meDragType ( NAVIGATOR_DRAGTYPE_EMBEDDED )
, mpBindings ( pInBindings )
, maImageList ( SdResId( IL_NAVIGATR ) )
-, maImageListH ( SdResId( ILH_NAVIGATR ) )
{
maTlbObjects.SetViewFrame( mpBindings->GetDispatcher()->GetFrame() );
@@ -860,9 +859,8 @@ void SdNavigatorWin::SetDragImage()
void SdNavigatorWin::ApplyImageList()
{
- const bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
- maToolbox.SetImageList( bHighContrast ? maImageListH : maImageList );
+ maToolbox.SetImageList( maImageList );
maToolbox.SetItemImage( TBI_SHAPE_FILTER, BitmapEx( SdResId( BMP_GRAPHIC ) ) );
SetDragImage();
diff --git a/sd/source/ui/dlg/navigatr.src b/sd/source/ui/dlg/navigatr.src
index 5592d08..9d465e5 100644
--- a/sd/source/ui/dlg/navigatr.src
+++ b/sd/source/ui/dlg/navigatr.src
@@ -152,10 +152,4 @@ Window FLT_NAVIGATOR
MaskColor = IMAGE_STDBTN_COLOR ;
NAVIGATR_IDLIST
};
- ImageList ILH_NAVIGATR
- {
- Prefix = "nvh";
- MaskColor = IMAGE_STDBTN_COLOR ;
- NAVIGATR_IDLIST
- };
};
diff --git a/sd/source/ui/inc/navigatr.hrc b/sd/source/ui/inc/navigatr.hrc
index 1791d40..617ab22 100644
--- a/sd/source/ui/inc/navigatr.hrc
+++ b/sd/source/ui/inc/navigatr.hrc
@@ -40,4 +40,3 @@
#define LB_DOCS 1
#define IL_NAVIGATR 333
-#define ILH_NAVIGATR 444
diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx
index 72818eb..56c4754 100644
--- a/sd/source/ui/inc/navigatr.hxx
+++ b/sd/source/ui/inc/navigatr.hxx
@@ -135,7 +135,6 @@ private:
SdPageNameControllerItem* mpPageNameCtrlItem;
ImageList maImageList;
- ImageList maImageListH;
/** This flag controls whether all shapes or only the named shapes are
shown.
diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc
index d87f748..33e2acf 100755
--- a/sd/source/ui/inc/res_bmp.hrc
+++ b/sd/source/ui/inc/res_bmp.hrc
@@ -138,61 +138,36 @@
#define BMP_EFFECT_UNCOVER_TO_B RID_APP_START+171
#define BMP_EFFECT_UNCOVER_TO_LL RID_APP_START+172
-#define BMP_PAGE_H RID_SD_START+213
-
#define BMP_FOIL_NONE_H RID_SD_START+225
#define BMP_WAIT_ICON_H RID_SD_START+229
#define BMP_FADE_EFFECT_INDICATOR RID_SD_START+331
-#define BMP_FADE_EFFECT_INDICATOR_H RID_SD_START+332
#define BMP_COMMENTS_INDICATOR RID_SD_START+338
-#define BMP_COMMENTS_INDICATOR_H RID_SD_START+339
#define BMP_LAYOUT_EMPTY RID_SD_START+340
-#define BMP_LAYOUT_EMPTY_H RID_SD_START+341
#define BMP_LAYOUT_HEAD01 RID_SD_START+342
-#define BMP_LAYOUT_HEAD01_H RID_SD_START+343
#define BMP_LAYOUT_HEAD02 RID_SD_START+344
-#define BMP_LAYOUT_HEAD02_H RID_SD_START+345
#define BMP_LAYOUT_HEAD02A RID_SD_START+346
-#define BMP_LAYOUT_HEAD02A_H RID_SD_START+347
#define BMP_LAYOUT_HEAD02B RID_SD_START+348
-#define BMP_LAYOUT_HEAD02B_H RID_SD_START+349
#define BMP_LAYOUT_HEAD03 RID_SD_START+350
-#define BMP_LAYOUT_HEAD03_H RID_SD_START+351
#define BMP_LAYOUT_HEAD03A RID_SD_START+352
-#define BMP_LAYOUT_HEAD03A_H RID_SD_START+353
#define BMP_LAYOUT_HEAD03B RID_SD_START+354
-#define BMP_LAYOUT_HEAD03B_H RID_SD_START+355
#define BMP_LAYOUT_HEAD03C RID_SD_START+356
-#define BMP_LAYOUT_HEAD03C_H RID_SD_START+357
#define BMP_LAYOUT_HEAD04 RID_SD_START+358
-#define BMP_LAYOUT_HEAD04_H RID_SD_START+359
#define BMP_LAYOUT_HEAD06 RID_SD_START+360
-#define BMP_LAYOUT_HEAD06_H RID_SD_START+361
#define BMP_LAYOUT_TEXTONLY RID_SD_START+362
-#define BMP_LAYOUT_TEXTONLY_H RID_SD_START+363
#define BMP_LAYOUT_VERTICAL01 RID_SD_START+364
-#define BMP_LAYOUT_VERTICAL01_H RID_SD_START+365
#define BMP_LAYOUT_VERTICAL02 RID_SD_START+366
-#define BMP_LAYOUT_VERTICAL02_H RID_SD_START+367
#define BMP_FOILH_01 RID_SD_START+388
-#define BMP_FOILH_01_H RID_SD_START+389
#define BMP_FOILH_02 RID_SD_START+390
-#define BMP_FOILH_02_H RID_SD_START+391
#define BMP_FOILH_03 RID_SD_START+392
-#define BMP_FOILH_03_H RID_SD_START+393
#define BMP_FOILH_04 RID_SD_START+394
-#define BMP_FOILH_04_H RID_SD_START+395
#define BMP_FOILH_06 RID_SD_START+396
-#define BMP_FOILH_06_H RID_SD_START+397
#define BMP_FOILH_09 RID_SD_START+398
-#define BMP_FOILH_09_H RID_SD_START+399
#define BMP_FOILN_01 RID_SD_START+400
-#define BMP_FOILN_01_H RID_SD_START+401
#define BMP_PLACEHOLDER_SMALL_START (RID_SD_START+402) // these ids must stay in order!
#define BMP_PLACEHOLDER_TABLE_SMALL (RID_SD_START+402)
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index ed63d85..8244183 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -2224,13 +2224,13 @@ IMPL_LINK( SlideshowImpl, ContextMenuHdl, void*, EMPTYARG )
Reference< ::com::sun::star::frame::XFrame > xFrame( pViewFrame->GetFrame().GetFrameInterface() );
if( xFrame.is() )
{
- pMenu->SetItemImage( CM_NEXT_SLIDE, GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:10617") ), FALSE, FALSE ) );
- pMenu->SetItemImage( CM_PREV_SLIDE, GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:10618") ), FALSE, FALSE ) );
+ pMenu->SetItemImage( CM_NEXT_SLIDE, GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:10617") ), FALSE ) );
+ pMenu->SetItemImage( CM_PREV_SLIDE, GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:10618") ), FALSE ) );
if( pPageMenu )
{
- pPageMenu->SetItemImage( CM_FIRST_SLIDE, GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:10616") ), FALSE, FALSE ) );
- pPageMenu->SetItemImage( CM_LAST_SLIDE, GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:10619") ), FALSE, FALSE ) );
+ pPageMenu->SetItemImage( CM_FIRST_SLIDE, GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:10616") ), FALSE ) );
+ pPageMenu->SetItemImage( CM_LAST_SLIDE, GetImage( xFrame, OUString( RTL_CONSTASCII_USTRINGPARAM( "slot:10619") ), FALSE ) );
}
}
}
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx
index 903d606..2198cd3 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx
@@ -671,9 +671,7 @@ const BitmapEx& SdPageObjectFadeNameNumberPrimitive::getFadeEffectIconBitmap() c
if(mpFadeEffectIconBitmap == NULL)
{
// prepare FadeEffectIconBitmap on demand
- const sal_uInt16 nIconId(Application::GetSettings().GetStyleSettings().GetHighContrastMode()
- ? BMP_FADE_EFFECT_INDICATOR_H
- : BMP_FADE_EFFECT_INDICATOR);
+ const sal_uInt16 nIconId(BMP_FADE_EFFECT_INDICATOR);
const BitmapEx aFadeEffectIconBitmap(IconCache::Instance().GetIcon(nIconId).GetBitmapEx());
const_cast< SdPageObjectFadeNameNumberPrimitive* >(this)->mpFadeEffectIconBitmap = new BitmapEx(aFadeEffectIconBitmap);
}
diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx
index a8cc474..4952592 100644
--- a/sd/source/ui/toolpanel/LayoutMenu.cxx
+++ b/sd/source/ui/toolpanel/LayoutMenu.cxx
@@ -123,7 +123,6 @@ TYPEINIT1(LayoutMenu, SfxShell);
struct snewfoil_value_info
{
USHORT mnBmpResId;
- USHORT mnHCBmpResId;
USHORT mnStrResId;
WritingMode meWritingMode;
AutoLayout maAutoLayout;
@@ -131,49 +130,49 @@ struct snewfoil_value_info
static snewfoil_value_info notes[] =
{
- {BMP_FOILN_01, BMP_FOILN_01_H, STR_AUTOLAYOUT_NOTES, WritingMode_LR_TB,
+ {BMP_FOILN_01, STR_AUTOLAYOUT_NOTES, WritingMode_LR_TB,
AUTOLAYOUT_NOTES},
- {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE},
+ {0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE},
};
static snewfoil_value_info handout[] =
{
- {BMP_FOILH_01, BMP_FOILH_01_H, STR_AUTOLAYOUT_HANDOUT1, WritingMode_LR_TB,
+ {BMP_FOILH_01, STR_AUTOLAYOUT_HANDOUT1, WritingMode_LR_TB,
AUTOLAYOUT_HANDOUT1},
- {BMP_FOILH_02, BMP_FOILH_02_H, STR_AUTOLAYOUT_HANDOUT2, WritingMode_LR_TB,
+ {BMP_FOILH_02, STR_AUTOLAYOUT_HANDOUT2, WritingMode_LR_TB,
AUTOLAYOUT_HANDOUT2},
- {BMP_FOILH_03, BMP_FOILH_03_H, STR_AUTOLAYOUT_HANDOUT3, WritingMode_LR_TB,
+ {BMP_FOILH_03, STR_AUTOLAYOUT_HANDOUT3, WritingMode_LR_TB,
AUTOLAYOUT_HANDOUT3},
- {BMP_FOILH_04, BMP_FOILH_04_H, STR_AUTOLAYOUT_HANDOUT4, WritingMode_LR_TB,
+ {BMP_FOILH_04, STR_AUTOLAYOUT_HANDOUT4, WritingMode_LR_TB,
AUTOLAYOUT_HANDOUT4},
- {BMP_FOILH_06, BMP_FOILH_06_H, STR_AUTOLAYOUT_HANDOUT6, WritingMode_LR_TB,
+ {BMP_FOILH_06, STR_AUTOLAYOUT_HANDOUT6, WritingMode_LR_TB,
AUTOLAYOUT_HANDOUT6},
- {BMP_FOILH_09, BMP_FOILH_09_H, STR_AUTOLAYOUT_HANDOUT9, WritingMode_LR_TB,
+ {BMP_FOILH_09, STR_AUTOLAYOUT_HANDOUT9, WritingMode_LR_TB,
AUTOLAYOUT_HANDOUT9},
- {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE},
+ {0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE},
};
static snewfoil_value_info standard[] =
{
- {BMP_LAYOUT_EMPTY, BMP_LAYOUT_EMPTY_H, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB, AUTOLAYOUT_NONE},
- {BMP_LAYOUT_HEAD03, BMP_LAYOUT_HEAD03_H, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB, AUTOLAYOUT_TITLE},
- {BMP_LAYOUT_HEAD02, BMP_LAYOUT_HEAD02_H, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_ENUM},
- {BMP_LAYOUT_HEAD02A, BMP_LAYOUT_HEAD02A_H, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2TEXT},
- {BMP_LAYOUT_HEAD01, BMP_LAYOUT_HEAD01_H, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TITLE},
- {BMP_LAYOUT_TEXTONLY, BMP_LAYOUT_TEXTONLY_H, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TEXT},
- {BMP_LAYOUT_HEAD03B, BMP_LAYOUT_HEAD03B_H, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2OBJTEXT},
- {BMP_LAYOUT_HEAD03C, BMP_LAYOUT_HEAD03C_H, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TEXT2OBJ},
- {BMP_LAYOUT_HEAD03A, BMP_LAYOUT_HEAD03A_H, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT},
- {BMP_LAYOUT_HEAD02B, BMP_LAYOUT_HEAD02B_H, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT},
- {BMP_LAYOUT_HEAD04, BMP_LAYOUT_HEAD04_H, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB, AUTOLAYOUT_4OBJ},
- {BMP_LAYOUT_HEAD06, BMP_LAYOUT_HEAD06_H, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB, AUTOLAYOUT_6CLIPART},
+ {BMP_LAYOUT_EMPTY, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB, AUTOLAYOUT_NONE},
+ {BMP_LAYOUT_HEAD03, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB, AUTOLAYOUT_TITLE},
+ {BMP_LAYOUT_HEAD02, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_ENUM},
+ {BMP_LAYOUT_HEAD02A, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2TEXT},
+ {BMP_LAYOUT_HEAD01, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TITLE},
+ {BMP_LAYOUT_TEXTONLY, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TEXT},
+ {BMP_LAYOUT_HEAD03B, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2OBJTEXT},
+ {BMP_LAYOUT_HEAD03C, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TEXT2OBJ},
+ {BMP_LAYOUT_HEAD03A, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT},
+ {BMP_LAYOUT_HEAD02B, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT},
+ {BMP_LAYOUT_HEAD04, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB, AUTOLAYOUT_4OBJ},
+ {BMP_LAYOUT_HEAD06, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB, AUTOLAYOUT_6CLIPART},
// vertical
- {BMP_LAYOUT_VERTICAL02, BMP_LAYOUT_VERTICAL02_H, STR_AL_VERT_TITLE_TEXT_CHART, WritingMode_TB_RL,AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART},
- {BMP_LAYOUT_VERTICAL01, BMP_LAYOUT_VERTICAL01_H, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE},
- {BMP_LAYOUT_HEAD02, BMP_LAYOUT_HEAD02_H, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE},
- {BMP_LAYOUT_HEAD02A, BMP_LAYOUT_HEAD02A_H, STR_AL_TITLE_VERT_OUTLINE_CLIPART, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART},
- {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}
+ {BMP_LAYOUT_VERTICAL02, STR_AL_VERT_TITLE_TEXT_CHART, WritingMode_TB_RL,AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART},
+ {BMP_LAYOUT_VERTICAL01, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE},
+ {BMP_LAYOUT_HEAD02, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE},
+ {BMP_LAYOUT_HEAD02A, STR_AL_TITLE_VERT_OUTLINE_CLIPART, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART},
+ {0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}
};
LayoutMenu::LayoutMenu( TreeNode* pParent, ToolPanelViewShell& i_rPanelViewShell )
@@ -764,7 +763,6 @@ SfxRequest LayoutMenu::CreateRequest (
void LayoutMenu::Fill (void)
{
- const bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
SvtLanguageOptions aLanguageOptions;
sal_Bool bVertical = aLanguageOptions.IsVerticalTextEnabled();
SdDrawDocument* pDocument = mrBase.GetDocument();
@@ -812,9 +810,7 @@ void LayoutMenu::Fill (void)
{
if ((WritingMode_TB_RL != pInfo->meWritingMode) || bVertical)
{
- BitmapEx aBmp (SdResId (bHighContrast
- ? pInfo->mnHCBmpResId
- : pInfo->mnBmpResId));
+ BitmapEx aBmp(SdResId(pInfo->mnBmpResId));
if (bRightToLeft && (WritingMode_TB_RL != pInfo->meWritingMode))
aBmp.Mirror (BMP_MIRROR_HORZ);
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 9d92f61..dd7434d 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -182,7 +182,7 @@ OutlineView::OutlineView( DrawDocShell* pDocSh, ::Window* pWindow, OutlineViewSh
Reference<XFrame> xFrame (mpOutlineViewShell->GetViewShellBase().GetFrame()->GetTopFrame().GetFrameInterface(), UNO_QUERY);
const OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( ".uno:ShowSlide" ));
- maSlideImage = GetImage( xFrame, aSlotURL, true, false /* todo, hc mode */ );
+ maSlideImage = GetImage( xFrame, aSlotURL, true );
// Tell undo manager of the document about the undo manager of the
// outliner, so that the former can synchronize with the later.
More information about the Libreoffice-commits
mailing list