diff options
88 files changed, 480 insertions, 1403 deletions
diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/source/deployment/gui/dp_gui.hrc index 5f52b042edf3..17897aece094 100755 --- a/desktop/source/deployment/gui/dp_gui.hrc +++ b/desktop/source/deployment/gui/dp_gui.hrc @@ -57,7 +57,6 @@ #define FL_LICENSE 69 #define FI_LICENSE_ARROW1 60 #define FI_LICENSE_ARROW2 61 -#define IMG_LICENCE_ARROW_HC 62 #define BTN_LICENSE_ACCEPT 63 // local RIDs for "Download and Install" dialog @@ -94,28 +93,28 @@ #define RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES (RID_DEPLOYMENT_GUI_START + 8) #define RID_WARNINGBOX_INSTALL_EXTENSION (RID_DEPLOYMENT_GUI_START + 9) -#define RID_DLG_UPDATE (RID_DEPLOYMENT_GUI_START + 10) - -#define RID_DLG_UPDATE_CHECKING 1 -#define RID_DLG_UPDATE_THROBBER 2 -#define RID_DLG_UPDATE_UPDATE 3 -#define RID_DLG_UPDATE_UPDATES 4 -#define RID_DLG_UPDATE_ALL 5 -#define RID_DLG_UPDATE_DESCRIPTION 6 -#define RID_DLG_UPDATE_DESCRIPTIONS 7 -#define RID_DLG_UPDATE_LINE 8 -#define RID_DLG_UPDATE_HELP 9 -#define RID_DLG_UPDATE_OK 10 -#define RID_DLG_UPDATE_CANCEL 11 -#define RID_DLG_UPDATE_NORMALALERT 12 -#define RID_DLG_UPDATE_HIGHCONTRASTALERT 13 -#define RID_DLG_UPDATE_ERROR 14 -#define RID_DLG_UPDATE_NONE 15 -#define RID_DLG_UPDATE_NOINSTALLABLE 16 -#define RID_DLG_UPDATE_FAILURE 17 -#define RID_DLG_UPDATE_UNKNOWNERROR 18 -#define RID_DLG_UPDATE_NODESCRIPTION 19 -#define RID_DLG_UPDATE_NOINSTALL 20 +#define RID_DLG_UPDATE (RID_DEPLOYMENT_GUI_START + 10) + +#define RID_DLG_UPDATE_CHECKING 1 +#define RID_DLG_UPDATE_THROBBER 2 +#define RID_DLG_UPDATE_UPDATE 3 +#define RID_DLG_UPDATE_UPDATES 4 +#define RID_DLG_UPDATE_ALL 5 +#define RID_DLG_UPDATE_DESCRIPTION 6 +#define RID_DLG_UPDATE_DESCRIPTIONS 7 +#define RID_DLG_UPDATE_LINE 8 +#define RID_DLG_UPDATE_HELP 9 +#define RID_DLG_UPDATE_OK 10 +#define RID_DLG_UPDATE_CANCEL 11 +#define RID_DLG_UPDATE_NORMALALERT 12 +#define RID_DLG_UPDATE_HIGHCONTRASTALERT 13 +#define RID_DLG_UPDATE_ERROR 14 +#define RID_DLG_UPDATE_NONE 15 +#define RID_DLG_UPDATE_NOINSTALLABLE 16 +#define RID_DLG_UPDATE_FAILURE 17 +#define RID_DLG_UPDATE_UNKNOWNERROR 18 +#define RID_DLG_UPDATE_NODESCRIPTION 19 +#define RID_DLG_UPDATE_NOINSTALL 20 #define RID_DLG_UPDATE_NODEPENDENCY 21 #define RID_DLG_UPDATE_NODEPENDENCY_CUR_VER 22 #define RID_DLG_UPDATE_NOPERMISSION 23 @@ -133,13 +132,9 @@ #define RID_INFOBOX_UPDATE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START + 21) #define RID_IMG_WARNING (RID_DEPLOYMENT_GUI_START+56) -#define RID_IMG_WARNING_HC (RID_DEPLOYMENT_GUI_START+57) #define RID_IMG_LOCKED (RID_DEPLOYMENT_GUI_START+58) -#define RID_IMG_LOCKED_HC (RID_DEPLOYMENT_GUI_START+59) #define RID_IMG_EXTENSION (RID_DEPLOYMENT_GUI_START+60) -#define RID_IMG_EXTENSION_HC (RID_DEPLOYMENT_GUI_START+61) #define RID_IMG_SHARED (RID_DEPLOYMENT_GUI_START+62) -#define RID_IMG_SHARED_HC (RID_DEPLOYMENT_GUI_START+63) #define RID_STR_ADD_PACKAGES (RID_DEPLOYMENT_GUI_START+70) diff --git a/desktop/source/deployment/gui/dp_gui_dialog.src b/desktop/source/deployment/gui/dp_gui_dialog.src index 15823288ee20..2ea6fefff877 100755 --- a/desktop/source/deployment/gui/dp_gui_dialog.src +++ b/desktop/source/deployment/gui/dp_gui_dialog.src @@ -31,27 +31,33 @@ String RID_STR_ADD_PACKAGES { Text [ en-US ] = "Add Extension(s)"; }; + String RID_CTX_ITEM_REMOVE { Text [ en-US ] = "~Remove"; }; + String RID_CTX_ITEM_ENABLE { Text [ en-US ] = "~Enable"; }; + String RID_CTX_ITEM_DISABLE { Text [ en-US ] = "~Disable"; }; + String RID_CTX_ITEM_CHECK_UPDATE { Text [ en-US ] = "~Update..."; }; + String RID_CTX_ITEM_OPTIONS { Text [ en-US ] = "~Options..."; }; + String RID_STR_ADDING_PACKAGES { Text [ en-US ] = "Adding %EXTENSION_NAME"; @@ -177,7 +183,6 @@ ModalDialog RID_DLG_LICENSE Moveable = TRUE; Closeable = TRUE; Sizeable = FALSE; -// Hide = TRUE; MultiLineEdit ML_LICENSE { @@ -196,6 +201,7 @@ ModalDialog RID_DLG_LICENSE NoLabel = TRUE; Text [ en-US ] = "Please follow these steps to proceed with the installation of the extension:"; }; + FixedText FT_LICENSE_BODY_1 { Pos = MAP_APPFONT(COL2_X, ROW3_Y); @@ -203,6 +209,7 @@ ModalDialog RID_DLG_LICENSE NoLabel = TRUE; Text [ en-US ] = "1."; }; + //spans col3 + col4 FixedText FT_LICENSE_BODY_1_TXT { @@ -212,6 +219,7 @@ ModalDialog RID_DLG_LICENSE NoLabel = TRUE; Text [ en-US ] = "Read the complete License Agreement. Use the scroll bar or the \'Scroll Down\' button in this dialog to view the entire license text."; }; + FixedText FT_LICENSE_BODY_2 { Pos = MAP_APPFONT(COL2_X, ROW4_Y); @@ -219,6 +227,7 @@ ModalDialog RID_DLG_LICENSE NoLabel = TRUE; Text [ en-US ] = "2."; }; + FixedText FT_LICENSE_BODY_2_TXT { Pos = MAP_APPFONT(COL3_X, ROW4_Y); @@ -228,6 +237,7 @@ ModalDialog RID_DLG_LICENSE Text [ en-US ] = "Accept the License Agreement for the extension by pressing the \'Accept\' button."; }; + PushButton PB_LICENSE_DOWN { TabStop = TRUE ; @@ -236,6 +246,7 @@ ModalDialog RID_DLG_LICENSE Text [ en-US ] = "~Scroll Down"; }; + FixedLine FL_LICENSE { Pos = MAP_APPFONT ( 0, ROW5_Y) ; @@ -264,12 +275,6 @@ ModalDialog RID_DLG_LICENSE }; }; - Image IMG_LICENCE_ARROW_HC - { - ImageBitmap = Bitmap { File = "sch06300.png"; }; - MASKCOLOR - }; - OKButton BTN_LICENSE_ACCEPT { Pos = MAP_APPFONT(COL4_X, ROW6_Y); diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.src b/desktop/source/deployment/gui/dp_gui_dialog2.src index 7c47365999a0..5233890d1da8 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.src +++ b/desktop/source/deployment/gui/dp_gui_dialog2.src @@ -158,41 +158,21 @@ Image RID_IMG_WARNING ImageBitmap = Bitmap { File = "caution_16.png"; }; }; -Image RID_IMG_WARNING_HC -{ - ImageBitmap = Bitmap { File = "caution_16_h.png"; }; -}; - Image RID_IMG_LOCKED { ImageBitmap = Bitmap { File = "lock_16.png"; }; }; -Image RID_IMG_LOCKED_HC -{ - ImageBitmap = Bitmap { File = "lock_16_h.png"; }; -}; - Image RID_IMG_SHARED { ImageBitmap = Bitmap { File = "shared_16.png"; }; }; -Image RID_IMG_SHARED_HC -{ - ImageBitmap = Bitmap { File = "shared_16_h.png"; }; -}; - Image RID_IMG_EXTENSION { ImageBitmap = Bitmap { File = "extension_32.png"; }; }; -Image RID_IMG_EXTENSION_HC -{ - ImageBitmap = Bitmap { File = "extension_32_h.png"; }; -}; - QueryBox RID_QUERYBOX_INSTALL_FOR_ALL { Buttons = WB_YES_NO_CANCEL; diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 2e4cac48457b..36c7afe46ea7 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -179,13 +179,9 @@ ExtensionBox_Impl::ExtensionBox_Impl( Dialog* pParent, TheExtensionManager *pMan m_nActiveHeight( 0 ), m_nExtraHeight( 2 ), m_aSharedImage( DialogHelper::getResId( RID_IMG_SHARED ) ), - m_aSharedImageHC( DialogHelper::getResId( RID_IMG_SHARED_HC ) ), m_aLockedImage( DialogHelper::getResId( RID_IMG_LOCKED ) ), - m_aLockedImageHC( DialogHelper::getResId( RID_IMG_LOCKED_HC ) ), m_aWarningImage( DialogHelper::getResId( RID_IMG_WARNING ) ), - m_aWarningImageHC( DialogHelper::getResId( RID_IMG_WARNING_HC ) ), m_aDefaultImage( DialogHelper::getResId( RID_IMG_EXTENSION ) ), - m_aDefaultImageHC( DialogHelper::getResId( RID_IMG_EXTENSION_HC ) ), m_pScrollBar( NULL ), m_pManager( pManager ) { @@ -526,7 +522,7 @@ void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl pEntr aPos += Point( TOP_OFFSET, TOP_OFFSET ); Image aImage; if ( ! pEntry->m_aIcon ) - aImage = isHCMode() ? m_aDefaultImageHC : m_aDefaultImage; + aImage = m_aDefaultImage; else aImage = isHCMode() ? pEntry->m_aIconHC : pEntry->m_aIcon; Size aImageSize = aImage.GetSizePixel(); @@ -634,14 +630,14 @@ void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl pEntr { aPos = rRect.TopRight() + Point( -(RIGHT_ICON_OFFSET + SMALL_ICON_SIZE), TOP_OFFSET ); if ( pEntry->m_bLocked ) - DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), isHCMode() ? m_aLockedImageHC : m_aLockedImage ); + DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), m_aLockedImage ); else - DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), isHCMode() ? m_aSharedImageHC : m_aSharedImage ); + DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), m_aSharedImage ); } if ( ( pEntry->m_eState == AMBIGUOUS ) || pEntry->m_bMissingDeps || pEntry->m_bMissingLic ) { aPos = rRect.TopRight() + Point( -(RIGHT_ICON_OFFSET + SPACE_BETWEEN + 2*SMALL_ICON_SIZE), TOP_OFFSET ); - DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), isHCMode() ? m_aWarningImageHC : m_aWarningImage ); + DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), m_aWarningImage ); } SetLineColor( Color( COL_LIGHTGRAY ) ); diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx index 8120d3b3bfad..f0122aba71e6 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx @@ -137,13 +137,9 @@ class ExtensionBox_Impl : public ::svt::IExtensionListBox long m_nExtraHeight; Size m_aOutputSize; Image m_aSharedImage; - Image m_aSharedImageHC; Image m_aLockedImage; - Image m_aLockedImageHC; Image m_aWarningImage; - Image m_aWarningImageHC; Image m_aDefaultImage; - Image m_aDefaultImageHC; Link m_aClickHdl; ScrollBar *m_pScrollBar; diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index 2ebd75cbc377..32faa7123b5b 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -215,13 +215,6 @@ LicenseDialogImpl::LicenseDialogImpl( { - if (GetSettings().GetStyleSettings().GetHighContrastMode()) - { - // high contrast mode needs other images - m_fiArrow1.SetImage(Image(DpGuiResId(IMG_LICENCE_ARROW_HC))); - m_fiArrow2.SetImage(Image(DpGuiResId(IMG_LICENCE_ARROW_HC))); - } - FreeResource(); m_acceptButton.SetUniqueId(UID_BTN_LICENSE_ACCEPT); diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index ef54e5662ea7..eefed19dace3 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -548,8 +548,7 @@ void SvtFileDialog::Init_Impl WinBits nStyle ) { - sal_Bool bIsHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - m_aImages = ImageList( SvtResId( bIsHighContrast ? RID_FILEPICKER_IMAGES_HC : RID_FILEPICKER_IMAGES ) ); + m_aImages = ImageList( SvtResId( RID_FILEPICKER_IMAGES ) ); _pImp->_nStyle = nStyle; _pImp->_a6Size = LogicToPixel( Size( 6, 6 ), MAP_APPFONT ); @@ -2672,11 +2671,7 @@ BOOL SvtFileDialog::IsolateFilterFromPath_Impl( String& rPath, String& rFilter ) //----------------------------------------------------------------------------- void SvtFileDialog::implUpdateImages( ) { - // determine high contrast mode - { - sal_Bool bIsHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - m_aImages = ImageList( SvtResId( bIsHighContrast ? RID_FILEPICKER_IMAGES_HC : RID_FILEPICKER_IMAGES ) ); - } + m_aImages = ImageList( SvtResId( RID_FILEPICKER_IMAGES ) ); // set the appropriate images on the buttons if ( _pImp->_pBtnUp ) diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src index a7c19cb601d2..249383dc8a47 100644 --- a/fpicker/source/office/iodlg.src +++ b/fpicker/source/office/iodlg.src @@ -53,13 +53,6 @@ ImageList RID_FILEPICKER_IMAGES FILEPICKER_IL_IDLIST }; -ImageList RID_FILEPICKER_IMAGES_HC -{ - Prefix = "fph"; - MASKCOLOR - FILEPICKER_IL_IDLIST -}; - // dialogs ******************************************************************* ModalDialog DLG_SVT_EXPLORERFILE diff --git a/framework/inc/classes/addonmenu.hxx b/framework/inc/classes/addonmenu.hxx index d3518843a6c1..90f6cb42bded 100644 --- a/framework/inc/classes/addonmenu.hxx +++ b/framework/inc/classes/addonmenu.hxx @@ -51,18 +51,19 @@ namespace framework class AddonMenu : public PopupMenu { public: - AddonMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); - ~AddonMenu(); + AddonMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); + ~AddonMenu(); protected: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; }; class AddonMenuManager; + class AddonPopupMenu : public AddonMenu { public: - ~AddonPopupMenu(); + ~AddonPopupMenu(); // Check if command URL string has the unique prefix to identify addon popup menus static sal_Bool IsCommandURLPrefix( const rtl::OUString& aCmdURL ); @@ -71,12 +72,12 @@ class AddonPopupMenu : public AddonMenu const rtl::OUString& GetCommandURL() const { return m_aCommandURL; } protected: - void Initialize( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rAddonPopupMenuDefinition ); + void Initialize( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rAddonPopupMenuDefinition ); private: - AddonPopupMenu( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame ); + AddonPopupMenu( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame ); - rtl::OUString m_aCommandURL; + rtl::OUString m_aCommandURL; friend class AddonMenuManager; }; diff --git a/framework/inc/classes/bmkmenu.hxx b/framework/inc/classes/bmkmenu.hxx index 2645a535950f..6bfc741857c5 100644 --- a/framework/inc/classes/bmkmenu.hxx +++ b/framework/inc/classes/bmkmenu.hxx @@ -54,25 +54,28 @@ class BmkMenu_Impl; class BmkMenu : public AddonMenu { public: - enum BmkMenuType - { - BMK_NEWMENU, - BMK_WIZARDMENU - }; + enum BmkMenuType + { + BMK_NEWMENU, + BMK_WIZARDMENU + }; - BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - BmkMenuType nType ); - ~BmkMenu(); + BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + BmkMenuType nType + ); - void Initialize(); // Synchrones Laden der Eintraege + ~BmkMenu(); + + void Initialize(); // Synchrones Laden der Eintraege protected: BmkMenu::BmkMenuType m_nType; - USHORT CreateMenuId(); + USHORT CreateMenuId(); private: - BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - BmkMenuType, BmkMenu* pRoot ); + BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + BmkMenuType, BmkMenu* pRoot + ); BmkMenu_Impl* _pImp; }; diff --git a/framework/inc/classes/resource.hrc b/framework/inc/classes/resource.hrc index 8c9bd2e854b0..22fd6740c397 100644 --- a/framework/inc/classes/resource.hrc +++ b/framework/inc/classes/resource.hrc @@ -69,19 +69,19 @@ #define RID_IMAGE_STATUSBAR_LOGO (RID_IMAGE_START+0) // License Dialog -#define DLG_LICENSE (RID_FWK_DIALOG_START+256) -#define ML_LICENSE (RID_FWK_DIALOG_START+11) -#define FT_INFO1 (RID_FWK_DIALOG_START+12) -#define FT_INFO2 (RID_FWK_DIALOG_START+13) -#define FT_INFO3 (RID_FWK_DIALOG_START+14) -#define FT_INFO2_1 (RID_FWK_DIALOG_START+15) -#define FT_INFO3_1 (RID_FWK_DIALOG_START+16) -#define FL_DIVIDE (RID_FWK_DIALOG_START+17) -#define PB_PAGEDOWN (RID_FWK_DIALOG_START+18) -#define IMG_ARROW (RID_FWK_DIALOG_START+19) -#define LICENSE_ACCEPT (RID_FWK_DIALOG_START+20) -#define LICENSE_NOTACCEPT (RID_FWK_DIALOG_START+21) -#define PB_DECLINE (RID_FWK_DIALOG_START+22) -#define PB_ACCEPT (RID_FWK_DIALOG_START+23) +#define DLG_LICENSE (RID_FWK_DIALOG_START+256) +#define ML_LICENSE (RID_FWK_DIALOG_START+11) +#define FT_INFO1 (RID_FWK_DIALOG_START+12) +#define FT_INFO2 (RID_FWK_DIALOG_START+13) +#define FT_INFO3 (RID_FWK_DIALOG_START+14) +#define FT_INFO2_1 (RID_FWK_DIALOG_START+15) +#define FT_INFO3_1 (RID_FWK_DIALOG_START+16) +#define FL_DIVIDE (RID_FWK_DIALOG_START+17) +#define PB_PAGEDOWN (RID_FWK_DIALOG_START+18) +#define IMG_ARROW (RID_FWK_DIALOG_START+19) +#define LICENSE_ACCEPT (RID_FWK_DIALOG_START+20) +#define LICENSE_NOTACCEPT (RID_FWK_DIALOG_START+21) +#define PB_DECLINE (RID_FWK_DIALOG_START+22) +#define PB_ACCEPT (RID_FWK_DIALOG_START+23) #endif diff --git a/framework/inc/framework.hrc b/framework/inc/framework.hrc index 1817b60d90e9..05af2f8ce35f 100644 --- a/framework/inc/framework.hrc +++ b/framework/inc/framework.hrc @@ -30,19 +30,19 @@ #include "svl/solar.hrc" -#define RID_FWK_START 260 +#define RID_FWK_START 260 -#define RID_GROUPS_OFFSET 32000 -#define RID_GROUPS_END 32767 +#define RID_GROUPS_OFFSET 32000 +#define RID_GROUPS_END 32767 #define RID_FWK_DIALOG_START_CORRECT (RID_FWK_START + 2048) -#define DLG_FILTER_SELECT (RID_FWK_DIALOG_START_CORRECT + 0) +#define DLG_FILTER_SELECT (RID_FWK_DIALOG_START_CORRECT + 0) -#define STR_FILTER_DOWNLOAD (RID_FWK_START+0) -#define STR_FILTER_CHOOSER (RID_FWK_START+1) -#define STR_FILTER_OTHERS (RID_FWK_START+2) -#define STR_FILTER_ZIPPED (RID_FWK_START+3) +#define STR_FILTER_DOWNLOAD (RID_FWK_START+0) +#define STR_FILTER_CHOOSER (RID_FWK_START+1) +#define STR_FILTER_OTHERS (RID_FWK_START+2) +#define STR_FILTER_ZIPPED (RID_FWK_START+3) // ResIds for BackingWindow #define DLG_BACKING (RID_FWK_DIALOG_START_CORRECT+100) @@ -57,13 +57,7 @@ #define STR_BACKING_TPLREP 9 #define RES_BACKING_IMAGES (DLG_BACKING+1) -#define RES_BACKING_IMAGES_HC (DLG_BACKING+2) -#define BMP_BACKING_BACKGROUND_LEFT 1 -#define BMP_BACKING_BACKGROUND_MIDDLE 2 -#define BMP_BACKING_BACKGROUND_RIGHT 3 -#define BMP_BACKING_BACKGROUND_RTL_LEFT 4 -#define BMP_BACKING_BACKGROUND_RTL_RIGHT 5 #define BMP_BACKING_EXT 6 #define BMP_BACKING_REG 7 #define BMP_BACKING_INFO 8 diff --git a/framework/inc/helper/imageproducer.hxx b/framework/inc/helper/imageproducer.hxx index 36542832bf18..9b998fdf0b35 100644 --- a/framework/inc/helper/imageproducer.hxx +++ b/framework/inc/helper/imageproducer.hxx @@ -40,11 +40,21 @@ namespace framework { -typedef Image ( *pfunc_getImage)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast ); +typedef Image ( *pfunc_getImage)( + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + const ::rtl::OUString& aURL, + BOOL bBig, + BOOL bHiContrast +); pfunc_getImage SAL_CALL SetImageProducer( pfunc_getImage pGetImageFunc ); -Image SAL_CALL GetImageFromURL( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast ); +Image SAL_CALL GetImageFromURL( + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + const ::rtl::OUString& aURL, + BOOL bBig, + BOOL bHiContrast +); } diff --git a/framework/source/classes/addonsoptions.cxx b/framework/source/classes/addonsoptions.cxx index ccfbbfbffca1..1ebb6588974a 100644 --- a/framework/source/classes/addonsoptions.cxx +++ b/framework/source/classes/addonsoptions.cxx @@ -366,15 +366,15 @@ class AddonsOptions_Impl : public ConfigItem ImageEntry* ReadOptionalImageData( const ::rtl::OUString& aMenuNodeName ); sal_Int32 m_nRootAddonPopupMenuId; - ::rtl::OUString m_aPropNames[PROPERTYCOUNT_INDEX]; - ::rtl::OUString m_aPropImagesNames[PROPERTYCOUNT_IMAGES]; - ::rtl::OUString m_aPropMergeMenuNames[PROPERTYCOUNT_MERGE_MENUBAR]; - ::rtl::OUString m_aPropMergeToolbarNames[PROPERTYCOUNT_MERGE_TOOLBAR]; - ::rtl::OUString m_aEmpty; - ::rtl::OUString m_aPathDelimiter; - ::rtl::OUString m_aSeparator; - ::rtl::OUString m_aRootAddonPopupMenuURLPrexfix; - ::rtl::OUString m_aPrivateImageURL; + ::rtl::OUString m_aPropNames[PROPERTYCOUNT_INDEX]; + ::rtl::OUString m_aPropImagesNames[PROPERTYCOUNT_IMAGES]; + ::rtl::OUString m_aPropMergeMenuNames[PROPERTYCOUNT_MERGE_MENUBAR]; + ::rtl::OUString m_aPropMergeToolbarNames[PROPERTYCOUNT_MERGE_TOOLBAR]; + ::rtl::OUString m_aEmpty; + ::rtl::OUString m_aPathDelimiter; + ::rtl::OUString m_aSeparator; + ::rtl::OUString m_aRootAddonPopupMenuURLPrexfix; + ::rtl::OUString m_aPrivateImageURL; Sequence< Sequence< PropertyValue > > m_aCachedMenuProperties; Sequence< Sequence< PropertyValue > > m_aCachedMenuBarPartProperties; AddonToolBars m_aCachedToolBarPartProperties; diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src index 1cd9ecc6dd30..3f354d438879 100644 --- a/framework/source/classes/resource.src +++ b/framework/source/classes/resource.src @@ -131,8 +131,6 @@ String STR_STATUSBAR_LOGOTEXT // License Dialog // *********************************************************************** #define LICENSE_DIALOG_WIDTH 260 -//#define LICENSE_DIALOG_HEIGTH 185 -//#define LICENSE_DIALOG_HEIGTH 190 #define LICENSE_RIGHT_BORDER 7 #define LICENSE_BOTTOM_BORDER 0 #define LICENSE_ROW_1 (7) @@ -322,31 +320,37 @@ String STR_LANGSTATUS_MULTIPLE_LANGUAGES Text [ en-US ] = "Multiple Languages" ; Text [ x-comment ] = " "; }; + String STR_LANGSTATUS_NONE { Text [ en-US ] = "None (Do not check spelling)" ; Text [ x-comment ] = " "; }; + String STR_RESET_TO_DEFAULT_LANGUAGE { Text [ en-US ] = "Reset to Default Language" ; Text [ x-comment ] = " "; }; + String STR_LANGSTATUS_MORE { Text [ en-US ] = "More..." ; Text [ x-comment ] = " "; }; + String STR_SET_LANGUAGE_FOR_SELECTION { Text [ en-US ] = "Set Language for Selection" ; Text [ x-comment ] = " "; }; + String STR_SET_LANGUAGE_FOR_PARAGRAPH { Text [ en-US ] = "Set Language for Paragraph" ; Text [ x-comment ] = " "; }; + String STR_SET_LANGUAGE_FOR_ALL_TEXT { Text [ en-US ] = "Set Language for all Text" ; diff --git a/framework/source/helper/imageproducer.cxx b/framework/source/helper/imageproducer.cxx index 2630fab87373..e404be304d99 100644 --- a/framework/source/helper/imageproducer.cxx +++ b/framework/source/helper/imageproducer.cxx @@ -45,7 +45,12 @@ pfunc_getImage SAL_CALL SetImageProducer( pfunc_getImage pNewGetImageFunc ) } -Image SAL_CALL GetImageFromURL( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast ) +Image SAL_CALL GetImageFromURL( + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + const ::rtl::OUString& aURL, + BOOL bBig, + BOOL bHiContrast +) { if ( _pGetImageFunc ) return _pGetImageFunc( rFrame, aURL, bBig, bHiContrast ); diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx index a7d7741bbc04..94d9dfae0c1e 100644 --- a/framework/source/services/backingwindow.cxx +++ b/framework/source/services/backingwindow.cxx @@ -410,7 +410,7 @@ void BackingWindow::initBackground() Color aTextBGColor( bDark ? COL_BLACK : COL_WHITE ); // select image set - ImageContainerRes aRes( FwkResId( bDark ? RES_BACKING_IMAGES_HC : RES_BACKING_IMAGES ) ); + ImageContainerRes aRes( FwkResId( RES_BACKING_IMAGES ) ); // scale middle segment Size aMiddleSize; diff --git a/framework/source/services/fwk_services.src b/framework/source/services/fwk_services.src index bdbe81bc7fb3..d2368f9eacdc 100644 --- a/framework/source/services/fwk_services.src +++ b/framework/source/services/fwk_services.src @@ -123,78 +123,6 @@ Resource RES_BACKING_IMAGES }; }; -Resource RES_BACKING_IMAGES_HC -{ - Bitmap BMP_BACKING_BACKGROUND_LEFT - { - File = "backing_hc.png"; - }; - Bitmap BMP_BACKING_BACKGROUND_MIDDLE - { - File = "backing_space_hc.png"; - }; - Bitmap BMP_BACKING_BACKGROUND_RIGHT - { - File = "backing_right_hc.png"; - }; - Bitmap BMP_BACKING_BACKGROUND_RTL_LEFT - { - File = "backing_rtl_left_hc.png"; - }; - Bitmap BMP_BACKING_BACKGROUND_RTL_RIGHT - { - File = "backing_rtl_right_hc.png"; - }; - Bitmap BMP_BACKING_EXT - { - File = "extension_hc.png"; - }; - Bitmap BMP_BACKING_REG - { - File = "register_hc.png"; - }; - Bitmap BMP_BACKING_INFO - { - File = "info_hc.png"; - }; - Bitmap BMP_BACKING_TPLREP - { - File = "template_hc.png"; - }; - Bitmap BMP_BACKING_WRITER - { - File = "odt_32_hc.png"; - }; - Bitmap BMP_BACKING_CALC - { - File = "ods_32_hc.png"; - }; - Bitmap BMP_BACKING_IMPRESS - { - File = "odp_32_hc.png"; - }; - Bitmap BMP_BACKING_DRAW - { - File = "odg_32_hc.png"; - }; - Bitmap BMP_BACKING_DATABASE - { - File = "odb_32_hc.png"; - }; - Bitmap BMP_BACKING_FORMULA - { - File = "odf_32_hc.png"; - }; - Bitmap BMP_BACKING_OPENFILE - { - File = "folder_32_hc.png"; - }; - Bitmap BMP_BACKING_OPENTEMPLATE - { - File = "templates_32_hc.png"; - }; -}; - Window WIN_TABWINDOW { OutputSize = TRUE ; diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 7cf66b62405a..7b02594e8e61 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -69,7 +69,6 @@ // Function-Id's #define RID_FMSHELL_CONVERSIONMENU (RID_FORMS_START + 4) #define RID_SVXIMGLIST_FMEXPL (RID_FORMS_START + 0) -#define RID_SVXIMGLIST_FMEXPL_HC (RID_FORMS_START + 2) // Forms - Ids, used to address images from image list #define SID_FMSLOTS_START (SID_SVX_START + 592) @@ -235,7 +234,7 @@ void ControlMenuController::updateImagesPopupMenu( PopupMenu* pPopupMenu ) rtl::OUString aResName( RTL_CONSTASCII_USTRINGPARAM( "svx" )); ResMgr* pResMgr = ResMgr::CreateResMgr( rtl::OUStringToOString( aResName, RTL_TEXTENCODING_ASCII_US )); - ResId aResId( m_bWasHiContrast ? RID_SVXIMGLIST_FMEXPL_HC : RID_SVXIMGLIST_FMEXPL, *pResMgr ); + ResId aResId( RID_SVXIMGLIST_FMEXPL, *pResMgr ); aResId.SetRT( RSC_IMAGELIST ); if ( pResMgr->IsAvailable( aResId )) diff --git a/sfx2/inc/docvor.hxx b/sfx2/inc/docvor.hxx index f9f8c69e6c1a..99c967143f82 100644 --- a/sfx2/inc/docvor.hxx +++ b/sfx2/inc/docvor.hxx @@ -144,7 +144,6 @@ friend class SfxOrganizeListBox_Impl; class SfxOrganizeDlg_Impl *pImp; -// virtual void DataChanged( const DataChangedEvent& rDCEvt ); public: SfxTemplateOrganizeDlg(Window * pParent, SfxDocumentTemplates* = 0); ~SfxTemplateOrganizeDlg(); diff --git a/sfx2/inc/fwkhelper.hxx b/sfx2/inc/fwkhelper.hxx index 34dd81bc3480..1b23e4c2bae6 100644 --- a/sfx2/inc/fwkhelper.hxx +++ b/sfx2/inc/fwkhelper.hxx @@ -33,6 +33,8 @@ #include <rtl/ustring.hxx> -SFX2_DLLPUBLIC void SAL_CALL RefreshToolbars( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); +SFX2_DLLPUBLIC void SAL_CALL RefreshToolbars( + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame +); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/inc/imagemgr.hxx b/sfx2/inc/imagemgr.hxx index 699786f6f5a7..5e27120e8f76 100644 --- a/sfx2/inc/imagemgr.hxx +++ b/sfx2/inc/imagemgr.hxx @@ -34,6 +34,10 @@ #include <rtl/ustring.hxx> #include <vcl/image.hxx> -SFX2_DLLPUBLIC Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast ); +SFX2_DLLPUBLIC Image SAL_CALL GetImage( + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + const ::rtl::OUString& aURL, + BOOL bBig, BOOL bHiContrast +); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc index 8b81029593eb..6787724675d6 100755 --- a/sfx2/inc/sfx2/sfx.hrc +++ b/sfx2/inc/sfx2/sfx.hrc @@ -183,9 +183,7 @@ #define RID_DEFAULTIMAGELIST_LC (RID_SFX_START+17) #define RID_DEFAULTIMAGELIST_LM (RID_SFX_START+18) #define RID_STYLEDLG (RID_SFX_START+28) -#define RID_DEFAULTIMAGELIST_SCH (RID_SFX_START+35) #define RID_DEFAULTIMAGELIST_SMH (RID_SFX_START+36) -#define RID_DEFAULTIMAGELIST_LCH (RID_SFX_START+37) #define RID_DEFAULTIMAGELIST_LMH (RID_SFX_START+38) #define RID_IMAGELIST_SCH (RID_SFX_START+39) #define RID_IMAGELIST_SMH (RID_SFX_START+40) diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc index dca172269443..2f40809cfdb3 100644 --- a/sfx2/source/appl/app.hrc +++ b/sfx2/source/appl/app.hrc @@ -39,9 +39,6 @@ #define MSG_ERR_VERSION_CFG (RID_SFX_APP_START+6) #define MSG_ERR_NO_WEBBROWSER_FOUND (RID_SFX_APP_START+7) -// Note: no longer in use -// #define MSG_ERR_EXTERNAL_APP_NOT_FOUND (RID_SFX_APP_START+8) - #define MSG_ISPRINTING_QUERYABORT (RID_SFX_APP_START+9) #define MSG_CANT_QUIT (RID_SFX_APP_START+10) #define STR_ISMODIFIED (RID_SFX_APP_START+11) @@ -161,13 +158,9 @@ #define IMG_HELP_TOOLBOX_COPY (RID_SFX_APP_START+118) #define IMG_HELP_CONTENT_BOOK_OPEN (RID_SFX_APP_START+120) -#define IMG_HELP_CONTENT_BOOK_OPEN_HC (RID_SFX_APP_START+121) #define IMG_HELP_CONTENT_BOOK_CLOSED (RID_SFX_APP_START+122) -#define IMG_HELP_CONTENT_BOOK_CLOSED_HC (RID_SFX_APP_START+123) #define IMG_HELP_CONTENT_DOC (RID_SFX_APP_START+124) -#define IMG_HELP_CONTENT_DOC_HC (RID_SFX_APP_START+125) // image - #define IMG_MISSING_1 (RID_SFX_APP_START+126) // image #define IMG_MISSING_2 (RID_SFX_APP_START+127) // image #define IMG_MISSING_3 (RID_SFX_APP_START+128) // image @@ -203,16 +196,6 @@ #define RID_HELP_ONSTARTUP_BOX (RID_SFX_APP_START+144) #define RID_HELP_ONSTARTUP_TEXT (RID_SFX_APP_START+145) -#define IMG_HELP_TOOLBOX_HC_INDEX_ON (RID_SFX_APP_START+150) -#define IMG_HELP_TOOLBOX_HC_INDEX_OFF (RID_SFX_APP_START+151) -#define IMG_HELP_TOOLBOX_HC_START (RID_SFX_APP_START+152) -#define IMG_HELP_TOOLBOX_HC_PREV (RID_SFX_APP_START+153) -#define IMG_HELP_TOOLBOX_HC_NEXT (RID_SFX_APP_START+154) -#define IMG_HELP_TOOLBOX_HC_PRINT (RID_SFX_APP_START+155) -#define IMG_HELP_TOOLBOX_HC_BOOKMARKS (RID_SFX_APP_START+156) -#define IMG_HELP_TOOLBOX_HC_SEARCHDIALOG (RID_SFX_APP_START+157) -#define IMG_HELP_TOOLBOX_HC_COPY (RID_SFX_APP_START+158) - #define IMG_HELP_TOOLBOX_L_INDEX_ON (RID_SFX_APP_START+160) #define IMG_HELP_TOOLBOX_L_INDEX_OFF (RID_SFX_APP_START+161) #define IMG_HELP_TOOLBOX_L_START (RID_SFX_APP_START+162) @@ -223,16 +206,6 @@ #define IMG_HELP_TOOLBOX_L_SEARCHDIALOG (RID_SFX_APP_START+167) #define IMG_HELP_TOOLBOX_L_COPY (RID_SFX_APP_START+168) -#define IMG_HELP_TOOLBOX_HCL_INDEX_ON (RID_SFX_APP_START+170) -#define IMG_HELP_TOOLBOX_HCL_INDEX_OFF (RID_SFX_APP_START+171) -#define IMG_HELP_TOOLBOX_HCL_START (RID_SFX_APP_START+172) -#define IMG_HELP_TOOLBOX_HCL_PREV (RID_SFX_APP_START+173) -#define IMG_HELP_TOOLBOX_HCL_NEXT (RID_SFX_APP_START+174) -#define IMG_HELP_TOOLBOX_HCL_PRINT (RID_SFX_APP_START+175) -#define IMG_HELP_TOOLBOX_HCL_BOOKMARKS (RID_SFX_APP_START+176) -#define IMG_HELP_TOOLBOX_HCL_SEARCHDIALOG (RID_SFX_APP_START+177) -#define IMG_HELP_TOOLBOX_HCL_COPY (RID_SFX_APP_START+178) - #define RID_SECURITY_WARNING_HYPERLINK (RID_SFX_APP_START + 180) #define RID_SECURITY_WARNING_TITLE (RID_SFX_APP_START + 181) diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index 22c4214c464c..cf8bf4bbcfd3 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -94,12 +94,12 @@ SfxModule_Impl::~SfxModule_Impl() ImageList* SfxModule_Impl::GetImageList( ResMgr* pResMgr, BOOL bBig, BOOL bHiContrast ) { - ImageList*& rpList = bBig ? ( bHiContrast ? pImgListHiBig: pImgListBig ) : + ImageList*& rpList = bBig ? ( bHiContrast ? pImgListHiBig : pImgListBig ) : ( bHiContrast ? pImgListHiSmall : pImgListSmall ); if ( !rpList ) { - ResId aResId( bBig ? ( bHiContrast ? RID_DEFAULTIMAGELIST_LCH : RID_DEFAULTIMAGELIST_LC ) : - ( bHiContrast ? RID_DEFAULTIMAGELIST_SCH : RID_DEFAULTIMAGELIST_SC ), *pResMgr ); + ResId aResId( bBig ? ( RID_DEFAULTIMAGELIST_LC ) : ( RID_DEFAULTIMAGELIST_SC ), *pResMgr ); + aResId.SetRT( RSC_IMAGELIST ); DBG_ASSERT( pResMgr->IsAvailable(aResId), "No default ImageList!" ); diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index fd5b7193db0d..ec13aabeb353 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -292,13 +292,6 @@ ContentListBox_Impl::ContentListBox_Impl( Window* pParent, const ResId& rResId ) aDocumentImage ( SfxResId( IMG_HELP_CONTENT_DOC ) ) { - if ( GetSettings().GetStyleSettings().GetHighContrastMode() ) - { - aOpenBookImage = Image( SfxResId( IMG_HELP_CONTENT_BOOK_OPEN_HC ) ); - aClosedBookImage = Image( SfxResId( IMG_HELP_CONTENT_BOOK_CLOSED_HC ) ); - aDocumentImage = Image( SfxResId( IMG_HELP_CONTENT_DOC_HC ) ); - } - SetWindowBits( WB_HIDESELECTION | WB_HSCROLL ); SetEntryHeight( 16 ); @@ -2174,34 +2167,35 @@ sal_Bool SfxHelpTextWindow_Impl::HasSelection() const void SfxHelpTextWindow_Impl::InitToolBoxImages() { sal_Bool bLarge = SvtMiscOptions().AreCurrentSymbolsLarge(); - sal_Bool bHiContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - - aIndexOnImage = Image( SfxResId( - bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_INDEX_ON : IMG_HELP_TOOLBOX_L_INDEX_ON - : bHiContrast ? IMG_HELP_TOOLBOX_HC_INDEX_ON : IMG_HELP_TOOLBOX_INDEX_ON ) ); - aIndexOffImage = Image( SfxResId( - bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_INDEX_OFF : IMG_HELP_TOOLBOX_L_INDEX_OFF - : bHiContrast ? IMG_HELP_TOOLBOX_HC_INDEX_OFF : IMG_HELP_TOOLBOX_INDEX_OFF ) ); + + aIndexOnImage = Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_INDEX_ON : IMG_HELP_TOOLBOX_INDEX_ON ) ); + aIndexOffImage = Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_INDEX_OFF : IMG_HELP_TOOLBOX_INDEX_OFF ) ); + aToolBox.SetItemImage( TBI_INDEX, bIsIndexOn ? aIndexOffImage : aIndexOnImage ); - aToolBox.SetItemImage( TBI_BACKWARD, Image( SfxResId( - bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_PREV : IMG_HELP_TOOLBOX_L_PREV - : bHiContrast ? IMG_HELP_TOOLBOX_HC_PREV : IMG_HELP_TOOLBOX_PREV ) ) ); - aToolBox.SetItemImage( TBI_FORWARD, Image( SfxResId( - bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_NEXT : IMG_HELP_TOOLBOX_L_NEXT - : bHiContrast ? IMG_HELP_TOOLBOX_HC_NEXT : IMG_HELP_TOOLBOX_NEXT ) ) ); - aToolBox.SetItemImage( TBI_START, Image( SfxResId( - bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_START : IMG_HELP_TOOLBOX_L_START - : bHiContrast ? IMG_HELP_TOOLBOX_HC_START : IMG_HELP_TOOLBOX_START ) ) ); - aToolBox.SetItemImage( TBI_PRINT, Image( SfxResId( - bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_PRINT : IMG_HELP_TOOLBOX_L_PRINT - : bHiContrast ? IMG_HELP_TOOLBOX_HC_PRINT : IMG_HELP_TOOLBOX_PRINT ) ) ); - aToolBox.SetItemImage( TBI_BOOKMARKS, Image( SfxResId( - bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_BOOKMARKS : IMG_HELP_TOOLBOX_L_BOOKMARKS - : bHiContrast ? IMG_HELP_TOOLBOX_HC_BOOKMARKS : IMG_HELP_TOOLBOX_BOOKMARKS ) ) ); - aToolBox.SetItemImage( TBI_SEARCHDIALOG, Image( SfxResId( - bLarge ? bHiContrast ? IMG_HELP_TOOLBOX_HCL_SEARCHDIALOG : IMG_HELP_TOOLBOX_L_SEARCHDIALOG - : bHiContrast ? IMG_HELP_TOOLBOX_HC_SEARCHDIALOG : IMG_HELP_TOOLBOX_SEARCHDIALOG ) ) ); + aToolBox.SetItemImage( TBI_BACKWARD, + Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_PREV : IMG_HELP_TOOLBOX_PREV ) ) + ); + + aToolBox.SetItemImage( TBI_FORWARD, + Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_NEXT : IMG_HELP_TOOLBOX_NEXT ) ) + ); + + aToolBox.SetItemImage( TBI_START, + Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_START : IMG_HELP_TOOLBOX_START ) ) + ); + + aToolBox.SetItemImage( TBI_PRINT, + Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_PRINT : IMG_HELP_TOOLBOX_PRINT ) ) + ); + + aToolBox.SetItemImage( TBI_BOOKMARKS, + Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_BOOKMARKS : IMG_HELP_TOOLBOX_BOOKMARKS ) ) + ); + + aToolBox.SetItemImage( TBI_SEARCHDIALOG, + Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_SEARCHDIALOG : IMG_HELP_TOOLBOX_SEARCHDIALOG ) ) + ); Size aSize = aToolBox.CalcWindowSizePixel(); aSize.Height() += TOOLBOX_OFFSET; @@ -2580,7 +2574,6 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) if ( pCmdEvt->GetCommand() == COMMAND_CONTEXTMENU && pCmdWin != this && pCmdWin != &aToolBox ) { - sal_Bool bHiContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); Point aPos; if ( pCmdEvt->IsMouseEvent() ) aPos = pCmdEvt->GetMousePosPixel(); @@ -2589,33 +2582,44 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) aPos.Y() += pTextWin->GetPosPixel().Y(); PopupMenu aMenu; if ( bIsIndexOn ) - aMenu.InsertItem( TBI_INDEX, aIndexOffText, Image( SfxResId( - bHiContrast ? IMG_HELP_TOOLBOX_HC_INDEX_OFF : IMG_HELP_TOOLBOX_INDEX_OFF ) ) ); + aMenu.InsertItem( TBI_INDEX, aIndexOffText, Image( SfxResId( IMG_HELP_TOOLBOX_INDEX_OFF ) ) ); else - aMenu.InsertItem( TBI_INDEX, aIndexOnText, Image( SfxResId( - bHiContrast ? IMG_HELP_TOOLBOX_HC_INDEX_ON : IMG_HELP_TOOLBOX_INDEX_ON ) ) ); + aMenu.InsertItem( TBI_INDEX, aIndexOnText, Image( SfxResId( IMG_HELP_TOOLBOX_INDEX_ON ) ) ); + aMenu.SetHelpId( TBI_INDEX, HID_HELP_TOOLBOXITEM_INDEX ); aMenu.InsertSeparator(); - aMenu.InsertItem( TBI_BACKWARD, String( SfxResId( STR_HELP_BUTTON_PREV ) ), - Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_PREV : IMG_HELP_TOOLBOX_PREV ) ) ); + aMenu.InsertItem( TBI_BACKWARD, + String( SfxResId( STR_HELP_BUTTON_PREV ) ), + Image( SfxResId( IMG_HELP_TOOLBOX_PREV ) ) + ); aMenu.SetHelpId( TBI_BACKWARD, HID_HELP_TOOLBOXITEM_BACKWARD ); aMenu.EnableItem( TBI_BACKWARD, pHelpWin->HasHistoryPredecessor() ); - aMenu.InsertItem( TBI_FORWARD, String( SfxResId( STR_HELP_BUTTON_NEXT ) ), - Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_NEXT : IMG_HELP_TOOLBOX_NEXT ) ) ); + aMenu.InsertItem( TBI_FORWARD, + String( SfxResId( STR_HELP_BUTTON_NEXT ) ), + Image( SfxResId( IMG_HELP_TOOLBOX_NEXT ) ) + ); aMenu.SetHelpId( TBI_FORWARD, HID_HELP_TOOLBOXITEM_FORWARD ); aMenu.EnableItem( TBI_FORWARD, pHelpWin->HasHistorySuccessor() ); - aMenu.InsertItem( TBI_START, String( SfxResId( STR_HELP_BUTTON_START ) ), - Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_START : IMG_HELP_TOOLBOX_START ) ) ); + aMenu.InsertItem( TBI_START, + String( SfxResId( STR_HELP_BUTTON_START ) ), + Image( SfxResId( IMG_HELP_TOOLBOX_START ) ) + ); aMenu.SetHelpId( TBI_START, HID_HELP_TOOLBOXITEM_START ); aMenu.InsertSeparator(); - aMenu.InsertItem( TBI_PRINT, String( SfxResId( STR_HELP_BUTTON_PRINT ) ), - Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_PRINT : IMG_HELP_TOOLBOX_PRINT ) ) ); + aMenu.InsertItem( TBI_PRINT, + String( SfxResId( STR_HELP_BUTTON_PRINT ) ), + Image( SfxResId( IMG_HELP_TOOLBOX_PRINT ) ) + ); aMenu.SetHelpId( TBI_PRINT, HID_HELP_TOOLBOXITEM_PRINT ); - aMenu.InsertItem( TBI_BOOKMARKS, String( SfxResId( STR_HELP_BUTTON_ADDBOOKMARK ) ), - Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_BOOKMARKS : IMG_HELP_TOOLBOX_BOOKMARKS ) ) ); + aMenu.InsertItem( TBI_BOOKMARKS, + String( SfxResId( STR_HELP_BUTTON_ADDBOOKMARK ) ), + Image( SfxResId( IMG_HELP_TOOLBOX_BOOKMARKS ) ) + ); aMenu.SetHelpId( TBI_BOOKMARKS, HID_HELP_TOOLBOXITEM_BOOKMARKS ); - aMenu.InsertItem( TBI_SEARCHDIALOG, String( SfxResId( STR_HELP_BUTTON_SEARCHDIALOG ) ), - Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_SEARCHDIALOG : IMG_HELP_TOOLBOX_SEARCHDIALOG ) ) ); + aMenu.InsertItem( TBI_SEARCHDIALOG, + String( SfxResId( STR_HELP_BUTTON_SEARCHDIALOG ) ), + Image( SfxResId( IMG_HELP_TOOLBOX_SEARCHDIALOG ) ) + ); aMenu.SetHelpId( TBI_SEARCHDIALOG, HID_HELP_TOOLBOXITEM_SEARCHDIALOG ); aMenu.InsertSeparator(); aMenu.InsertItem( TBI_SELECTIONMODE, String( SfxResId( STR_HELP_MENU_TEXT_SELECTION_MODE ) ) ); @@ -2637,8 +2641,10 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) aMenu.CheckItem(TBI_SELECTIONMODE, bCheck); } aMenu.InsertSeparator(); - aMenu.InsertItem( TBI_COPY, String( SfxResId( STR_HELP_MENU_TEXT_COPY ) ), - Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_COPY : IMG_HELP_TOOLBOX_COPY ) ) ); + aMenu.InsertItem( TBI_COPY, + String( SfxResId( STR_HELP_MENU_TEXT_COPY ) ), + Image( SfxResId( IMG_HELP_TOOLBOX_COPY ) ) + ); aMenu.SetHelpId( TBI_COPY, SID_COPY ); aMenu.EnableItem( TBI_COPY, HasSelection() ); diff --git a/sfx2/source/appl/newhelp.src b/sfx2/source/appl/newhelp.src index 8a2b4f760f7e..c59eb50b193b 100644 --- a/sfx2/source/appl/newhelp.src +++ b/sfx2/source/appl/newhelp.src @@ -207,113 +207,118 @@ Image IMG_HELP_TOOLBOX_INDEX_ON ImageBitmap = Bitmap { File = "indexon_small.bmp" ; }; MASKCOLOR_MAGENTA }; + Image IMG_HELP_TOOLBOX_INDEX_OFF { ImageBitmap = Bitmap { File = "indexoff_small.bmp" ; }; MASKCOLOR_MAGENTA }; + Image IMG_HELP_TOOLBOX_START { ImageBitmap = Bitmap { File = "sc06303.bmp" ; }; MASKCOLOR_MAGENTA }; + Image IMG_HELP_TOOLBOX_PREV { ImageBitmap = Bitmap { File = "sc06301.bmp" ; }; MASKCOLOR_MAGENTA }; + Image IMG_HELP_TOOLBOX_NEXT { ImageBitmap = Bitmap { File = "sc06300.bmp" ; }; MASKCOLOR_MAGENTA }; + Image IMG_HELP_TOOLBOX_PRINT { ImageBitmap = Bitmap { File = "sc05504.bmp" ; }; MASKCOLOR_MAGENTA }; + Image IMG_HELP_TOOLBOX_BOOKMARKS { ImageBitmap = Bitmap { File = "favourite.bmp" ; }; MASKCOLOR_MAGENTA }; + Image IMG_HELP_TOOLBOX_SEARCHDIALOG { ImageBitmap = Bitmap { File = "sc05961.bmp" ; }; MASKCOLOR_MAGENTA }; + Image IMG_HELP_TOOLBOX_COPY { ImageBitmap = Bitmap { File = "sc05711.bmp" ; }; MASKCOLOR_MAGENTA }; + Image IMG_HELP_CONTENT_BOOK_OPEN { ImageBitmap = Bitmap { File = "hlpbookopen.bmp" ; }; MASKCOLOR_MAGENTA }; -Image IMG_HELP_CONTENT_BOOK_OPEN_HC -{ - ImageBitmap = Bitmap { File = "hlpbookopen_h.bmp" ; }; - MASKCOLOR_MAGENTA -}; + Image IMG_HELP_CONTENT_BOOK_CLOSED { ImageBitmap = Bitmap { File = "hlpbookclosed.bmp" ; }; MASKCOLOR_MAGENTA }; -Image IMG_HELP_CONTENT_BOOK_CLOSED_HC -{ - ImageBitmap = Bitmap { File = "hlpbookclosed_h.bmp" ; }; - MASKCOLOR_MAGENTA -}; + Image IMG_HELP_CONTENT_DOC { ImageBitmap = Bitmap { File = "hlpdoc.bmp" ; }; MASKCOLOR_MAGENTA }; -Image IMG_HELP_CONTENT_DOC_HC -{ - ImageBitmap = Bitmap { File = "hlpdoc_h.bmp" ; }; - MASKCOLOR_MAGENTA -}; String STR_HELP_WINDOW_TITLE { Text [ en-US ] = "%PRODUCTNAME Help"; }; + String STR_HELP_BUTTON_INDEX_ON { Text [ en-US ] = "Show Navigation Pane"; }; + String STR_HELP_BUTTON_INDEX_OFF { Text [ en-US ] = "Hide Navigation Pane"; }; + String STR_HELP_BUTTON_START { Text [ en-US ] = "First Page"; }; + String STR_HELP_BUTTON_PREV { Text [ en-US ] = "Previous Page"; }; + String STR_HELP_BUTTON_NEXT { Text [ en-US ] = "Next Page"; }; + String STR_HELP_BUTTON_PRINT { Text [ en-US ] = "Print..."; }; + String STR_HELP_BUTTON_ADDBOOKMARK { Text [ en-US ] = "Add to Bookmarks..."; }; + String STR_HELP_BUTTON_SEARCHDIALOG { Text [ en-US ] = "Find on this Page..."; }; + String STR_HELP_BUTTON_SOURCEVIEW { Text [ en-US ] = "HTML Source"; @@ -323,18 +328,22 @@ String STR_HELP_FIRST_MESSAGE { Text [ en-US ] = "The Help is being started..."; }; + String STR_HELP_FIRST_HTML { Text = "<html></head><body><center><br></br><br></br><p><tt>%1</tt></center></body></html>"; }; + String STR_HELP_MENU_TEXT_SELECTION_MODE { Text [ en-US ] = "Select Text"; }; + String STR_HELP_MENU_TEXT_COPY { Text [ en-US ] = "~Copy" ; }; + ModalDialog DLG_HELP_ADDBOOKMARK { Size = MAP_APPFONT ( 208 , 43 ) ; @@ -428,144 +437,60 @@ InfoBox RID_INFO_NOSEARCHTEXTFOUND Message [ en-US ] = "The text you entered was not found."; }; -Image IMG_HELP_TOOLBOX_HC_INDEX_ON -{ - ImageBitmap = Bitmap { File = "indexon_small_h.bmp" ; }; - MASKCOLOR_MAGENTA -}; -Image IMG_HELP_TOOLBOX_HC_INDEX_OFF -{ - ImageBitmap = Bitmap { File = "indexoff_small_h.bmp" ; }; - MASKCOLOR_MAGENTA -}; -Image IMG_HELP_TOOLBOX_HC_START -{ - ImageBitmap = Bitmap { File = "sch06303.bmp" ; }; - MASKCOLOR_MAGENTA -}; -Image IMG_HELP_TOOLBOX_HC_PREV -{ - ImageBitmap = Bitmap { File = "sch06301.bmp" ; }; - MASKCOLOR_MAGENTA -}; -Image IMG_HELP_TOOLBOX_HC_NEXT -{ - ImageBitmap = Bitmap { File = "sch06300.bmp" ; }; - MASKCOLOR_MAGENTA -}; -Image IMG_HELP_TOOLBOX_HC_PRINT -{ - ImageBitmap = Bitmap { File = "sch05504.bmp" ; }; - MASKCOLOR_MAGENTA -}; -Image IMG_HELP_TOOLBOX_HC_BOOKMARKS -{ - ImageBitmap = Bitmap { File = "favourite_h.bmp" ; }; - MASKCOLOR_MAGENTA -}; -Image IMG_HELP_TOOLBOX_HC_SEARCHDIALOG -{ - ImageBitmap = Bitmap { File = "sch05961.bmp" ; }; - MASKCOLOR_MAGENTA -}; -Image IMG_HELP_TOOLBOX_HC_COPY -{ - ImageBitmap = Bitmap { File = "sch05711.bmp" ; }; - MASKCOLOR_MAGENTA -}; - Image IMG_HELP_TOOLBOX_L_INDEX_ON { ImageBitmap = Bitmap { File = "indexon_big.bmp" ; }; MASKCOLOR_MAGENTA }; + Image IMG_HELP_TOOLBOX_L_INDEX_OFF { ImageBitmap = Bitmap { File = "indexoff_big.bmp" ; }; MASKCOLOR_MAGENTA }; + Image IMG_HELP_TOOLBOX_L_START { ImageBitmap = Bitmap { File = "lc06303.bmp" ; }; MASKCOLOR_MAGENTA }; + Image IMG_HELP_TOOLBOX_L_PREV { ImageBitmap = Bitmap { File = "lc06301.bmp" ; }; MASKCOLOR_MAGENTA }; + Image IMG_HELP_TOOLBOX_L_NEXT { ImageBitmap = Bitmap { File = "lc06300.bmp" ; }; MASKCOLOR_MAGENTA }; + Image IMG_HELP_TOOLBOX_L_PRINT { ImageBitmap = Bitmap { File = "lc05504.bmp" ; }; MASKCOLOR_MAGENTA }; + Image IMG_HELP_TOOLBOX_L_BOOKMARKS { ImageBitmap = Bitmap { File = "favourite_big.bmp" ; }; MASKCOLOR_MAGENTA }; + Image IMG_HELP_TOOLBOX_L_SEARCHDIALOG { ImageBitmap = Bitmap { File = "lc05961.bmp" ; }; MASKCOLOR_MAGENTA }; + Image IMG_HELP_TOOLBOX_L_COPY { ImageBitmap = Bitmap { File = "lc05711.bmp" ; }; MASKCOLOR_MAGENTA }; -Image IMG_HELP_TOOLBOX_HCL_INDEX_ON -{ - ImageBitmap = Bitmap { File = "indexon_big_h.bmp" ; }; - MASKCOLOR_MAGENTA -}; -Image IMG_HELP_TOOLBOX_HCL_INDEX_OFF -{ - ImageBitmap = Bitmap { File = "indexoff_big_h.bmp" ; }; - MASKCOLOR_MAGENTA -}; -Image IMG_HELP_TOOLBOX_HCL_START -{ - ImageBitmap = Bitmap { File = "lch06303.bmp" ; }; - MASKCOLOR_MAGENTA -}; -Image IMG_HELP_TOOLBOX_HCL_PREV -{ - ImageBitmap = Bitmap { File = "lch06301.bmp" ; }; - MASKCOLOR_MAGENTA -}; -Image IMG_HELP_TOOLBOX_HCL_NEXT -{ - ImageBitmap = Bitmap { File = "lch06300.bmp" ; }; - MASKCOLOR_MAGENTA -}; -Image IMG_HELP_TOOLBOX_HCL_PRINT -{ - ImageBitmap = Bitmap { File = "lch05504.bmp" ; }; - MASKCOLOR_MAGENTA -}; -Image IMG_HELP_TOOLBOX_HCL_BOOKMARKS -{ - ImageBitmap = Bitmap { File = "favourite_big_h.bmp" ; }; - MASKCOLOR_MAGENTA -}; -Image IMG_HELP_TOOLBOX_HCL_SEARCHDIALOG -{ - ImageBitmap = Bitmap { File = "lch05961.bmp" ; }; - MASKCOLOR_MAGENTA -}; -Image IMG_HELP_TOOLBOX_HCL_COPY -{ - ImageBitmap = Bitmap { File = "lch05711.bmp" ; }; - MASKCOLOR_MAGENTA -}; - CheckBox RID_HELP_ONSTARTUP_BOX { HelpId = HID_HELP_ONSTARTUP_BOX; @@ -573,8 +498,8 @@ CheckBox RID_HELP_ONSTARTUP_BOX TabStop = TRUE; Size = MAP_APPFONT ( 200 , 10 ) ; }; + String RID_HELP_ONSTARTUP_TEXT { Text [ en-US ] = "~Display %PRODUCTNAME %MODULENAME Help at Startup"; }; - diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc index 7f03bf416431..08940391ac87 100644 --- a/sfx2/source/dialog/dialog.hrc +++ b/sfx2/source/dialog/dialog.hrc @@ -65,8 +65,6 @@ #define RID_ERRBOX_MAIL_CONFIG ( RC_DIALOG_BEGIN + 92 ) -#define IMG_LST_STYLE_DESIGNER_HC ( RC_DIALOG_BEGIN + 99 ) - // 100-106 in tbxcust.hrc #define STR_MACRO_LOSS ( RC_DIALOG_BEGIN + 107 ) #define STR_CANCEL_RECORDING ( RC_DIALOG_BEGIN + 108 ) diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index aa3fd67dbbec..f6c3c046deae 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -2417,9 +2417,7 @@ void SfxTemplateDialog_Impl::updateFamilyImages() // ------------------------------------------------------------------------ void SfxTemplateDialog_Impl::updateNonFamilyImages() { - m_aActionTbR.SetImageList( ImageList( SfxResId( - m_pFloat->GetSettings().GetStyleSettings().GetHighContrastMode() ? IMG_LST_STYLE_DESIGNER_HC - : DLG_STYLE_DESIGNER ) ) ); + m_aActionTbR.SetImageList( ImageList( SfxResId( DLG_STYLE_DESIGNER ) ) ); } // ------------------------------------------------------------------------ diff --git a/sfx2/source/dialog/templdlg.src b/sfx2/source/dialog/templdlg.src index a4adcd77b6d3..fcd6d33e55c6 100644 --- a/sfx2/source/dialog/templdlg.src +++ b/sfx2/source/dialog/templdlg.src @@ -42,18 +42,7 @@ ImageList DLG_STYLE_DESIGNER }; IdCount = { 3 ; }; }; -ImageList IMG_LST_STYLE_DESIGNER_HC -{ - Prefix = "sch"; - MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; - IdList = - { - SID_STYLE_WATERCAN ; - SID_STYLE_NEW_BY_EXAMPLE ; - SID_STYLE_UPDATE_BY_EXAMPLE ; - }; - IdCount = { 3 ; }; -}; + // RID_STYLECATALOG ------------------------------------------------------ ModalDialog RID_STYLECATALOG { @@ -136,11 +125,13 @@ ModalDialog RID_STYLECATALOG DropDown = TRUE ; }; }; + // Strings --------------------------------------------------------------- String STR_STYLE_FILTER_HIERARCHICAL { Text [ en-US ] = "Hierarchical" ; }; + // DLG_STYLE_DESIGNER ---------------------------------------------------- DockingWindow DLG_STYLE_DESIGNER { diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx index 642aabbb0d68..ed5940cace31 100644 --- a/sfx2/source/dialog/titledockwin.cxx +++ b/sfx2/source/dialog/titledockwin.cxx @@ -251,12 +251,7 @@ namespace sfx2 // Get the closer bitmap and set it as right most button. Image aImage( SfxResId( SFX_IMG_CLOSE_DOC ) ); - Image aImageHC( SfxResId( SFX_IMG_CLOSE_DOC_HC ) ); - m_aToolbox.InsertItem( 1, - GetSettings().GetStyleSettings().GetHighContrastMode() - ? aImageHC - : aImage - ); + m_aToolbox.InsertItem( 1, aImage ); m_aToolbox.ShowItem( 1 ); } diff --git a/sfx2/source/dialog/titledockwin.src b/sfx2/source/dialog/titledockwin.src index 3f52e84ab75d..ede6c4b8c4d1 100644 --- a/sfx2/source/dialog/titledockwin.src +++ b/sfx2/source/dialog/titledockwin.src @@ -31,9 +31,3 @@ Image SFX_IMG_CLOSE_DOC { ImageBitmap = Bitmap { File = "closedoc.png" ; }; }; - -Image SFX_IMG_CLOSE_DOC_HC -{ - ImageBitmap = Bitmap { File = "closedochc.png" ; }; -}; - diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index 975362305756..b03efa255725 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -157,9 +157,6 @@ void SfxPreviewWin_Impl::ImpPaint( pWindow->SetLineColor( aBlackCol ); pWindow->SetFillColor( aWhiteCol ); pWindow->DrawRect( Rectangle( aPoint + Point( FRAME, FRAME ), bPoint + Point( FRAME, FRAME ) ) ); -//! pFile->Move( Point( FRAME, FRAME ) ); -//! pFile->Scale( Fraction( aTmpSize.Width(), aSize.Width() ), -//! Fraction( aTmpSize.Height(), aSize.Height() ) ); pFile->WindStart(); pFile->Play( pWindow, aPoint + Point( FRAME, FRAME ), aSize ); } diff --git a/sfx2/source/inc/sfxlocal.hrc b/sfx2/source/inc/sfxlocal.hrc index 202ed6f6f00f..7096d71fabdc 100644 --- a/sfx2/source/inc/sfxlocal.hrc +++ b/sfx2/source/inc/sfxlocal.hrc @@ -69,7 +69,6 @@ #define SFX_IMG_PROPERTY_REMOVE (RID_SFX_SFXLOCAL_START + 0) #define SFX_IMG_PROPERTY_REMOVE_HC (RID_SFX_SFXLOCAL_START + 1) #define SFX_IMG_CLOSE_DOC (RID_SFX_SFXLOCAL_START + 2) -#define SFX_IMG_CLOSE_DOC_HC (RID_SFX_SFXLOCAL_START + 3) #endif diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx index 7dc74d5b0fc8..6fbae6a6b99e 100644 --- a/sfx2/source/toolbox/imgmgr.cxx +++ b/sfx2/source/toolbox/imgmgr.cxx @@ -84,10 +84,6 @@ typedef std::hash_map< sal_Int64, sal_Int64 > SfxImageManagerMap; static SfxImageManager_Impl* pGlobalImageManager = 0; static SfxImageManagerMap m_ImageManager_ImplMap; static SfxImageManagerMap m_ImageManagerMap; -static ImageList* pImageListSmall=0; -static ImageList* pImageListBig=0; -static ImageList* pImageListHiSmall=0; -static ImageList* pImageListHiBig=0; static SfxImageManager_Impl* GetImageManager( SfxModule* pModule ) { @@ -118,40 +114,32 @@ static SfxImageManager_Impl* GetImageManager( SfxModule* pModule ) } // Global image list -static ImageList* GetImageList( BOOL bBig, BOOL bHiContrast ) +static ImageList* GetImageList( BOOL bBig ) { SolarMutexGuard aGuard; + ImageList* rpList = NULL; - // Has to be changed if we know how the IDs are named!!! - ImageList*& rpList = bBig ? ( bHiContrast ? pImageListHiBig : pImageListBig ) : - ( bHiContrast ? pImageListHiSmall : pImageListSmall ); - if ( !rpList ) - { - ResMgr *pResMgr = SfxApplication::GetOrCreate()->GetOffResManager_Impl(); + ResMgr *pResMgr = SfxApplication::GetOrCreate()->GetOffResManager_Impl(); - ResId aResId( bBig ? ( bHiContrast ? RID_DEFAULTIMAGELIST_LCH : RID_DEFAULTIMAGELIST_LC ) : - ( bHiContrast ? RID_DEFAULTIMAGELIST_SCH : RID_DEFAULTIMAGELIST_SC ), *pResMgr); + ResId aResId( bBig ? ( RID_DEFAULTIMAGELIST_LC ) : ( RID_DEFAULTIMAGELIST_SC ), *pResMgr); - aResId.SetRT( RSC_IMAGELIST ); + aResId.SetRT( RSC_IMAGELIST ); - DBG_ASSERT( pResMgr->IsAvailable(aResId), "No default ImageList!" ); + DBG_ASSERT( pResMgr->IsAvailable(aResId), "No default ImageList!" ); - if ( pResMgr->IsAvailable(aResId) ) - rpList = new ImageList( aResId ); - else - rpList = new ImageList(); - } + if ( pResMgr->IsAvailable(aResId) ) + rpList = new ImageList( aResId ); + else + rpList = new ImageList(); return rpList; } -static sal_Int16 impl_convertBools( sal_Bool bLarge, sal_Bool bHiContrast ) +static sal_Int16 impl_convertBools( sal_Bool bLarge ) { sal_Int16 nIndex( 0 ); if ( bLarge ) nIndex += 1; - if ( bHiContrast ) - nIndex += 2; return nIndex; } @@ -183,11 +171,11 @@ SfxImageManager_Impl::~SfxImageManager_Impl() ImageList* SfxImageManager_Impl::GetImageList( BOOL bBig, BOOL bHiContrast ) { - sal_Int32 nIndex = impl_convertBools( bBig, bHiContrast ); + sal_Int32 nIndex = impl_convertBools( bBig ); if ( !m_pImageList[nIndex] ) { if ( !m_pModule ) - m_pImageList[nIndex] = ::GetImageList( bBig, bHiContrast ); + m_pImageList[nIndex] = ::GetImageList( bBig ); else m_pImageList[nIndex] = m_pModule->GetImageList_Impl( bBig, bHiContrast ); } diff --git a/svx/inc/fontworkgallery.hrc b/svx/inc/fontworkgallery.hrc index e03c04d0f1ca..7b2f93647217 100644 --- a/svx/inc/fontworkgallery.hrc +++ b/svx/inc/fontworkgallery.hrc @@ -51,22 +51,12 @@ #define STR_CHARS_SPACING_KERN_PAIRS 12 #define IMG_FONTWORK_ALIGN_LEFT_16 1 -#define IMG_FONTWORK_ALIGN_LEFT_16_H 2 #define IMG_FONTWORK_ALIGN_LEFT_26 3 -#define IMG_FONTWORK_ALIGN_LEFT_26_H 4 #define IMG_FONTWORK_ALIGN_CENTER_16 5 -#define IMG_FONTWORK_ALIGN_CENTER_16_H 6 #define IMG_FONTWORK_ALIGN_CENTER_26 7 -#define IMG_FONTWORK_ALIGN_CENTER_26_H 8 #define IMG_FONTWORK_ALIGN_RIGHT_16 9 -#define IMG_FONTWORK_ALIGN_RIGHT_16_H 10 #define IMG_FONTWORK_ALIGN_RIGHT_26 11 -#define IMG_FONTWORK_ALIGN_RIGHT_26_H 12 #define IMG_FONTWORK_ALIGN_WORD_16 13 -#define IMG_FONTWORK_ALIGN_WORD_16_H 14 #define IMG_FONTWORK_ALIGN_WORD_26 15 -#define IMG_FONTWORK_ALIGN_WORD_26_H 16 #define IMG_FONTWORK_ALIGN_STRETCH_16 17 -#define IMG_FONTWORK_ALIGN_STRETCH_16_H 18 #define IMG_FONTWORK_ALIGN_STRETCH_26 19 -#define IMG_FONTWORK_ALIGN_STRETCH_26_H 20 diff --git a/svx/inc/gallery.hrc b/svx/inc/gallery.hrc index 852b1f14c7de..8405bb2b6238 100644 --- a/svx/inc/gallery.hrc +++ b/svx/inc/gallery.hrc @@ -81,8 +81,6 @@ #define RID_SVXBMP_THEME_DEFAULT (RID_SVX_GALLERY_START + 54) #define RID_SVXIMG_GALLERY_VIEW_ICON (RID_SVX_GALLERY_START + 56) #define RID_SVXIMG_GALLERY_VIEW_LIST (RID_SVX_GALLERY_START + 57) -#define RID_SVXIMG_GALLERY_VIEW_ICON_HC (RID_SVX_GALLERY_START + 58) -#define RID_SVXIMG_GALLERY_VIEW_LIST_HC (RID_SVX_GALLERY_START + 59) // Gallery-Bitmaps fuer Sounds #define RID_SVXBMP_GALLERY_SOUND_0 (RID_SVX_GALLERY_START + 61) diff --git a/svx/inc/imapdlg.hxx b/svx/inc/imapdlg.hxx index c0338637b67b..e456335adfde 100644 --- a/svx/inc/imapdlg.hxx +++ b/svx/inc/imapdlg.hxx @@ -126,7 +126,6 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow ComboBox maCbbTarget; StatusBar aStbStatus; ImageList maImageList; - ImageList maImageListH; Size aLastSize; IMapWindow* pIMapWnd; diff --git a/svx/inc/svx/bmpmask.hxx b/svx/inc/svx/bmpmask.hxx index 2ff4d1b7db5c..f7be657b8d0b 100644 --- a/svx/inc/svx/bmpmask.hxx +++ b/svx/inc/svx/bmpmask.hxx @@ -128,7 +128,6 @@ class SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow SvxBmpMaskSelectItem aSelItem; Image maImgPipette; - Image maImgPipetteH; virtual BOOL Close(); diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc index 530a079c3de3..49fab5aafa9f 100755 --- a/svx/inc/svx/dialogs.hrc +++ b/svx/inc/svx/dialogs.hrc @@ -180,7 +180,6 @@ #define RID_SVXSW_FRAMEPOSITIONS (RID_SVX_START + 289) #define RID_SVXIL_FRAME (RID_SVX_START + 65) -#define RID_SVXIL_FRAME_HC (RID_SVX_START + 66) #define RID_SVXDLG_3D (RID_SVX_START + 70) #define RID_SVXPAGE_LIGHT3D (RID_SVX_START + 71) @@ -225,18 +224,12 @@ #define RID_SVXBMP_SIZE (RID_SVX_START + 86) #define RID_SVXBMP_SIGNET (RID_SVX_START + 87) -#define RID_SVXBMP_SIGNET_H (RID_SVX_START + 88) #define RID_SVXBMP_SIGNET_BROKEN (RID_SVX_START + 89) -#define RID_SVXBMP_SIGNET_BROKEN_H (RID_SVX_START + 90) #define RID_SVXBMP_SIGNET_NOTVALIDATED (RID_SVX_START + 91) -#define RID_SVXBMP_SIGNET_NOTVALIDATED_H (RID_SVX_START + 92) -#define RID_SVXBMP_SLIDERBUTTON (RID_SVX_START + 67) -#define RID_SVXBMP_SLIDERDECREASE (RID_SVX_START + 68) -#define RID_SVXBMP_SLIDERINCREASE (RID_SVX_START + 69) -#define RID_SVXBMP_SLIDERBUTTON_HC (RID_SVX_START + 70) -#define RID_SVXBMP_SLIDERDECREASE_HC (RID_SVX_START + 71) -#define RID_SVXBMP_SLIDERINCREASE_HC (RID_SVX_START + 72) +#define RID_SVXBMP_SLIDERBUTTON (RID_SVX_START + 67) +#define RID_SVXBMP_SLIDERDECREASE (RID_SVX_START + 68) +#define RID_SVXBMP_SLIDERINCREASE (RID_SVX_START + 69) // Resource with bitmaps for the CheckListBox #define RID_CHECKLISTBOX_BITMAPS (RID_SVX_START + 91) @@ -354,18 +347,6 @@ #define RID_SVXDLG_RUBY (RID_SVX_START + 247) -#define RID_SVXBMP_FONTWORK_FORM1_H (RID_SVX_START + 260) -#define RID_SVXBMP_FONTWORK_FORM2_H (RID_SVX_START + 261) -#define RID_SVXBMP_FONTWORK_FORM3_H (RID_SVX_START + 262) -#define RID_SVXBMP_FONTWORK_FORM4_H (RID_SVX_START + 263) -#define RID_SVXBMP_FONTWORK_FORM5_H (RID_SVX_START + 264) -#define RID_SVXBMP_FONTWORK_FORM6_H (RID_SVX_START + 265) -#define RID_SVXBMP_FONTWORK_FORM7_H (RID_SVX_START + 266) -#define RID_SVXBMP_FONTWORK_FORM8_H (RID_SVX_START + 267) -#define RID_SVXBMP_FONTWORK_FORM9_H (RID_SVX_START + 268) -#define RID_SVXBMP_FONTWORK_FORM10_H (RID_SVX_START + 269) -#define RID_SVXBMP_FONTWORK_FORM11_H (RID_SVX_START + 270) -#define RID_SVXBMP_FONTWORK_FORM12_H (RID_SVX_START + 271) #define RID_SVXIMG_GRAF_RED_H (RID_SVX_START + 276) #define RID_SVXIMG_GRAF_GREEN_H (RID_SVX_START + 277) #define RID_SVXIMG_GRAF_BLUE_H (RID_SVX_START + 278) @@ -373,7 +354,6 @@ #define RID_SVXIMG_GRAF_CONTRAST_H (RID_SVX_START + 280) #define RID_SVXIMG_GRAF_GAMMA_H (RID_SVX_START + 281) #define RID_SVXIMG_GRAF_TRANSPARENCE_H (RID_SVX_START + 282) -#define RID_SVXIMG_CHECKED_H (RID_SVX_START + 285) #define RID_SVXDLG_TEXTCONTROL_CHARATTR (RID_SVX_START + 286) #define RID_SVXDLG_TEXTCONTROL_PARAATTR (RID_SVX_START + 287) diff --git a/svx/inc/svx/fontwork.hxx b/svx/inc/svx/fontwork.hxx index 47ad6b9404aa..0594e032f4cb 100644 --- a/svx/inc/svx/fontwork.hxx +++ b/svx/inc/svx/fontwork.hxx @@ -134,7 +134,6 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow long nSaveShadowSize; ImageList maImageList; - ImageList maImageListH; const XColorTable* pColorTable; diff --git a/svx/inc/svx/langbox.hxx b/svx/inc/svx/langbox.hxx index 280b26abea4e..50ae2c66f160 100644 --- a/svx/inc/svx/langbox.hxx +++ b/svx/inc/svx/langbox.hxx @@ -68,7 +68,6 @@ public: private: Image m_aNotCheckedImage; Image m_aCheckedImage; - Image m_aCheckedImageHC; String m_aAllString; com::sun::star::uno::Sequence< INT16 > *m_pSpellUsedLang; SvtLanguageTable* m_pLangTable; diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index ef1e74804534..aee42601a278 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -447,8 +447,7 @@ SvxBmpMask::SvxBmpMask( SfxBindings *pBindinx, pColTab ( NULL ), aPipetteColor ( COL_WHITE ), aSelItem ( SID_BMPMASK_EXEC, *this, *pBindinx ), - maImgPipette ( BMP_RESID ( IMG_PIPETTE ) ), - maImgPipetteH ( BMP_RESID ( IMG_PIPETTE_H ) ) + maImgPipette ( BMP_RESID ( IMG_PIPETTE ) ) { FreeResource(); @@ -1210,9 +1209,7 @@ void SvxBmpMask::DataChanged( const DataChangedEvent& rDCEvt ) void SvxBmpMask::ApplyStyle() { - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - - aTbxPipette.SetItemImage( TBI_PIPETTE, bHighContrast ? maImgPipetteH : maImgPipette ); + aTbxPipette.SetItemImage( TBI_PIPETTE, maImgPipette ); } diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 47d26c3c1eab..894560e78e9a 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -397,8 +397,7 @@ SvxSuperContourDlg::SvxSuperContourDlg( SfxBindings *_pBindings, SfxChildWindow nGrfChanged ( 0UL ), bExecState ( FALSE ), bGraphicLinked ( FALSE ), - maImageList ( SVX_RES( CD_IMAPDLG ) ), - maImageListH ( SVX_RES( CDH_IMAPDLG ) ) + maImageList ( SVX_RES( CD_IMAPDLG ) ) { ApplyImageList(); @@ -1129,9 +1128,7 @@ IMPL_LINK( SvxSuperContourDlg, WorkplaceClickHdl, ContourWindow*, pWnd ) void SvxSuperContourDlg::ApplyImageList() { - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - - ImageList& rImgLst = bHighContrast ? maImageListH : maImageList; + ImageList& rImgLst = maImageList; aTbx1.SetImageList( rImgLst ); } @@ -1152,7 +1149,7 @@ void SvxSuperContourDlg::DataChanged( const DataChangedEvent& rDCEvt ) IMPL_LINK( SvxSuperContourDlg, MiscHdl, void*, EMPTYARG ) { - SvtMiscOptions aMiscOptions; + SvtMiscOptions aMiscOptions; aTbx1.SetOutStyle( aMiscOptions.GetToolboxStyle() ); return 0L; diff --git a/svx/source/dialog/bmpmask.hrc b/svx/source/dialog/bmpmask.hrc index 99c9eab04b7b..f204cfcbf8f7 100644 --- a/svx/source/dialog/bmpmask.hrc +++ b/svx/source/dialog/bmpmask.hrc @@ -57,6 +57,3 @@ #define FT_2 2 #define FT_3 3 #define IMG_PIPETTE 11 -#define IMG_PIPETTE_H 12 - - diff --git a/svx/source/dialog/bmpmask.src b/svx/source/dialog/bmpmask.src index 616e7b39fbe4..7ac9ae4d1470 100644 --- a/svx/source/dialog/bmpmask.src +++ b/svx/source/dialog/bmpmask.src @@ -293,11 +293,6 @@ DockingWindow RID_SVXDLG_BMPMASK MASKCOLOR }; - Image IMG_PIPETTE_H - { - ImageBitmap = Bitmap { File = "sc10350_h.bmp" ; }; - MASKCOLOR - }; }; String RID_SVXDLG_BMPMASK_STR_TRANSP diff --git a/svx/source/dialog/contdlg.hrc b/svx/source/dialog/contdlg.hrc index a191231daa22..4aba6fc629cc 100644 --- a/svx/source/dialog/contdlg.hrc +++ b/svx/source/dialog/contdlg.hrc @@ -65,7 +65,6 @@ #define STB_STATUS 1 #define CD_IMAPDLG 1300 -#define CDH_IMAPDLG 1301 /******************************************************************************/ diff --git a/svx/source/dialog/contdlg.src b/svx/source/dialog/contdlg.src index 1b1923c66eab..9a9372a2bd0a 100644 --- a/svx/source/dialog/contdlg.src +++ b/svx/source/dialog/contdlg.src @@ -223,30 +223,29 @@ FloatingWindow RID_SVXDLG_CONTOUR MASKCOLOR CONTOURDLG_IDLIST }; - ImageList CDH_IMAPDLG - { - Prefix = "cdh"; - MASKCOLOR - CONTOURDLG_IDLIST - }; }; + /******************************************************************************/ String STR_CONTOURDLG_MODIFY { Text [ en-US ] = "The contour has been modified.\nDo you want to save the changes?" ; }; + String STR_CONTOURDLG_NEWPIPETTE { Text [ en-US ] = "Do you want to create a new contour?" ; }; + String STR_CONTOURDLG_WORKPLACE { Text [ en-US ] = "Setting a new workspace will\ncause the contour to be deleted.\nAre you sure you want to continue?" ; }; + String STR_CONTOURDLG_LINKED { Text [ en-US ] = "This graphic object is linked to the document. Do you want to unlink the graphics in order to edit it?" ; }; + /******************************************************************************/ diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx index be3bfaf223bd..278b38d61270 100644 --- a/svx/source/dialog/contimp.hxx +++ b/svx/source/dialog/contimp.hxx @@ -67,7 +67,6 @@ class SvxSuperContourDlg : public SvxContourDlg BOOL bUpdateGraphicLinked; BOOL bGraphicLinked; ImageList maImageList; - ImageList maImageListH; virtual void Resize(); virtual BOOL Close(); diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 7ac2e5a84e93..9f31e10848bb 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -913,16 +913,12 @@ void RecovDocListEntry::Paint(const Point& aPos , const String* pTxt = 0; RecovDocList* pList = static_cast< RecovDocList* >(&aDevice); - BOOL bHC = aDevice.GetSettings().GetStyleSettings().GetHighContrastMode(); - TURLInfo* pInfo = (TURLInfo*)pEntry->GetUserData(); switch(pInfo->RecoveryState) { case E_SUCCESSFULLY_RECOVERED : { pImg = &pList->m_aGreenCheckImg; - if (bHC) - pImg = &pList->m_aGreenCheckImgHC; pTxt = &pList->m_aSuccessRecovStr; } break; @@ -930,8 +926,6 @@ void RecovDocListEntry::Paint(const Point& aPos , case E_ORIGINAL_DOCUMENT_RECOVERED : // TODO must be renamed into ORIGINAL DOCUMENT recovered! Because its marked as yellow { pImg = &pList->m_aYellowCheckImg; - if (bHC) - pImg = &pList->m_aYellowCheckImgHC; pTxt = &pList->m_aOrigDocRecovStr; } break; @@ -939,8 +933,6 @@ void RecovDocListEntry::Paint(const Point& aPos , case E_RECOVERY_FAILED : { pImg = &pList->m_aRedCrossImg; - if (bHC) - pImg = &pList->m_aRedCrossImgHC; pTxt = &pList->m_aRecovFailedStr; } break; @@ -980,9 +972,6 @@ RecovDocList::RecovDocList( Window* pParent, , m_aGreenCheckImg ( ResId(IMG_GREENCHECK,*rResId.GetResMgr() ) ) , m_aYellowCheckImg ( ResId(IMG_YELLOWCHECK,*rResId.GetResMgr() ) ) , m_aRedCrossImg ( ResId(IMG_REDCROSS,*rResId.GetResMgr() ) ) - , m_aGreenCheckImgHC ( ResId(IMG_GREENCHECK_HC,*rResId.GetResMgr() ) ) - , m_aYellowCheckImgHC ( ResId(IMG_YELLOWCHECK_HC,*rResId.GetResMgr() ) ) - , m_aRedCrossImgHC ( ResId(IMG_REDCROSS_HC,*rResId.GetResMgr() ) ) , m_aSuccessRecovStr ( ResId(STR_SUCCESSRECOV,*rResId.GetResMgr() ) ) , m_aOrigDocRecovStr ( ResId(STR_ORIGDOCRECOV,*rResId.GetResMgr() ) ) , m_aRecovFailedStr ( ResId(STR_RECOVFAILED,*rResId.GetResMgr() ) ) diff --git a/svx/source/dialog/docrecovery.hrc b/svx/source/dialog/docrecovery.hrc index 18148131f6aa..534edf625fa9 100644 --- a/svx/source/dialog/docrecovery.hrc +++ b/svx/source/dialog/docrecovery.hrc @@ -105,9 +105,6 @@ #define IMG_GREENCHECK 14 #define IMG_YELLOWCHECK 15 #define IMG_REDCROSS 16 -#define IMG_GREENCHECK_HC 17 -#define IMG_YELLOWCHECK_HC 18 -#define IMG_REDCROSS_HC 19 #define STR_SUCCESSRECOV 20 #define STR_ORIGDOCRECOV 21 #define STR_RECOVFAILED 22 diff --git a/svx/source/dialog/docrecovery.src b/svx/source/dialog/docrecovery.src index 7c1532b71b55..2da85bc8c591 100644 --- a/svx/source/dialog/docrecovery.src +++ b/svx/source/dialog/docrecovery.src @@ -211,26 +211,14 @@ TabPage RID_SVXPAGE_DOCRECOVERY_RECOVER { ImageBitmap = Bitmap { File = "nu01.png"; }; }; - Image IMG_GREENCHECK_HC - { - ImageBitmap = Bitmap { File = "nuh01.png"; }; - }; Image IMG_YELLOWCHECK { ImageBitmap = Bitmap { File = "nu04.png"; }; }; - Image IMG_YELLOWCHECK_HC - { - ImageBitmap = Bitmap { File = "nuh04.png"; }; - }; Image IMG_REDCROSS { ImageBitmap = Bitmap { File = "nu02.png"; }; }; - Image IMG_REDCROSS_HC - { - ImageBitmap = Bitmap { File = "nuh02.png"; }; - }; String STR_SUCCESSRECOV { Text[ en-US ] = "Successfully recovered"; diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index 11cfe4f259c4..d6920a5a55fc 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -249,7 +249,6 @@ SvxFontWorkDialog::SvxFontWorkDialog( SfxBindings *pBindinx, nSaveShadowSize (100), maImageList (ResId(IL_FONTWORK,*rResId.GetResMgr())), - maImageListH (ResId(ILH_FONTWORK,*rResId.GetResMgr())), pColorTable (NULL) { @@ -1226,25 +1225,13 @@ void SvxFontWorkDialog::DataChanged( const DataChangedEvent& rDCEvt ) ---------------------------------------------------------------------------*/ void SvxFontWorkDialog::ApplyImageList() { - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - ResMgr* _pMgr = &DIALOG_MGR(); - USHORT nBitmapResId = bHighContrast ? RID_SVXBMP_FONTWORK_FORM1_H : RID_SVXBMP_FONTWORK_FORM1; + USHORT nBitmapResId = RID_SVXBMP_FONTWORK_FORM1; USHORT nTextResId = RID_SVXSTR_FONTWORK_FORM1; bool bInit = aFormSet.GetItemCount() == 0; - if( bInit ) - { -/* - Size aSize( aTbxStyle.CalcWindowSizePixel() ); - Bitmap aBmp(ResId(RID_SVXBMP_FONTWORK_FORM1,_pMgr)); - aSize.Height() = aFormSet.CalcWindowSizePixel(aBmp.GetSizePixel()).Height() + 2; - aFormSet.SetSizePixel(aSize); -*/ - } - USHORT i; for( i = 1; i < 13; i++, nTextResId++, nBitmapResId++ ) { @@ -1259,7 +1246,7 @@ void SvxFontWorkDialog::ApplyImageList() } } - ImageList& rImgLst = bHighContrast ? maImageListH : maImageList; + ImageList& rImgLst = maImageList; aTbxStyle.SetImageList( rImgLst ); aTbxAdjust.SetImageList( rImgLst ); diff --git a/svx/source/dialog/fontwork.hrc b/svx/source/dialog/fontwork.hrc index cdbc48aa032e..3c696d41da9d 100644 --- a/svx/source/dialog/fontwork.hrc +++ b/svx/source/dialog/fontwork.hrc @@ -40,7 +40,6 @@ #define CLB_SHADOW_COLOR 1 #define IL_FONTWORK 1200 -#define ILH_FONTWORK 1201 // the following ids are also used to identify the // bitmaps for the image list diff --git a/svx/source/dialog/fontwork.src b/svx/source/dialog/fontwork.src index b0c63d9313d4..a8aec80e52bb 100644 --- a/svx/source/dialog/fontwork.src +++ b/svx/source/dialog/fontwork.src @@ -345,12 +345,6 @@ DockingWindow RID_SVXDLG_FONTWORK MaskColor = IMAGE_STDBTN_COLOR ; FONTWORK_IDLIST }; - ImageList ILH_FONTWORK - { - Prefix = "fwh"; - MaskColor = IMAGE_STDBTN_COLOR ; - FONTWORK_IDLIST - }; }; // Bitmaps --------------------------------------------------------------- Bitmap RID_SVXBMP_FONTWORK_FORM1 @@ -402,55 +396,6 @@ Bitmap RID_SVXBMP_FONTWORK_FORM12 File = "fwbuttn4.bmp" ; }; -Bitmap RID_SVXBMP_FONTWORK_FORM1_H -{ - File = "fwthcirc_h.bmp" ; -}; -Bitmap RID_SVXBMP_FONTWORK_FORM2_H -{ - File = "fwbhcirc_h.bmp" ; -}; -Bitmap RID_SVXBMP_FONTWORK_FORM3_H -{ - File = "fwlhcirc_h.bmp" ; -}; -Bitmap RID_SVXBMP_FONTWORK_FORM4_H -{ - File = "fwrhcirc_h.bmp" ; -}; -Bitmap RID_SVXBMP_FONTWORK_FORM5_H -{ - File = "fwtoparc_h.bmp" ; -}; -Bitmap RID_SVXBMP_FONTWORK_FORM6_H -{ - File = "fwbotarc_h.bmp" ; -}; -Bitmap RID_SVXBMP_FONTWORK_FORM7_H -{ - File = "fwlftarc_h.bmp" ; -}; -Bitmap RID_SVXBMP_FONTWORK_FORM8_H -{ - File = "fwrgtarc_h.bmp" ; -}; -Bitmap RID_SVXBMP_FONTWORK_FORM9_H -{ - File = "fwbuttn1_h.bmp" ; -}; -Bitmap RID_SVXBMP_FONTWORK_FORM10_H -{ - File = "fwbuttn2_h.bmp" ; -}; -Bitmap RID_SVXBMP_FONTWORK_FORM11_H -{ - File = "fwbuttn3_h.bmp" ; -}; -Bitmap RID_SVXBMP_FONTWORK_FORM12_H -{ - File = "fwbuttn4_h.bmp" ; -}; - // Strings --------------------------------------------------------------- String RID_SVXSTR_FONTWORK_FORM1 { diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 997f222a0464..5f577bb32aa1 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -198,7 +198,6 @@ SvxIMapDlg::SvxIMapDlg( SfxBindings *_pBindings, SfxChildWindow *pCW, maCbbTarget ( this, SVX_RES( RID_SVXCTL_CBB_TARGET ) ), aStbStatus ( this, WB_BORDER | WB_3DLOOK | WB_LEFT ), maImageList ( SVX_RES( IL_IMAPDLG ) ), - maImageListH ( SVX_RES( ILH_IMAPDLG ) ), pCheckObj ( NULL ), aIMapItem ( SID_IMAP_EXEC, *this, *_pBindings ) { @@ -1034,9 +1033,7 @@ IMPL_LINK( SvxIMapDlg, MiscHdl, void*, EMPTYARG ) void SvxIMapDlg::ApplyImageList() { - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - - ImageList& rImgLst = bHighContrast ? maImageListH : maImageList; + ImageList& rImgLst = maImageList; aTbxIMapDlg1.SetImageList( rImgLst ); } diff --git a/svx/source/dialog/imapdlg.hrc b/svx/source/dialog/imapdlg.hrc index 4a6d322699b5..ecc6b83332cc 100644 --- a/svx/source/dialog/imapdlg.hrc +++ b/svx/source/dialog/imapdlg.hrc @@ -71,7 +71,6 @@ #define STB_STATUS 1 #define IL_IMAPDLG 1024 -#define ILH_IMAPDLG 1025 /******************************************************************************/ diff --git a/svx/source/dialog/imapdlg.src b/svx/source/dialog/imapdlg.src index a61a9e34fa5e..8775acdaaaa2 100644 --- a/svx/source/dialog/imapdlg.src +++ b/svx/source/dialog/imapdlg.src @@ -265,13 +265,8 @@ ModelessDialog RID_SVXDLG_IMAP MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; } ; IMAPDLG_IDLIST }; - ImageList ILH_IMAPDLG - { - Prefix = "idh"; - MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; } ; - IMAPDLG_IDLIST - }; }; + Control RID_SVXCTL_IMAP { Border = TRUE ; diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index c17265151d4c..b2b52dd37e57 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -156,7 +156,6 @@ void SvxLanguageBox::Init() m_pLangTable = new SvtLanguageTable; m_aNotCheckedImage = Image( SVX_RES( RID_SVXIMG_NOTCHECKED ) ); m_aCheckedImage = Image( SVX_RES( RID_SVXIMG_CHECKED ) ); - m_aCheckedImageHC = Image( SVX_RES( RID_SVXIMG_CHECKED_H ) ); m_aAllString = String( SVX_RESSTR( RID_SVXSTR_LANGUAGE_ALL ) ); m_nLangList = LANG_LIST_EMPTY; m_bHasLangNone = FALSE; @@ -202,8 +201,6 @@ USHORT SvxLanguageBox::ImplInsertImgEntry( const String& rEntry, USHORT nPos, bo USHORT nRet = 0; if( !bChecked ) nRet = InsertEntry( rEntry, m_aNotCheckedImage, nPos ); - else if( GetSettings().GetStyleSettings().GetHighContrastMode() ) - nRet = InsertEntry( rEntry, m_aCheckedImageHC, nPos ); else nRet = InsertEntry( rEntry, m_aCheckedImage, nPos ); return nRet; diff --git a/svx/source/dialog/langbox.src b/svx/source/dialog/langbox.src index 79bf1cf010c3..b7cc9c40fce5 100644 --- a/svx/source/dialog/langbox.src +++ b/svx/source/dialog/langbox.src @@ -34,16 +34,12 @@ Image RID_SVXIMG_NOTCHECKED ImageBitmap = Bitmap { File = "notcheck.bmp" ; } ; MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; }; + Image RID_SVXIMG_CHECKED { ImageBitmap = Bitmap { File = "lngcheck.bmp" ; } ; MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; }; -Image RID_SVXIMG_CHECKED_H -{ - ImageBitmap = Bitmap { File = "lngcheck_h.bmp" ; } ; - MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; -}; // ********************************************************************** EOF diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 66fd1a296355..c4b300bc7ae6 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -306,14 +306,12 @@ namespace svxform m_pNaviWin ( _pNaviWin ), m_bHasModel ( false ), m_eGroup ( _eGroup ), - m_TbxImageList ( SVX_RES( IL_TBX_BMPS ) ), - m_TbxHCImageList( SVX_RES( IL_TBX_BMPS_HC ) ) + m_TbxImageList ( SVX_RES( IL_TBX_BMPS ) ) { FreeResource(); - const ImageList& rImageList = - GetBackground().GetColor().IsDark() ? m_TbxHCImageList : m_TbxImageList; + const ImageList& rImageList = m_TbxImageList; m_aToolBox.SetItemImage( TBI_ITEM_ADD, rImageList.GetImage( IID_ITEM_ADD ) ); m_aToolBox.SetItemImage( TBI_ITEM_ADD_ELEMENT, rImageList.GetImage( IID_ITEM_ADD_ELEMENT ) ); m_aToolBox.SetItemImage( TBI_ITEM_ADD_ATTRIBUTE, rImageList.GetImage( IID_ITEM_ADD_ATTRIBUTE ) ); @@ -777,9 +775,7 @@ namespace svxform SvLBoxEntry* XFormsPage::AddEntry( ItemNode* _pNewNode, bool _bIsElement ) { SvLBoxEntry* pParent = m_aItemList.FirstSelected(); - const ImageList& rImageList = GetSettings().GetStyleSettings().GetHighContrastMode() - ? m_pNaviWin->GetItemHCImageList() - : m_pNaviWin->GetItemImageList(); + const ImageList& rImageList = m_pNaviWin->GetItemImageList(); USHORT nImageID = ( _bIsElement ) ? IID_ELEMENT : IID_ATTRIBUTE; Image aImage = rImageList.GetImage( nImageID ); ::rtl::OUString sName; @@ -987,9 +983,7 @@ namespace svxform SvLBoxEntry* XFormsPage::AddEntry( const Reference< XPropertySet >& _rEntry ) { SvLBoxEntry* pEntry = NULL; - const ImageList& rImageList = GetSettings().GetStyleSettings().GetHighContrastMode() - ? m_pNaviWin->GetItemHCImageList() - : m_pNaviWin->GetItemImageList(); + const ImageList& rImageList = m_pNaviWin->GetItemImageList(); Image aImage = rImageList.GetImage( IID_ELEMENT ); ItemNode* pNode = new ItemNode( _rEntry ); @@ -1243,9 +1237,7 @@ namespace svxform m_xUIHelper = Reference< css::xforms::XFormsUIHelper1 >( _xModel, UNO_QUERY ); String sRet; m_bHasModel = true; - const ImageList& rImageList = GetSettings().GetStyleSettings().GetHighContrastMode() - ? m_pNaviWin->GetItemHCImageList() - : m_pNaviWin->GetItemImageList(); + const ImageList& rImageList = m_pNaviWin->GetItemImageList(); switch ( m_eGroup ) { @@ -1561,7 +1553,6 @@ namespace svxform m_bIsNotifyDisabled ( false ), m_aItemImageList ( SVX_RES( IL_ITEM_BMPS ) ), - m_aItemHCImageList ( SVX_RES( IL_ITEM_BMPS_HC ) ), m_xDataListener ( new DataListener( this ) ) { diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src index 1b300c279312..f6265b6b0596 100644 --- a/svx/source/form/datanavi.src +++ b/svx/source/form/datanavi.src @@ -105,12 +105,6 @@ IdCount = { 5 ; } ; MASKCOLOR IMG_LST }; - ImageList IL_TBX_BMPS_HC - { - Prefix = "tbh"; - MASKCOLOR - IMG_LST - }; #undef IMG_LST }; @@ -246,12 +240,6 @@ IdCount = { 6 ; } ; MASKCOLOR IMG_LST2 }; - ImageList IL_ITEM_BMPS_HC - { - Prefix = "dah"; - MASKCOLOR - IMG_LST2 - }; }; QueryBox RID_QRY_REMOVE_MODEL diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 89914e8ff841..0322965e7d14 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -164,20 +164,16 @@ FmParentData::~FmParentData() //======================================================================== TYPEINIT1(FmFormItem, FmParentData); //------------------------------------------------------------------------ -Image FmFormItem::GetImage( BmpColorMode _eMode ) const +Image FmFormItem::GetImage( BmpColorMode /* _eMode */) const { static Image aImage; - static Image aImage_HC; if (!aImage) { ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) ); - ImageList aNavigatorImages_HC( SVX_RES( RID_SVXIMGLIST_FMEXPL_HC ) ); - aImage = aNavigatorImages.GetImage( RID_SVXIMG_FORM ); - aImage_HC = aNavigatorImages_HC.GetImage( RID_SVXIMG_FORM ); } - return ( BMP_COLOR_HIGHCONTRAST == _eMode ) ? aImage_HC : aImage; + return aImage; } //======================================================================== @@ -199,20 +195,16 @@ FmFilterItem* FmFilterItems::Find( const ::sal_Int32 _nFilterComponentIndex ) co } //------------------------------------------------------------------------ -Image FmFilterItems::GetImage( BmpColorMode _eMode ) const +Image FmFilterItems::GetImage( BmpColorMode /* _eMode */ ) const { static Image aImage; - static Image aImage_HC; if (!aImage) { ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) ); - ImageList aNavigatorImages_HC( SVX_RES( RID_SVXIMGLIST_FMEXPL_HC ) ); - aImage = aNavigatorImages.GetImage( RID_SVXIMG_FILTER ); - aImage_HC = aNavigatorImages_HC.GetImage( RID_SVXIMG_FILTER ); } - return ( BMP_COLOR_HIGHCONTRAST == _eMode ) ? aImage_HC : aImage; + return aImage; } //======================================================================== @@ -230,20 +222,16 @@ FmFilterItem::FmFilterItem( const Reference< XMultiServiceFactory >& _rxFactory, } //------------------------------------------------------------------------ -Image FmFilterItem::GetImage( BmpColorMode _eMode ) const +Image FmFilterItem::GetImage( BmpColorMode /* _eMode */ ) const { static Image aImage; - static Image aImage_HC; if (!aImage) { ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) ); - ImageList aNavigatorImages_HC( SVX_RES( RID_SVXIMGLIST_FMEXPL_HC ) ); - aImage = aNavigatorImages.GetImage( RID_SVXIMG_FIELD ); - aImage_HC = aNavigatorImages_HC.GetImage( RID_SVXIMG_FIELD ); } - return ( BMP_COLOR_HIGHCONTRAST == _eMode ) ? aImage_HC : aImage; + return aImage; } //======================================================================== @@ -1172,22 +1160,12 @@ FmFilterNavigator::FmFilterNavigator( Window* pParent ) SetHelpId( HID_FILTER_NAVIGATOR ); { - { - ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) ); - SetNodeBitmaps( - aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ), - aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ), - BMP_COLOR_NORMAL - ); - } - { - ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL_HC ) ); - SetNodeBitmaps( - aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ), - aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ), - BMP_COLOR_HIGHCONTRAST - ); - } + ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) ); + SetNodeBitmaps( + aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ), + aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ), + BMP_COLOR_NORMAL + ); } m_pModel = new FmFilterModel(comphelper::getProcessServiceFactory()); @@ -1235,7 +1213,7 @@ void FmFilterNavigator::UpdateContent(const Reference< XIndexAccess > & xControl if (pEntry) { if (!IsExpanded(pEntry)) - Expand(pEntry); + Expand(pEntry); Select(pEntry, sal_True); } } diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index cd4459ed3e82..a407baddd12b 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -252,7 +252,6 @@ FmEntryData::FmEntryData( const FmEntryData& rEntryData ) pChildList = new FmEntryDataList(); aText = rEntryData.GetText(); m_aNormalImage = rEntryData.GetNormalImage(); - m_aHCImage = rEntryData.GetHCImage(); pParent = rEntryData.GetParent(); FmEntryData* pChildData; @@ -317,16 +316,19 @@ sal_Bool FmEntryData::IsEqualWithoutChilds( FmEntryData* pEntryData ) TYPEINIT1( FmFormData, FmEntryData ); DBG_NAME(FmFormData); //------------------------------------------------------------------------ -FmFormData::FmFormData( const Reference< XForm >& _rxForm, const ImageList& _rNormalImages, const ImageList& _rHCImages, FmFormData* _pParent ) - :FmEntryData( _pParent, _rxForm ) - ,m_xForm( _rxForm ) +FmFormData::FmFormData( + const Reference< XForm >& _rxForm, + const ImageList& _rNormalImages, + FmFormData* _pParent +) +: FmEntryData( _pParent, _rxForm ), + m_xForm( _rxForm ) { DBG_CTOR(FmEntryData,NULL); ////////////////////////////////////////////////////////////////////// // Images setzen m_aNormalImage = _rNormalImages.GetImage( RID_SVXIMG_FORM ); - m_aHCImage = _rHCImages.GetImage( RID_SVXIMG_FORM ); ////////////////////////////////////////////////////////////////////// // Titel setzen @@ -384,16 +386,19 @@ sal_Bool FmFormData::IsEqualWithoutChilds( FmEntryData* pEntryData ) TYPEINIT1( FmControlData, FmEntryData ); DBG_NAME(FmControlData); //------------------------------------------------------------------------ -FmControlData::FmControlData( const Reference< XFormComponent >& _rxComponent, const ImageList& _rNormalImages, const ImageList& _rHCImages, FmFormData* _pParent ) - :FmEntryData( _pParent, _rxComponent ) - ,m_xFormComponent( _rxComponent ) +FmControlData::FmControlData( + const Reference< XFormComponent >& _rxComponent, + const ImageList& _rNormalImages, + FmFormData* _pParent +) +: FmEntryData( _pParent, _rxComponent ), + m_xFormComponent( _rxComponent ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmControlData::FmControlData" ); DBG_CTOR(FmControlData,NULL); ////////////////////////////////////////////////////////////////////// // Images setzen m_aNormalImage = GetImage( _rNormalImages ); - m_aHCImage = GetImage( _rHCImages ); ////////////////////////////////////////////////////////////////////// // Titel setzen @@ -554,7 +559,10 @@ sal_Bool FmControlData::IsEqualWithoutChilds( FmEntryData* pEntryData ) } //------------------------------------------------------------------------ -void FmControlData::ModelReplaced( const Reference< XFormComponent >& _rxNew, const ImageList& _rNormalImages, const ImageList& _rHCImages ) +void FmControlData::ModelReplaced( + const Reference< XFormComponent >& _rxNew, + const ImageList& _rNormalImages +) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmControlData::ModelReplaced" ); m_xFormComponent = _rxNew; @@ -562,7 +570,6 @@ void FmControlData::ModelReplaced( const Reference< XFormComponent >& _rxNew, co // Images neu setzen m_aNormalImage = GetImage( _rNormalImages ); - m_aHCImage = GetImage( _rHCImages ); } //............................................................................ diff --git a/svx/source/form/fmexpl.src b/svx/source/form/fmexpl.src index 17881727cd5f..fb7ea13d9984 100644 --- a/svx/source/form/fmexpl.src +++ b/svx/source/form/fmexpl.src @@ -295,13 +295,6 @@ ImageList RID_SVXIMGLIST_FMEXPL NAVIGATOR_IMAGEIDS; }; -ImageList RID_SVXIMGLIST_FMEXPL_HC -{ - Prefix = "sxh"; - MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; }; - NAVIGATOR_IMAGEIDS; -}; - ModalDialog RID_SVXDLG_SETFORM { OutputSize = TRUE ; diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 7185a0dae03e..b0382ed4efc2 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -1134,12 +1134,10 @@ void FmXFormShell::ForceUpdateSelection(sal_Bool bAllowInvalidation) PopupMenu* FmXFormShell::GetConversionMenu() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::GetConversionMenu" ); - const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - BOOL bIsHiContrastMode = rSettings.GetHighContrastMode(); PopupMenu* pNewMenu = new PopupMenu(SVX_RES( RID_FMSHELL_CONVERSIONMENU )); - ImageList aImageList( SVX_RES( bIsHiContrastMode ? RID_SVXIMGLIST_FMEXPL_HC : RID_SVXIMGLIST_FMEXPL) ); + ImageList aImageList( SVX_RES( RID_SVXIMGLIST_FMEXPL) ); for ( size_t i = 0; i < SAL_N_ELEMENTS( nConvertSlots ); ++i ) { // das entsprechende Image dran diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index bcae5c6e793d..bb6f8f741b6c 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -204,24 +204,18 @@ namespace svxform SetHelpId( HID_FORM_NAVIGATOR ); m_aNavigatorImages = ImageList( SVX_RES( RID_SVXIMGLIST_FMEXPL ) ); - m_aNavigatorImagesHC = ImageList( SVX_RES( RID_SVXIMGLIST_FMEXPL_HC ) ); SetNodeBitmaps( m_aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ), m_aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ), BMP_COLOR_NORMAL ); - SetNodeBitmaps( - m_aNavigatorImagesHC.GetImage( RID_SVXIMG_COLLAPSEDNODE ), - m_aNavigatorImagesHC.GetImage( RID_SVXIMG_EXPANDEDNODE ), - BMP_COLOR_HIGHCONTRAST - ); SetDragDropMode(0xFFFF); EnableInplaceEditing( sal_True ); SetSelectionMode(MULTIPLE_SELECTION); - m_pNavModel = new NavigatorTreeModel( m_aNavigatorImages, m_aNavigatorImagesHC ); + m_pNavModel = new NavigatorTreeModel( m_aNavigatorImages ); Clear(); StartListening( *m_pNavModel ); @@ -692,13 +686,6 @@ namespace svxform Image aRootImage( m_aNavigatorImages.GetImage( RID_SVXIMG_FORMS ) ); m_pRootEntry = InsertEntry( SVX_RES(RID_STR_FORMS), aRootImage, aRootImage, NULL, sal_False, 0, NULL ); - - if ( m_pRootEntry ) - { - Image aHCRootImage( m_aNavigatorImagesHC.GetImage( RID_SVXIMG_FORMS ) ); - SetExpandedEntryBmp( m_pRootEntry, aHCRootImage, BMP_COLOR_HIGHCONTRAST ); - SetCollapsedEntryBmp( m_pRootEntry, aHCRootImage, BMP_COLOR_HIGHCONTRAST ); - } } else if (!m_bMarkingObjects && rHint.ISA(FmNavRequestSelectHint)) { // wenn m_bMarkingObjects sal_True ist, markiere ich gerade selber Objekte, und da der ganze Mechanismus dahinter synchron ist, @@ -1464,7 +1451,7 @@ namespace svxform if (!xNewForm.is()) return; - FmFormData* pNewFormData = new FmFormData( xNewForm, m_aNavigatorImages, m_aNavigatorImagesHC, pParentFormData ); + FmFormData* pNewFormData = new FmFormData( xNewForm, m_aNavigatorImages, pParentFormData ); ////////////////////////////////////////////////////////////////////// // Namen setzen @@ -1529,7 +1516,7 @@ namespace svxform if (!xNewComponent.is()) return NULL; - FmControlData* pNewFormControlData = new FmControlData( xNewComponent, m_aNavigatorImages, m_aNavigatorImagesHC, pParentFormData ); + FmControlData* pNewFormControlData = new FmControlData( xNewComponent, m_aNavigatorImages, pParentFormData ); ////////////////////////////////////////////////////////////////////// // Namen setzen diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index acbb1ba8f05f..fbf8d669687c 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -216,12 +216,11 @@ namespace svxform //======================================================================== //------------------------------------------------------------------------ - NavigatorTreeModel::NavigatorTreeModel( const ImageList& _rNormalImages, const ImageList& _rHCImages ) + NavigatorTreeModel::NavigatorTreeModel( const ImageList& _rNormalImages ) :m_pFormShell(NULL) ,m_pFormPage(NULL) ,m_pFormModel(NULL) ,m_aNormalImages( _rNormalImages ) - ,m_aHCImages( _rHCImages ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::NavigatorTreeModel" ); m_pPropChangeList = new OFormComponentObserver(this); @@ -578,7 +577,7 @@ namespace svxform "NavigatorTreeModel::FillBranch : the root container should supply only elements of type XForm"); xForms->getByIndex(i) >>= xSubForm; - pSubFormData = new FmFormData( xSubForm, m_aNormalImages, m_aHCImages, pFormData ); + pSubFormData = new FmFormData( xSubForm, m_aNormalImages, pFormData ); Insert( pSubFormData, LIST_APPEND ); ////////////////////////////////////////////////////////////// @@ -608,7 +607,7 @@ namespace svxform if (xSubForm.is()) { // die aktuelle Component ist eine Form - pSubFormData = new FmFormData(xSubForm, m_aNormalImages, m_aHCImages, pFormData); + pSubFormData = new FmFormData(xSubForm, m_aNormalImages, pFormData); Insert(pSubFormData, LIST_APPEND); ////////////////////////////////////////////////////////////// @@ -617,7 +616,7 @@ namespace svxform } else { - pNewControlData = new FmControlData(xCurrentComponent, m_aNormalImages, m_aHCImages, pFormData); + pNewControlData = new FmControlData(xCurrentComponent, m_aNormalImages, pFormData); Insert(pNewControlData, LIST_APPEND); } } @@ -640,7 +639,7 @@ namespace svxform if (xParentForm.is()) pParentData = (FmFormData*)FindData( xParentForm, GetRootList() ); - pFormData = new FmFormData( xForm, m_aNormalImages, m_aHCImages, pParentData ); + pFormData = new FmFormData( xForm, m_aNormalImages, pParentData ); Insert( pFormData, nRelPos ); } @@ -658,7 +657,7 @@ namespace svxform FmFormData* pParentData = (FmFormData*)FindData( xForm, GetRootList() ); if( !pParentData ) { - pParentData = new FmFormData( xForm, m_aNormalImages, m_aHCImages, NULL ); + pParentData = new FmFormData( xForm, m_aNormalImages, NULL ); Insert( pParentData, LIST_APPEND ); } @@ -666,7 +665,7 @@ namespace svxform { ////////////////////////////////////////////////////////// // Neue EntryData setzen - FmEntryData* pNewEntryData = new FmControlData( xComp, m_aNormalImages, m_aHCImages, pParentData ); + FmEntryData* pNewEntryData = new FmControlData( xComp, m_aNormalImages, pParentData ); ////////////////////////////////////////////////////////// // Neue EntryData einfuegen @@ -675,12 +674,15 @@ namespace svxform } //------------------------------------------------------------------------ - void NavigatorTreeModel::ReplaceFormComponent(const Reference< XFormComponent > & xOld, const Reference< XFormComponent > & xNew) + void NavigatorTreeModel::ReplaceFormComponent( + const Reference< XFormComponent > & xOld, + const Reference< XFormComponent > & xNew + ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::ReplaceFormComponent" ); FmEntryData* pData = FindData(xOld, GetRootList(), sal_True); DBG_ASSERT(pData && pData->ISA(FmControlData), "NavigatorTreeModel::ReplaceFormComponent : invalid argument !"); - ((FmControlData*)pData)->ModelReplaced( xNew, m_aNormalImages, m_aHCImages ); + ((FmControlData*)pData)->ModelReplaced( xNew, m_aNormalImages ); FmNavModelReplacedHint aReplacedHint( pData ); Broadcast( aReplacedHint ); diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index a48cce387efa..38f5bb87695a 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -1228,12 +1228,10 @@ IMPL_LINK( GalleryBrowser2, SelectTbxHdl, ToolBox*, pBox ) IMPL_LINK( GalleryBrowser2, MiscHdl, void*, EMPTYARG ) { - const sal_Bool bHC = maViewBox.GetSettings().GetStyleSettings().GetHighContrastMode(); - maViewBox.SetOutStyle( maMiscOptions.GetToolboxStyle() ); - BitmapEx aIconBmpEx = BitmapEx( Image( GAL_RESID( bHC? RID_SVXIMG_GALLERY_VIEW_ICON_HC : RID_SVXIMG_GALLERY_VIEW_ICON ) ).GetBitmapEx() ); - BitmapEx aListBmpEx = BitmapEx( Image( GAL_RESID( bHC? RID_SVXIMG_GALLERY_VIEW_LIST_HC : RID_SVXIMG_GALLERY_VIEW_LIST ) ).GetBitmapEx() ); + BitmapEx aIconBmpEx = BitmapEx( Image( GAL_RESID( RID_SVXIMG_GALLERY_VIEW_ICON ) ).GetBitmapEx() ); + BitmapEx aListBmpEx = BitmapEx( Image( GAL_RESID( RID_SVXIMG_GALLERY_VIEW_LIST ) ).GetBitmapEx() ); if( maMiscOptions.AreCurrentSymbolsLarge() ) { diff --git a/svx/source/gallery2/gallery.src b/svx/source/gallery2/gallery.src index fae88c0db251..6ac9839b0f96 100644 --- a/svx/source/gallery2/gallery.src +++ b/svx/source/gallery2/gallery.src @@ -257,19 +257,6 @@ Image RID_SVXIMG_GALLERY_VIEW_LIST MASKCOLOR }; -Image RID_SVXIMG_GALLERY_VIEW_ICON_HC -{ - ImageBitmap = Bitmap { File = "galicon_h.bmp"; }; - MASKCOLOR -}; - -Image RID_SVXIMG_GALLERY_VIEW_LIST_HC -{ - ImageBitmap = Bitmap { File = "gallist_h.bmp"; }; - MASKCOLOR -}; - - /******************************************************************************/ Menu RID_SVXMN_GALLERY1 diff --git a/svx/source/inc/datanavi.hrc b/svx/source/inc/datanavi.hrc index a77485db399a..ee75a3753ee2 100644 --- a/svx/source/inc/datanavi.hrc +++ b/svx/source/inc/datanavi.hrc @@ -38,17 +38,20 @@ // Controls #define TB_ITEMS 10 #define LB_ITEMS 11 + // Menu items #define MID_INSERT_CONTROL 100 + // ToolBox items #define TBI_ITEM_ADD 10 #define TBI_ITEM_ADD_ELEMENT 11 #define TBI_ITEM_ADD_ATTRIBUTE 12 #define TBI_ITEM_EDIT 13 #define TBI_ITEM_REMOVE 14 + // ImageLists #define IL_TBX_BMPS 20 -#define IL_TBX_BMPS_HC 21 + // ImageIndexes #define IID_ITEM_ADD 1 #define IID_ITEM_ADD_ELEMENT 2 @@ -62,6 +65,7 @@ #define MB_MODELS 11 #define TC_ITEMS 12 #define MB_INSTANCES 13 + // MenuItems #define MID_MODELS_ADD 10 #define MID_MODELS_EDIT 11 @@ -70,13 +74,15 @@ #define MID_INSTANCES_EDIT 21 #define MID_INSTANCES_REMOVE 22 #define MID_SHOW_DETAILS 30 + // TabPage Ids #define TID_SUBMISSION 10 #define TID_BINDINGS 11 #define TID_INSTANCE 12 + // ImageLists #define IL_ITEM_BMPS 30 -#define IL_ITEM_BMPS_HC 31 + // ImageIndexes #define IID_GROUP_CLOSED 1 #define IID_GROUP_OPEN 2 diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index b8e2aac19beb..8a10c95fb800 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -152,7 +152,6 @@ namespace svxform bool m_bHasModel; DataGroupType m_eGroup; ImageList m_TbxImageList; - ImageList m_TbxHCImageList; // these strings are not valid on the Submission and Binding Page // mb: furthermore these are properties of an instance, thus // it would be much better to get/set them through the UIHelper @@ -234,7 +233,6 @@ namespace svxform Size m_a2Size; Size m_a3Size; ImageList m_aItemImageList; - ImageList m_aItemHCImageList; PageList m_aPageList; ContainerList m_aContainerList; EventTargetList m_aEventTargetList; @@ -274,7 +272,6 @@ namespace svxform void RemoveBroadcaster(); inline const ImageList& GetItemImageList() const { return m_aItemImageList; } - inline const ImageList& GetItemHCImageList() const { return m_aItemHCImageList; } inline bool IsShowDetails() const { return m_bShowDetails; } inline void DisableNotify( bool _bDisable ) { m_bIsNotifyDisabled = _bDisable; } }; diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index 4a5a5c500a69..47dfb116b6df 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -609,9 +609,6 @@ class RecovDocList : public SvxSimpleTable Image m_aGreenCheckImg; Image m_aYellowCheckImg; Image m_aRedCrossImg; - Image m_aGreenCheckImgHC; - Image m_aYellowCheckImgHC; - Image m_aRedCrossImgHC; String m_aSuccessRecovStr; String m_aOrigDocRecovStr; diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index 7e3cf4042958..2fe48a2c9615 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -249,7 +249,6 @@ public: FmFormData( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm, const ImageList& _rNormalImages, - const ImageList& _rHCImages, FmFormData* _pParent = NULL ); @@ -284,7 +283,6 @@ public: FmControlData( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& _rxComponent, const ImageList& _rNormalImages, - const ImageList& _rHCImages, FmFormData* _pParent ); FmControlData( const FmControlData& rControlData ); @@ -296,8 +294,7 @@ public: void ModelReplaced( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& _rxNew, - const ImageList& _rNormalImages, - const ImageList& _rHCImages + const ImageList& _rNormalImages ); }; @@ -362,7 +359,6 @@ namespace svxform OFormComponentObserver* m_pPropChangeList; ImageList m_aNormalImages; - ImageList m_aHCImages; void UpdateContent( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xForms ); FmControlData* CreateControlData( ::com::sun::star::form::XFormComponent* pFormComponent ); @@ -384,7 +380,7 @@ namespace svxform // Rueckgabe sal_True, wenn das Objekt eine FormComponent ist (oder rekursiv nur aus solchen besteht) public: - NavigatorTreeModel( const ImageList& _rNormalImages, const ImageList& _rHCImages ); + NavigatorTreeModel( const ImageList& _rNormalImages ); virtual ~NavigatorTreeModel(); void FillBranch( FmFormData* pParentData ); @@ -432,7 +428,6 @@ namespace svxform ListBoxEntrySet m_aCutEntries; // die Images, die ich brauche (und an FormDatas und EntryDatas weiterreiche) ImageList m_aNavigatorImages; - ImageList m_aNavigatorImagesHC; ::svxform::OControlExchangeHelper m_aControlExchange; diff --git a/svx/source/inc/fmresids.hrc b/svx/source/inc/fmresids.hrc index f6843801e522..24637babb057 100644 --- a/svx/source/inc/fmresids.hrc +++ b/svx/source/inc/fmresids.hrc @@ -35,7 +35,6 @@ // ImageList-Id's ----------------------------------------------------------- #define RID_SVXIMGLIST_FMEXPL (RID_FORMS_START + 0) -#define RID_SVXIMGLIST_FMEXPL_HC (RID_FORMS_START + 2) // Image-Id's ----------------------------------------------------------- //#define SID_FMSLOTS_START (SID_SVX_START + 592) -> svxids.hrc diff --git a/svx/source/src/app.src b/svx/source/src/app.src index 934fbd76a86f..7086b9223821 100644 --- a/svx/source/src/app.src +++ b/svx/source/src/app.src @@ -63,20 +63,6 @@ ImageList RID_DEFAULTIMAGELIST_LC IMAGE_ID_LIST }; -ImageList RID_DEFAULTIMAGELIST_SCH -{ - Prefix = "sch"; - MASKCOLOR - IMAGE_ID_LIST -}; - -ImageList RID_DEFAULTIMAGELIST_LCH -{ - Prefix = "lch"; - MASKCOLOR - IMAGE_ID_LIST -}; - // Strings --------------------------------------------------------------- String RID_DESKTOP diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src index d63384a76f16..cd129d18576b 100644 --- a/svx/source/stbctrls/stbctrls.src +++ b/svx/source/stbctrls/stbctrls.src @@ -260,30 +260,6 @@ Image RID_SVXBMP_SIGNET_NOTVALIDATED }; MaskColor = STD_MASKCOLOR; }; -Image RID_SVXBMP_SIGNET_H -{ - ImageBitmap = Bitmap - { - File = "signet_11x16_h.png" ; - }; - MaskColor = STD_MASKCOLOR; -}; -Image RID_SVXBMP_SIGNET_BROKEN_H -{ - ImageBitmap = Bitmap - { - File = "caution_11x16_h.png" ; - }; - MaskColor = STD_MASKCOLOR; -}; -Image RID_SVXBMP_SIGNET_NOTVALIDATED_H -{ - ImageBitmap = Bitmap - { - File = "notcertificate_16_h.png" ; - }; - MaskColor = STD_MASKCOLOR; -}; Image RID_SVXBMP_SLIDERBUTTON @@ -310,31 +286,6 @@ Image RID_SVXBMP_SLIDERINCREASE }; MaskColor = STD_MASKCOLOR; }; -Image RID_SVXBMP_SLIDERBUTTON_HC -{ - ImageBitmap = Bitmap - { - File = "navigationball_10_h.png" ; - }; - MaskColor = STD_MASKCOLOR; -}; -Image RID_SVXBMP_SLIDERDECREASE_HC -{ - ImageBitmap = Bitmap - { - File = "slidezoomout_11_h.png" ; - }; - MaskColor = STD_MASKCOLOR; -}; -Image RID_SVXBMP_SLIDERINCREASE_HC -{ - ImageBitmap = Bitmap - { - File = "slidezoomin_11_h.png" ; - }; - MaskColor = STD_MASKCOLOR; -}; - Image RID_SVXBMP_DOC_MODIFIED_YES { ImageBitmap = Bitmap diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx index 16f1e56be1fd..eda2ddda5eec 100644 --- a/svx/source/stbctrls/xmlsecctrl.cxx +++ b/svx/source/stbctrls/xmlsecctrl.cxx @@ -67,17 +67,13 @@ struct XmlSecStatusBarControl::XmlSecStatusBarControl_Impl XmlSecStatusBarControl::XmlSecStatusBarControl( USHORT _nSlotId, USHORT _nId, StatusBar& _rStb ) :SfxStatusBarControl( _nSlotId, _nId, _rStb ) - ,mpImpl( new XmlSecStatusBarControl_Impl ) { mpImpl->mnState = (UINT16)SIGNATURESTATE_UNKNOWN; - sal_Bool bHC = GetStatusBar().GetSettings().GetStyleSettings().GetHighContrastMode(); - mpImpl->maImage = Image( SVX_RES( bHC ? RID_SVXBMP_SIGNET_H : RID_SVXBMP_SIGNET ) ); - mpImpl->maImageBroken = - Image( SVX_RES( bHC ? RID_SVXBMP_SIGNET_BROKEN_H : RID_SVXBMP_SIGNET_BROKEN ) ); - mpImpl->maImageNotValidated = - Image( SVX_RES( bHC ? RID_SVXBMP_SIGNET_NOTVALIDATED_H : RID_SVXBMP_SIGNET_NOTVALIDATED ) ); + mpImpl->maImage = Image( SVX_RES( RID_SVXBMP_SIGNET ) ); + mpImpl->maImageBroken = Image( SVX_RES( RID_SVXBMP_SIGNET_BROKEN ) ); + mpImpl->maImageNotValidated = Image( SVX_RES( RID_SVXBMP_SIGNET_NOTVALIDATED ) ); } XmlSecStatusBarControl::~XmlSecStatusBarControl() @@ -97,7 +93,6 @@ void XmlSecStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState, con } else if( pState->ISA( SfxUInt16Item ) ) { -// mpImpl->mbSigned = ( ( SfxUInt16Item* ) pState )->GetValue() == 1 /* SIGNED*/ ; mpImpl->mnState = ( ( SfxUInt16Item* ) pState )->GetValue(); } else diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx index 25f74964441c..5b9298a0b1eb 100644 --- a/svx/source/stbctrls/zoomsliderctrl.cxx +++ b/svx/source/stbctrls/zoomsliderctrl.cxx @@ -182,10 +182,9 @@ SvxZoomSliderControl::SvxZoomSliderControl( USHORT _nSlotId, USHORT _nId, Statu SfxStatusBarControl( _nSlotId, _nId, _rStb ), mpImpl( new SvxZoomSliderControl_Impl ) { - const sal_Bool bHC = GetStatusBar().GetSettings().GetStyleSettings().GetHighContrastMode(); - mpImpl->maSliderButton = Image( SVX_RES( bHC ? RID_SVXBMP_SLIDERBUTTON_HC : RID_SVXBMP_SLIDERBUTTON ) ); - mpImpl->maIncreaseButton = Image( SVX_RES( bHC ? RID_SVXBMP_SLIDERINCREASE_HC : RID_SVXBMP_SLIDERINCREASE ) ); - mpImpl->maDecreaseButton = Image( SVX_RES( bHC ? RID_SVXBMP_SLIDERDECREASE_HC : RID_SVXBMP_SLIDERDECREASE ) ); + mpImpl->maSliderButton = Image( SVX_RES( RID_SVXBMP_SLIDERBUTTON ) ); + mpImpl->maIncreaseButton = Image( SVX_RES( RID_SVXBMP_SLIDERINCREASE ) ); + mpImpl->maDecreaseButton = Image( SVX_RES( RID_SVXBMP_SLIDERDECREASE ) ); } // ----------------------------------------------------------------------- diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index b01d80e7b473..61dcededf870 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -83,15 +83,17 @@ namespace svx static sal_Int32 gSkewList[] = { 135, 90, 45, 180, 0, -360, -135, -90, -45 }; -ExtrusionDirectionWindow::ExtrusionDirectionWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow ) -: ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_DIRECTION )) -, mrController( rController ) -, maImgPerspective( SVX_RES( IMG_PERSPECTIVE ) ) -, maImgPerspectiveH( SVX_RES( IMG_PERSPECTIVE_H ) ) -, maImgParallel( SVX_RES( IMG_PARALLEL ) ) -, maImgParallelH( SVX_RES( IMG_PARALLEL_H ) ) -, msExtrusionDirection( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirection" ) ) -, msExtrusionProjection( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionProjection" ) ) +ExtrusionDirectionWindow::ExtrusionDirectionWindow( + svt::ToolboxController& rController, + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + Window* pParentWindow +) +: ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_DIRECTION )) , + mrController( rController ) , + maImgPerspective( SVX_RES( IMG_PERSPECTIVE ) ) , + maImgParallel( SVX_RES( IMG_PARALLEL ) ) , + msExtrusionDirection( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirection" ) ) , + msExtrusionProjection( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionProjection" ) ) { SetHelpId( HID_MENU_EXTRUSION_DIRECTION ); @@ -99,7 +101,6 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow( svt::ToolboxController& rCon for( i = DIRECTION_NW; i <= DIRECTION_SE; i++ ) { maImgDirection[i] = Image( SVX_RES( IMG_DIRECTION + i ) ); - maImgDirectionH[i] = Image( SVX_RES( IMG_DIRECTION_H + i ) ); } SetSelectHdl( LINK( this, ExtrusionDirectionWindow, SelectHdl ) ); @@ -110,20 +111,18 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow( svt::ToolboxController& rCon mpDirectionSet->SetColCount( 3 ); mpDirectionSet->EnableFullItemMode( FALSE ); - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - for( i = DIRECTION_NW; i <= DIRECTION_SE; i++ ) { String aText( SVX_RES( STR_DIRECTION + i ) ); - mpDirectionSet->InsertItem( i+1, bHighContrast ? maImgDirectionH[ i ] : maImgDirection[ i ], aText ); + mpDirectionSet->InsertItem( i+1, maImgDirection[ i ], aText ); } mpDirectionSet->SetOutputSizePixel( Size( 72, 72 ) ); appendEntry( 2, mpDirectionSet ); appendSeparator(); - appendEntry( 0, String( SVX_RES( STR_PERSPECTIVE ) ), bHighContrast ? maImgPerspectiveH : maImgPerspective ); - appendEntry( 1, String( SVX_RES( STR_PARALLEL ) ), bHighContrast ? maImgParallelH : maImgParallel ); + appendEntry( 0, String( SVX_RES( STR_PERSPECTIVE ) ), maImgPerspective ); + appendEntry( 1, String( SVX_RES( STR_PARALLEL ) ), maImgParallel ); SetOutputSizePixel( getMenuSize() ); @@ -139,15 +138,13 @@ void ExtrusionDirectionWindow::DataChanged( const DataChangedEvent& rDCEvt ) if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) { - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - for( USHORT i = DIRECTION_NW; i <= DIRECTION_SE; i++ ) { - mpDirectionSet->SetItemImage( i+1, bHighContrast ? maImgDirectionH[ i ] : maImgDirection[ i ] ); + mpDirectionSet->SetItemImage( i+1, maImgDirection[ i ] ); } - setEntryImage( 0, bHighContrast ? maImgPerspectiveH : maImgPerspective ); - setEntryImage( 1, bHighContrast ? maImgParallelH : maImgParallel ); + setEntryImage( 0, maImgPerspective ); + setEntryImage( 1, maImgParallel ); } } @@ -188,7 +185,9 @@ void ExtrusionDirectionWindow::implSetProjection( sal_Int32 nProjection, bool bE // ----------------------------------------------------------------------- -void SAL_CALL ExtrusionDirectionWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL ExtrusionDirectionWindow::statusChanged( + const ::com::sun::star::frame::FeatureStateEvent& Event +) throw ( ::com::sun::star::uno::RuntimeException ) { if( Event.FeatureURL.Main.equals( msExtrusionDirection ) ) { @@ -254,8 +253,13 @@ IMPL_LINK( ExtrusionDirectionWindow, SelectHdl, void *, pControl ) // ExtrusionDirectionControl // ======================================================================= -ExtrusionDirectionControl::ExtrusionDirectionControl( const Reference< lang::XMultiServiceFactory >& rServiceManager ) -: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirectionFloater" ) ) ) +ExtrusionDirectionControl::ExtrusionDirectionControl( + const Reference< lang::XMultiServiceFactory >& rServiceManager +) : svt::PopupWindowController( + rServiceManager, + Reference< frame::XFrame >(), + OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirectionFloater" ) ) + ) { } @@ -286,7 +290,9 @@ Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames // -------------------------------------------------------------------- -Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDirectionControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException ) +Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDirectionControl_createInstance( + const Reference< XMultiServiceFactory >& rSMgr +) throw( RuntimeException ) { return *new ExtrusionDirectionControl( rSMgr ); } @@ -328,7 +334,6 @@ ExtrusionDepthDialog::~ExtrusionDepthDialog() double ExtrusionDepthDialog::getDepth() const { -// bool bMetric = IsMetric( meDefaultUnit ); return (double)( maMtrDepth.GetValue( FUNIT_100TH_MM ) ) / 100.0; } @@ -337,38 +342,33 @@ double ExtrusionDepthDialog::getDepth() const double aDepthListInch[] = { 0, 1270,2540,5080,10160 }; double aDepthListMM[] = { 0, 1000, 2500, 5000, 10000 }; -ExtrusionDepthWindow::ExtrusionDepthWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow ) -: ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_DEPTH )) -, mrController( rController ) -, maImgDepth0( SVX_RES( IMG_DEPTH_0 ) ) -, maImgDepth1( SVX_RES( IMG_DEPTH_1 ) ) -, maImgDepth2( SVX_RES( IMG_DEPTH_2 ) ) -, maImgDepth3( SVX_RES( IMG_DEPTH_3 ) ) -, maImgDepth4( SVX_RES( IMG_DEPTH_4 ) ) -, maImgDepthInfinity( SVX_RES( IMG_DEPTH_INFINITY ) ) -, maImgDepth0h( SVX_RES( IMG_DEPTH_0_H ) ) -, maImgDepth1h( SVX_RES( IMG_DEPTH_1_H ) ) -, maImgDepth2h( SVX_RES( IMG_DEPTH_2_H ) ) -, maImgDepth3h( SVX_RES( IMG_DEPTH_3_H ) ) -, maImgDepth4h( SVX_RES( IMG_DEPTH_4_H ) ) -, maImgDepthInfinityh( SVX_RES( IMG_DEPTH_INFINITY_H ) ) -, mfDepth( -1.0 ) -, msExtrusionDepth( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDepth" ) ) -, msMetricUnit( RTL_CONSTASCII_USTRINGPARAM( ".uno:MetricUnit" ) ) +ExtrusionDepthWindow::ExtrusionDepthWindow( + svt::ToolboxController& rController, + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + Window* pParentWindow +) : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_DEPTH )) + , mrController( rController ) + , maImgDepth0( SVX_RES( IMG_DEPTH_0 ) ) + , maImgDepth1( SVX_RES( IMG_DEPTH_1 ) ) + , maImgDepth2( SVX_RES( IMG_DEPTH_2 ) ) + , maImgDepth3( SVX_RES( IMG_DEPTH_3 ) ) + , maImgDepth4( SVX_RES( IMG_DEPTH_4 ) ) + , maImgDepthInfinity( SVX_RES( IMG_DEPTH_INFINITY ) ) + , mfDepth( -1.0 ) + , msExtrusionDepth( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDepth" ) ) + , msMetricUnit( RTL_CONSTASCII_USTRINGPARAM( ".uno:MetricUnit" ) ) { SetHelpId( HID_MENU_EXTRUSION_DEPTH ); SetSelectHdl( LINK( this, ExtrusionDepthWindow, SelectHdl ) ); - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - String aEmpty; - appendEntry( 0, aEmpty, bHighContrast ? maImgDepth0h : maImgDepth0 ); - appendEntry( 1, aEmpty, bHighContrast ? maImgDepth1h : maImgDepth1 ); - appendEntry( 2, aEmpty, bHighContrast ? maImgDepth2h : maImgDepth2 ); - appendEntry( 3, aEmpty, bHighContrast ? maImgDepth3h : maImgDepth3 ); - appendEntry( 4, aEmpty, bHighContrast ? maImgDepth4h : maImgDepth4 ); - appendEntry( 5, String( SVX_RES( STR_INFINITY ) ), bHighContrast ? maImgDepthInfinityh : maImgDepthInfinity ); + appendEntry( 0, aEmpty, maImgDepth0 ); + appendEntry( 1, aEmpty, maImgDepth1 ); + appendEntry( 2, aEmpty, maImgDepth2 ); + appendEntry( 3, aEmpty, maImgDepth3 ); + appendEntry( 4, aEmpty, maImgDepth4 ); + appendEntry( 5, String( SVX_RES( STR_INFINITY ) ), maImgDepthInfinity ); appendEntry( 6, String( SVX_RES( STR_CUSTOM ) ) ); SetOutputSizePixel( getMenuSize() ); @@ -414,7 +414,9 @@ void ExtrusionDepthWindow::implFillStrings( FieldUnit eUnit ) // ----------------------------------------------------------------------- -void SAL_CALL ExtrusionDepthWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL ExtrusionDepthWindow::statusChanged( + const ::com::sun::star::frame::FeatureStateEvent& Event +) throw ( ::com::sun::star::uno::RuntimeException ) { if( Event.FeatureURL.Main.equals( msExtrusionDepth ) ) { @@ -452,14 +454,12 @@ void ExtrusionDepthWindow::DataChanged( const DataChangedEvent& rDCEvt ) if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) { - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - - setEntryImage( 0, bHighContrast ? maImgDepth0h : maImgDepth0 ); - setEntryImage( 1, bHighContrast ? maImgDepth1h : maImgDepth1 ); - setEntryImage( 2, bHighContrast ? maImgDepth2h : maImgDepth2 ); - setEntryImage( 3, bHighContrast ? maImgDepth3h : maImgDepth3 ); - setEntryImage( 4, bHighContrast ? maImgDepth4h : maImgDepth4 ); - setEntryImage( 5, bHighContrast ? maImgDepthInfinityh : maImgDepthInfinity ); + setEntryImage( 0, maImgDepth0 ); + setEntryImage( 1, maImgDepth1 ); + setEntryImage( 2, maImgDepth2 ); + setEntryImage( 3, maImgDepth3 ); + setEntryImage( 4, maImgDepth4 ); + setEntryImage( 5, maImgDepthInfinity ); } } @@ -518,8 +518,13 @@ IMPL_LINK( ExtrusionDepthWindow, SelectHdl, void *, EMPTYARG ) // ExtrusionDirectionControl // ======================================================================= -ExtrusionDepthController::ExtrusionDepthController( const Reference< lang::XMultiServiceFactory >& rServiceManager ) -: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDepthFloater" ) ) ) +ExtrusionDepthController::ExtrusionDepthController( + const Reference< lang::XMultiServiceFactory >& rServiceManager +) : svt::PopupWindowController( + rServiceManager, + Reference< frame::XFrame >(), + OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDepthFloater" ) ) + ) { } @@ -580,10 +585,7 @@ ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rContr , mrController( rController ) , maImgBright( SVX_RES( IMG_LIGHTING_BRIGHT ) ) , maImgNormal( SVX_RES( IMG_LIGHTING_NORMAL ) ) -, maImgDim( SVX_RES( IMG_LIGHTING_DIM ) ) -, maImgBrighth( SVX_RES( IMG_LIGHTING_BRIGHT_H ) ) -, maImgNormalh( SVX_RES( IMG_LIGHTING_NORMAL_H ) ) -, maImgDimh( SVX_RES( IMG_LIGHTING_DIM_H ) ) +, maImgDim( SVX_RES( IMG_LIGHTING_DIM ) ) , mnLevel( 0 ) , mbLevelEnabled( false ) , mnDirection( FROM_FRONT ) @@ -596,13 +598,10 @@ ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rContr { if( i != FROM_FRONT ) { - maImgLightingOff[i] = Image( SVX_RES( IMG_LIGHT_OFF + i ) ); - maImgLightingOn[i] = Image( SVX_RES( IMG_LIGHT_ON + i ) ); - maImgLightingOffh[i] = Image( SVX_RES( IMG_LIGHT_OFF_H + i ) ); - maImgLightingOnh[i] = Image( SVX_RES( IMG_LIGHT_ON_H + i ) ); + maImgLightingOff[ i ] = Image( SVX_RES( IMG_LIGHT_OFF + i ) ); + maImgLightingOn[ i ] = Image( SVX_RES( IMG_LIGHT_ON + i ) ); } maImgLightingPreview[i] = Image( SVX_RES( IMG_LIGHT_PREVIEW + i ) ); - maImgLightingPreviewh[i] = Image( SVX_RES( IMG_LIGHT_PREVIEW_H + i ) ); } SetHelpId( HID_MENU_EXTRUSION_LIGHTING ); @@ -615,26 +614,24 @@ ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rContr mpLightingSet->SetColCount( 3 ); mpLightingSet->EnableFullItemMode( FALSE ); - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - for( i = FROM_TOP_LEFT; i <= FROM_BOTTOM_RIGHT; i++ ) { if( i != FROM_FRONT ) { - mpLightingSet->InsertItem( i+1, bHighContrast ? maImgLightingOffh[i] : maImgLightingOff[i] ); + mpLightingSet->InsertItem( i+1, maImgLightingOff[i] ); } else { - mpLightingSet->InsertItem( 5, bHighContrast ? maImgLightingPreviewh[FROM_FRONT] : maImgLightingPreview[FROM_FRONT] ); + mpLightingSet->InsertItem( 5, maImgLightingPreview[FROM_FRONT] ); } } mpLightingSet->SetOutputSizePixel( Size( 72, 72 ) ); appendEntry( 3, mpLightingSet ); appendSeparator(); - appendEntry( 0, String( SVX_RES( STR_BRIGHT ) ), bHighContrast ? maImgBrighth : maImgBright ); - appendEntry( 1, String( SVX_RES( STR_NORMAL ) ), bHighContrast ? maImgNormalh : maImgNormal ); - appendEntry( 2, String( SVX_RES( STR_DIM ) ), bHighContrast ? maImgDimh : maImgDim ); + appendEntry( 0, String( SVX_RES( STR_BRIGHT ) ), maImgBright ); + appendEntry( 1, String( SVX_RES( STR_NORMAL ) ), maImgNormal ); + appendEntry( 2, String( SVX_RES( STR_DIM ) ), maImgDim ); SetOutputSizePixel( getMenuSize() ); @@ -665,8 +662,6 @@ void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled ) mnDirection = nDirection; mbDirectionEnabled = bEnabled; - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - if( !bEnabled ) nDirection = FROM_FRONT; @@ -675,18 +670,14 @@ void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled ) { if( nItemId == FROM_FRONT ) { - mpLightingSet->SetItemImage( nItemId + 1, bHighContrast ? maImgLightingPreviewh[ nDirection ] : maImgLightingPreview[ nDirection ] ); + mpLightingSet->SetItemImage( nItemId + 1, maImgLightingPreview[ nDirection ] ); } else { - if( bHighContrast ) - { - mpLightingSet->SetItemImage( nItemId + 1, (USHORT)nDirection == nItemId ? maImgLightingOnh[nItemId] : maImgLightingOffh[nItemId] ); - } - else - { - mpLightingSet->SetItemImage( nItemId + 1, (USHORT)nDirection == nItemId ? maImgLightingOn[nItemId] : maImgLightingOff[nItemId] ); - } + mpLightingSet->SetItemImage( + nItemId + 1, + (USHORT)nDirection == nItemId ? maImgLightingOn[nItemId] : maImgLightingOff[nItemId] + ); } } @@ -695,7 +686,9 @@ void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled ) // ----------------------------------------------------------------------- -void SAL_CALL ExtrusionLightingWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL ExtrusionLightingWindow::statusChanged( + const ::com::sun::star::frame::FeatureStateEvent& Event +) throw ( ::com::sun::star::uno::RuntimeException ) { if( Event.FeatureURL.Main.equals( msExtrusionLightingIntensity ) ) { @@ -733,12 +726,10 @@ void ExtrusionLightingWindow::DataChanged( const DataChangedEvent& rDCEvt ) if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) { - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - implSetDirection( mnDirection, mbDirectionEnabled ); - setEntryImage( 0, bHighContrast ? maImgBrighth : maImgBright ); - setEntryImage( 1, bHighContrast ? maImgNormalh : maImgNormal ); - setEntryImage( 2, bHighContrast ? maImgDimh : maImgDim ); + setEntryImage( 0, maImgBright ); + setEntryImage( 1, maImgNormal ); + setEntryImage( 2, maImgDim ); } } @@ -790,8 +781,12 @@ IMPL_LINK( ExtrusionLightingWindow, SelectHdl, void *, pControl ) // ======================================================================== -ExtrusionLightingControl::ExtrusionLightingControl( const Reference< lang::XMultiServiceFactory >& rServiceManager ) -: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirectionFloater" ) ) ) +ExtrusionLightingControl::ExtrusionLightingControl( + const Reference< lang::XMultiServiceFactory >& rServiceManager +) : svt::PopupWindowController( rServiceManager, + Reference< frame::XFrame >(), + OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirectionFloater" ) ) + ) { } @@ -822,7 +817,9 @@ Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames( // -------------------------------------------------------------------- -Reference< XInterface > SAL_CALL SAL_CALL ExtrusionLightingControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException ) +Reference< XInterface > SAL_CALL SAL_CALL ExtrusionLightingControl_createInstance( + const Reference< XMultiServiceFactory >& rSMgr +) throw( RuntimeException ) { return *new ExtrusionLightingControl( rSMgr ); } @@ -843,28 +840,25 @@ Sequence< OUString > SAL_CALL ExtrusionLightingControl::getSupportedServiceNames // #################################################################### -ExtrusionSurfaceWindow::ExtrusionSurfaceWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow ) -: ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_SURFACE )) -, mrController( rController ) -, maImgSurface1( SVX_RES( IMG_WIRE_FRAME ) ) -, maImgSurface2( SVX_RES( IMG_MATTE ) ) -, maImgSurface3( SVX_RES( IMG_PLASTIC ) ) -, maImgSurface4( SVX_RES( IMG_METAL ) ) -, maImgSurface1h( SVX_RES( IMG_WIRE_FRAME_H ) ) -, maImgSurface2h( SVX_RES( IMG_MATTE_H ) ) -, maImgSurface3h( SVX_RES( IMG_PLASTIC_H ) ) -, maImgSurface4h( SVX_RES( IMG_METAL_H ) ) -, msExtrusionSurface( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionSurface" )) +ExtrusionSurfaceWindow::ExtrusionSurfaceWindow( + svt::ToolboxController& rController, + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + Window* pParentWindow +) : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_SURFACE ) ) + , mrController( rController ) + , maImgSurface1( SVX_RES( IMG_WIRE_FRAME ) ) + , maImgSurface2( SVX_RES( IMG_MATTE ) ) + , maImgSurface3( SVX_RES( IMG_PLASTIC ) ) + , maImgSurface4( SVX_RES( IMG_METAL ) ) + , msExtrusionSurface( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionSurface" ) ) { - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - SetHelpId( HID_MENU_EXTRUSION_SURFACE ); SetSelectHdl( LINK( this, ExtrusionSurfaceWindow, SelectHdl ) ); - appendEntry( 0, String( SVX_RES( STR_WIREFRAME ) ), bHighContrast ? maImgSurface1h : maImgSurface1 ); - appendEntry( 1, String( SVX_RES( STR_MATTE ) ), bHighContrast ? maImgSurface2h : maImgSurface2 ); - appendEntry( 2, String( SVX_RES( STR_PLASTIC ) ), bHighContrast ? maImgSurface3h : maImgSurface3 ); - appendEntry( 3, String( SVX_RES( STR_METAL ) ), bHighContrast ? maImgSurface4h : maImgSurface4 ); + appendEntry( 0, String( SVX_RES( STR_WIREFRAME ) ), maImgSurface1 ); + appendEntry( 1, String( SVX_RES( STR_MATTE ) ), maImgSurface2 ); + appendEntry( 2, String( SVX_RES( STR_PLASTIC ) ), maImgSurface3 ); + appendEntry( 3, String( SVX_RES( STR_METAL ) ), maImgSurface4 ); SetOutputSizePixel( getMenuSize() ); @@ -877,20 +871,19 @@ ExtrusionSurfaceWindow::ExtrusionSurfaceWindow( svt::ToolboxController& rControl void ExtrusionSurfaceWindow::implSetSurface( int nSurface, bool bEnabled ) { -// if( mpMenu ) + int i; + for( i = 0; i < 4; i++ ) { - int i; - for( i = 0; i < 4; i++ ) - { - checkEntry( i, (i == nSurface) && bEnabled ); - enableEntry( i, bEnabled ); - } + checkEntry( i, (i == nSurface) && bEnabled ); + enableEntry( i, bEnabled ); } } // ----------------------------------------------------------------------- -void SAL_CALL ExtrusionSurfaceWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL ExtrusionSurfaceWindow::statusChanged( + const ::com::sun::star::frame::FeatureStateEvent& Event +) throw ( ::com::sun::star::uno::RuntimeException ) { if( Event.FeatureURL.Main.equals( msExtrusionSurface ) ) { @@ -931,8 +924,14 @@ IMPL_LINK( ExtrusionSurfaceWindow, SelectHdl, void *, EMPTYARG ) // ======================================================================== -ExtrusionSurfaceControl::ExtrusionSurfaceControl( const Reference< lang::XMultiServiceFactory >& rServiceManager ) -: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionSurfaceFloater" ) ) ) +ExtrusionSurfaceControl::ExtrusionSurfaceControl( + const Reference< lang::XMultiServiceFactory >& rServiceManager +) +: svt::PopupWindowController( + rServiceManager, + Reference< frame::XFrame >(), + OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionSurfaceFloater" ) ) + ) { } @@ -963,7 +962,9 @@ Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames() // -------------------------------------------------------------------- -Reference< XInterface > SAL_CALL SAL_CALL ExtrusionSurfaceControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException ) +Reference< XInterface > SAL_CALL SAL_CALL ExtrusionSurfaceControl_createInstance( + const Reference< XMultiServiceFactory >& rSMgr +) throw( RuntimeException ) { return *new ExtrusionSurfaceControl( rSMgr ); } diff --git a/svx/source/tbxctrls/extrusioncontrols.hrc b/svx/source/tbxctrls/extrusioncontrols.hrc index 705381cb68a6..9ae43248a499 100644 --- a/svx/source/tbxctrls/extrusioncontrols.hrc +++ b/svx/source/tbxctrls/extrusioncontrols.hrc @@ -64,7 +64,6 @@ #define STR_DIRECTION 30 // needs 10 resource ids #define IMG_DIRECTION 1 // needs 10 resource ids -#define IMG_DIRECTION_H 10 // needs 10 resource ids #define IMG_DEPTH_0 19 #define IMG_DEPTH_1 20 @@ -73,48 +72,24 @@ #define IMG_DEPTH_4 23 #define IMG_DEPTH_INFINITY 24 -#define IMG_DEPTH_0_H 25 -#define IMG_DEPTH_1_H 26 -#define IMG_DEPTH_2_H 27 -#define IMG_DEPTH_3_H 28 -#define IMG_DEPTH_4_H 29 -#define IMG_DEPTH_INFINITY_H 30 - #define IMG_PERSPECTIVE 31 -#define IMG_PERSPECTIVE_H 32 #define IMG_PARALLEL 33 -#define IMG_PARALLEL_H 34 #define IMG_WIRE_FRAME 35 #define IMG_MATTE 36 #define IMG_PLASTIC 37 #define IMG_METAL 38 -#define IMG_WIRE_FRAME_H 39 -#define IMG_MATTE_H 40 -#define IMG_PLASTIC_H 41 -#define IMG_METAL_H 42 - #define IMG_LIGHT_OFF 50 // needs 10 resource ids #define IMG_LIGHT_ON 60 // needs 10 resource ids #define IMG_LIGHT_PREVIEW 70 // needs 10 resource ids -#define IMG_LIGHT_OFF_H 80 // needs 10 resource ids -#define IMG_LIGHT_ON_H 90 // needs 10 resource ids -#define IMG_LIGHT_PREVIEW_H 100 // needs 10 resource ids - #define IMG_LIGHTING_BRIGHT 110 #define IMG_LIGHTING_NORMAL 111 #define IMG_LIGHTING_DIM 112 -#define IMG_LIGHTING_BRIGHT_H 113 -#define IMG_LIGHTING_NORMAL_H 114 -#define IMG_LIGHTING_DIM_H 115 - #define FL_DEPTH 1 #define MTR_DEPTH 2 #define BTN_OK 3 #define BTN_CANCEL 4 #define BTN_HELP 5 - -// diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx index 220047f18b5f..35993c461beb 100644 --- a/svx/source/tbxctrls/extrusioncontrols.hxx +++ b/svx/source/tbxctrls/extrusioncontrols.hxx @@ -63,12 +63,8 @@ private: ValueSet* mpDirectionSet; Image maImgDirection[9]; - Image maImgDirectionH[9]; - Image maImgPerspective; - Image maImgPerspectiveH; Image maImgParallel; - Image maImgParallelH; const rtl::OUString msExtrusionDirection; const rtl::OUString msExtrusionProjection; @@ -111,13 +107,6 @@ private: Image maImgDepth4; Image maImgDepthInfinity; - Image maImgDepth0h; - Image maImgDepth1h; - Image maImgDepth2h; - Image maImgDepth3h; - Image maImgDepth4h; - Image maImgDepthInfinityh; - FieldUnit meUnit; double mfDepth; @@ -164,16 +153,9 @@ private: Image maImgLightingOn[9]; Image maImgLightingPreview[9]; - Image maImgLightingOffh[9]; - Image maImgLightingOnh[9]; - Image maImgLightingPreviewh[9]; - Image maImgBright; Image maImgNormal; Image maImgDim; - Image maImgBrighth; - Image maImgNormalh; - Image maImgDimh; int mnLevel; bool mbLevelEnabled; @@ -221,10 +203,6 @@ private: Image maImgSurface2; Image maImgSurface3; Image maImgSurface4; - Image maImgSurface1h; - Image maImgSurface2h; - Image maImgSurface3h; - Image maImgSurface4h; const rtl::OUString msExtrusionSurface; diff --git a/svx/source/tbxctrls/extrusioncontrols.src b/svx/source/tbxctrls/extrusioncontrols.src index 084606439cc3..55c9ec508d5d 100644 --- a/svx/source/tbxctrls/extrusioncontrols.src +++ b/svx/source/tbxctrls/extrusioncontrols.src @@ -47,111 +47,56 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_DIRECTION ImageBitmap = Bitmap { File = "directionnorthwest_22.bmp" ; }; MASKCOLOR }; - Image IMG_DIRECTION_H + DIRECTION_NW - { - ImageBitmap = Bitmap { File = "directionnorthwest_22_h.bmp" ; }; - MASKCOLOR - }; Image IMG_DIRECTION + DIRECTION_N { ImageBitmap = Bitmap { File = "directionnorth_22.bmp" ; }; MASKCOLOR }; - Image IMG_DIRECTION_H + DIRECTION_N - { - ImageBitmap = Bitmap { File = "directionnorth_22_h.bmp"; }; - MASKCOLOR - }; Image IMG_DIRECTION + DIRECTION_NE { ImageBitmap = Bitmap { File = "directionnortheast_22.bmp"; }; MASKCOLOR }; - Image IMG_DIRECTION_H + DIRECTION_NE - { - ImageBitmap = Bitmap { File = "directionnortheast_22_h.bmp"; }; - MASKCOLOR - }; Image IMG_DIRECTION + DIRECTION_W { ImageBitmap = Bitmap { File = "directionwest_22.bmp"; }; MASKCOLOR }; - Image IMG_DIRECTION_H + DIRECTION_W - { - ImageBitmap = Bitmap { File = "directionwest_22_h.bmp"; }; - MASKCOLOR - }; Image IMG_DIRECTION + DIRECTION_NONE { ImageBitmap = Bitmap { File = "directionstraight_22.bmp"; }; MASKCOLOR }; - Image IMG_DIRECTION_H + DIRECTION_NONE - { - ImageBitmap = Bitmap { File = "directionstraight_22_h.bmp"; }; - MASKCOLOR - }; Image IMG_DIRECTION + DIRECTION_E { ImageBitmap = Bitmap { File = "directioneast_22.bmp"; }; MASKCOLOR }; - Image IMG_DIRECTION_H + DIRECTION_E - { - ImageBitmap = Bitmap { File = "directioneast_22_h.bmp"; }; - MASKCOLOR - }; Image IMG_DIRECTION + DIRECTION_SW { ImageBitmap = Bitmap { File = "directionsouthwest_22.bmp"; }; MASKCOLOR }; - Image IMG_DIRECTION_H + DIRECTION_SW - { - ImageBitmap = Bitmap { File = "directionsouthwest_22_h.bmp"; }; - MASKCOLOR - }; Image IMG_DIRECTION + DIRECTION_S { ImageBitmap = Bitmap { File = "directionsouth_22.bmp"; }; MASKCOLOR }; - Image IMG_DIRECTION_H + DIRECTION_S - { - ImageBitmap = Bitmap { File = "directionsouth_22_h.bmp"; }; - MASKCOLOR - }; Image IMG_DIRECTION + DIRECTION_SE { ImageBitmap = Bitmap { File = "directionsoutheast_22.bmp"; }; MASKCOLOR }; - Image IMG_DIRECTION_H + DIRECTION_SE - { - ImageBitmap = Bitmap { File = "directionsoutheast_22_h.bmp"; }; - MASKCOLOR - }; Image IMG_PERSPECTIVE { ImageBitmap = Bitmap { File = "perspective_16.bmp"; }; MASKCOLOR }; - Image IMG_PERSPECTIVE_H - { - ImageBitmap = Bitmap { File = "perspective_16_h.bmp"; }; - MASKCOLOR - }; Image IMG_PARALLEL { ImageBitmap = Bitmap { File = "parallel_16.bmp"; }; MASKCOLOR }; - Image IMG_PARALLEL_H - { - ImageBitmap = Bitmap { File = "parallel_16_h.bmp"; }; - MASKCOLOR - }; String STR_PERSPECTIVE { @@ -227,66 +172,36 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_DEPTH ImageBitmap = Bitmap { File = "extrusion0inch_16.bmp"; }; MASKCOLOR }; - Image IMG_DEPTH_0_H - { - ImageBitmap = Bitmap { File = "extrusion0inch_16_h.bmp"; }; - MASKCOLOR - }; Image IMG_DEPTH_1 { ImageBitmap = Bitmap { File = "extrusion05inch_16.bmp"; }; MASKCOLOR }; - Image IMG_DEPTH_1_H - { - ImageBitmap = Bitmap { File = "extrusion05inch_16_h.bmp"; }; - MASKCOLOR - }; Image IMG_DEPTH_2 { ImageBitmap = Bitmap { File = "extrusion1inch_16.bmp"; }; MASKCOLOR }; - Image IMG_DEPTH_2_H - { - ImageBitmap = Bitmap { File = "extrusion1inch_16_h.bmp"; }; - MASKCOLOR - }; Image IMG_DEPTH_3 { ImageBitmap = Bitmap { File = "extrusion2inch_16.bmp"; }; MASKCOLOR }; - Image IMG_DEPTH_3_H - { - ImageBitmap = Bitmap { File = "extrusion2inch_16_h.bmp"; }; - MASKCOLOR - }; Image IMG_DEPTH_4 { ImageBitmap = Bitmap { File = "extrusion4inch_16.bmp"; }; MASKCOLOR }; - Image IMG_DEPTH_4_H - { - ImageBitmap = Bitmap { File = "extrusion4inch_16_h.bmp"; }; - MASKCOLOR - }; Image IMG_DEPTH_INFINITY { ImageBitmap = Bitmap { File = "extrusioninfinity_16.bmp"; }; MASKCOLOR }; - Image IMG_DEPTH_INFINITY_H - { - ImageBitmap = Bitmap { File = "extrusioninfinity_16_h.bmp"; }; - MASKCOLOR - }; }; @@ -343,47 +258,6 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING MASKCOLOR }; - Image IMG_LIGHT_OFF_H + FROM_TOP_LEFT - { - ImageBitmap = Bitmap { File = "lightofffromtopleft_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_OFF_H + FROM_TOP - { - ImageBitmap = Bitmap { File = "lightofffromtop_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_OFF_H + FROM_TOP_RIGHT - { - ImageBitmap = Bitmap { File = "lightofffromtopright_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_OFF_H + FROM_LEFT - { - ImageBitmap = Bitmap { File = "lightofffromleft_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_OFF_H + FROM_RIGHT - { - ImageBitmap = Bitmap { File = "lightofffromright_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_OFF_H + FROM_BOTTOM_LEFT - { - ImageBitmap = Bitmap { File = "lightofffrombottomleft_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_OFF_H + FROM_BOTTOM - { - ImageBitmap = Bitmap { File = "lightofffrombottom_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_OFF_H + FROM_BOTTOM_RIGHT - { - ImageBitmap = Bitmap { File = "lightofffrombottomright_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_ON + FROM_TOP_LEFT { ImageBitmap = Bitmap { File = "lightonfromtopleft_22.bmp"; }; @@ -425,47 +299,6 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING MASKCOLOR }; - Image IMG_LIGHT_ON_H + FROM_TOP_LEFT - { - ImageBitmap = Bitmap { File = "lightonfromtopleft_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_ON_H + FROM_TOP - { - ImageBitmap = Bitmap { File = "lightonfromtop_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_ON_H + FROM_TOP_RIGHT - { - ImageBitmap = Bitmap { File = "lightonfromtopright_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_ON_H + FROM_LEFT - { - ImageBitmap = Bitmap { File = "lightonfromleft_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_ON_H + FROM_RIGHT - { - ImageBitmap = Bitmap { File = "lightonfromright_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_ON_H + FROM_BOTTOM_LEFT - { - ImageBitmap = Bitmap { File = "lightonfrombottomleft_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_ON_H + FROM_BOTTOM - { - ImageBitmap = Bitmap { File = "lightonfrombottom_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_ON_H + FROM_BOTTOM_RIGHT - { - ImageBitmap = Bitmap { File = "lightonfrombottomright_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_PREVIEW + FROM_TOP_LEFT { ImageBitmap = Bitmap { File = "lightfromtopleft_22.bmp"; }; @@ -512,52 +345,6 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING MASKCOLOR }; - Image IMG_LIGHT_PREVIEW_H + FROM_TOP_LEFT - { - ImageBitmap = Bitmap { File = "lightfromtopleft_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_PREVIEW_H + FROM_TOP - { - ImageBitmap = Bitmap { File = "lightfromtop_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_PREVIEW_H + FROM_TOP_RIGHT - { - ImageBitmap = Bitmap { File = "lightfromtopright_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_PREVIEW_H + FROM_LEFT - { - ImageBitmap = Bitmap { File = "lightfromleft_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_PREVIEW_H + FROM_RIGHT - { - ImageBitmap = Bitmap { File = "lightfromright_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_PREVIEW_H + FROM_FRONT - { - ImageBitmap = Bitmap { File = "lightfromfront_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_PREVIEW_H + FROM_BOTTOM_LEFT - { - ImageBitmap = Bitmap { File = "lightfrombottomleft_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_PREVIEW_H + FROM_BOTTOM - { - ImageBitmap = Bitmap { File = "lightfrombottom_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHT_PREVIEW_H + FROM_BOTTOM_RIGHT - { - ImageBitmap = Bitmap { File = "lightfrombottomright_22_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHTING_BRIGHT { ImageBitmap = Bitmap { File = "brightlit_16.bmp"; }; @@ -574,22 +361,6 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING MASKCOLOR }; - Image IMG_LIGHTING_BRIGHT_H - { - ImageBitmap = Bitmap { File = "brightlit_16_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHTING_NORMAL_H - { - ImageBitmap = Bitmap { File = "normallit_16_h.bmp"; }; - MASKCOLOR - }; - Image IMG_LIGHTING_DIM_H - { - ImageBitmap = Bitmap { File = "dimlit_16_h.bmp"; }; - MASKCOLOR - }; - String STR_BRIGHT { Text [ en-US ] = "~Bright"; @@ -643,42 +414,24 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_SURFACE ImageBitmap = Bitmap { File = "wireframe_16.bmp"; }; MASKCOLOR }; - Image IMG_WIRE_FRAME_H - { - ImageBitmap = Bitmap { File = "wireframe_16_h.bmp"; }; - MASKCOLOR - }; + Image IMG_MATTE { ImageBitmap = Bitmap { File = "matte_16.bmp"; }; MASKCOLOR }; - Image IMG_MATTE_H - { - ImageBitmap = Bitmap { File = "matte_16_h.bmp"; }; - MASKCOLOR - }; + Image IMG_PLASTIC { ImageBitmap = Bitmap { File = "plastic_16.bmp"; }; MASKCOLOR }; - Image IMG_PLASTIC_H - { - ImageBitmap = Bitmap { File = "plastic_16_h.bmp"; }; - MASKCOLOR - }; + Image IMG_METAL { ImageBitmap = Bitmap { File = "metal_16.bmp"; }; MASKCOLOR }; - Image IMG_METAL_H - { - ImageBitmap = Bitmap { File = "metal_16_h.bmp"; }; - MASKCOLOR - }; - }; #define WIDTH 140 @@ -703,7 +456,6 @@ ModalDialog RID_SVX_MDLG_EXTRUSION_DEPTH }; MetricField MTR_DEPTH { - //HelpId = HID_SD_CTL_FAVORITES ; Border = FALSE ; Pos = MAP_APPFONT ( 3 , 14 ) ; Size = MAP_APPFONT ( WIDTH - 50 - 12, 12 ) ; diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 8de69b705e1b..458e665a5642 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -364,11 +364,6 @@ private: Image maImgAlgin3; Image maImgAlgin4; Image maImgAlgin5; - Image maImgAlgin1h; - Image maImgAlgin2h; - Image maImgAlgin3h; - Image maImgAlgin4h; - Image maImgAlgin5h; const rtl::OUString msFontworkAlignment; @@ -380,16 +375,11 @@ private: FontWorkAlignmentWindow::FontWorkAlignmentWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, Window* pParentWindow ) : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_FONTWORK_ALIGNMENT )) , mrController( rController ) -, maImgAlgin1( SVX_RES( IMG_FONTWORK_ALIGN_LEFT_16 ) ) -, maImgAlgin2( SVX_RES( IMG_FONTWORK_ALIGN_CENTER_16 ) ) -, maImgAlgin3( SVX_RES( IMG_FONTWORK_ALIGN_RIGHT_16 ) ) -, maImgAlgin4( SVX_RES( IMG_FONTWORK_ALIGN_WORD_16 ) ) +, maImgAlgin1( SVX_RES( IMG_FONTWORK_ALIGN_LEFT_16 ) ) +, maImgAlgin2( SVX_RES( IMG_FONTWORK_ALIGN_CENTER_16 ) ) +, maImgAlgin3( SVX_RES( IMG_FONTWORK_ALIGN_RIGHT_16 ) ) +, maImgAlgin4( SVX_RES( IMG_FONTWORK_ALIGN_WORD_16 ) ) , maImgAlgin5( SVX_RES( IMG_FONTWORK_ALIGN_STRETCH_16 ) ) -, maImgAlgin1h( SVX_RES( IMG_FONTWORK_ALIGN_LEFT_16_H ) ) -, maImgAlgin2h( SVX_RES( IMG_FONTWORK_ALIGN_CENTER_16_H ) ) -, maImgAlgin3h( SVX_RES( IMG_FONTWORK_ALIGN_RIGHT_16_H ) ) -, maImgAlgin4h( SVX_RES( IMG_FONTWORK_ALIGN_WORD_16_H ) ) -, maImgAlgin5h( SVX_RES( IMG_FONTWORK_ALIGN_STRETCH_16_H ) ) , msFontworkAlignment( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkAlignment" ) ) { bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); @@ -397,11 +387,11 @@ FontWorkAlignmentWindow::FontWorkAlignmentWindow( svt::ToolboxController& rContr SetHelpId( HID_POPUP_FONTWORK_ALIGN ); SetSelectHdl( LINK( this, FontWorkAlignmentWindow, SelectHdl ) ); - appendEntry( 0, String( SVX_RES( STR_ALIGN_LEFT ) ), bHighContrast ? maImgAlgin1h : maImgAlgin1 ); - appendEntry( 1, String( SVX_RES( STR_ALIGN_CENTER ) ), bHighContrast ? maImgAlgin2h : maImgAlgin2 ); - appendEntry( 2, String( SVX_RES( STR_ALIGN_RIGHT ) ), bHighContrast ? maImgAlgin3h : maImgAlgin3 ); - appendEntry( 3, String( SVX_RES( STR_ALIGN_WORD ) ), bHighContrast ? maImgAlgin4h : maImgAlgin4 ); - appendEntry( 4, String( SVX_RES( STR_ALIGN_STRETCH ) ), bHighContrast ? maImgAlgin5h : maImgAlgin5 ); + appendEntry( 0, String( SVX_RES( STR_ALIGN_LEFT ) ), maImgAlgin1 ); + appendEntry( 1, String( SVX_RES( STR_ALIGN_CENTER ) ), maImgAlgin2 ); + appendEntry( 2, String( SVX_RES( STR_ALIGN_RIGHT ) ), maImgAlgin3 ); + appendEntry( 3, String( SVX_RES( STR_ALIGN_WORD ) ), maImgAlgin4 ); + appendEntry( 4, String( SVX_RES( STR_ALIGN_STRETCH ) ), maImgAlgin5 ); SetOutputSizePixel( getMenuSize() ); @@ -451,11 +441,11 @@ void FontWorkAlignmentWindow::DataChanged( const DataChangedEvent& rDCEvt ) { bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - appendEntry( 0, String( SVX_RES( STR_ALIGN_LEFT ) ), bHighContrast ? maImgAlgin1h : maImgAlgin1 ); - appendEntry( 1, String( SVX_RES( STR_ALIGN_CENTER ) ), bHighContrast ? maImgAlgin2h : maImgAlgin2 ); - appendEntry( 2, String( SVX_RES( STR_ALIGN_RIGHT ) ), bHighContrast ? maImgAlgin3h : maImgAlgin3 ); - appendEntry( 3, String( SVX_RES( STR_ALIGN_WORD ) ), bHighContrast ? maImgAlgin4h : maImgAlgin4 ); - appendEntry( 4, String( SVX_RES( STR_ALIGN_STRETCH ) ), bHighContrast ? maImgAlgin5h : maImgAlgin5 ); + appendEntry( 0, String( SVX_RES( STR_ALIGN_LEFT ) ), maImgAlgin1 ); + appendEntry( 1, String( SVX_RES( STR_ALIGN_CENTER ) ), maImgAlgin2 ); + appendEntry( 2, String( SVX_RES( STR_ALIGN_RIGHT ) ), maImgAlgin3 ); + appendEntry( 3, String( SVX_RES( STR_ALIGN_WORD ) ), maImgAlgin4 ); + appendEntry( 4, String( SVX_RES( STR_ALIGN_STRETCH ) ), maImgAlgin5 ); } } @@ -587,13 +577,13 @@ FontWorkCharacterSpacingWindow::FontWorkCharacterSpacingWindow( svt::ToolboxCont SetSelectHdl( LINK( this, FontWorkCharacterSpacingWindow, SelectHdl ) ); appendEntry( 0, String( SVX_RES( STR_CHARS_SPACING_VERY_TIGHT ) ), MIB_RADIOCHECK ); - appendEntry( 1, String( SVX_RES( STR_CHARS_SPACING_TIGHT ) ), MIB_RADIOCHECK ); - appendEntry( 2, String( SVX_RES( STR_CHARS_SPACING_NORMAL ) ), MIB_RADIOCHECK ); - appendEntry( 3, String( SVX_RES( STR_CHARS_SPACING_LOOSE ) ), MIB_RADIOCHECK ); + appendEntry( 1, String( SVX_RES( STR_CHARS_SPACING_TIGHT ) ), MIB_RADIOCHECK ); + appendEntry( 2, String( SVX_RES( STR_CHARS_SPACING_NORMAL ) ), MIB_RADIOCHECK ); + appendEntry( 3, String( SVX_RES( STR_CHARS_SPACING_LOOSE ) ), MIB_RADIOCHECK ); appendEntry( 4, String( SVX_RES( STR_CHARS_SPACING_VERY_LOOSE ) ), MIB_RADIOCHECK ); - appendEntry( 5, String( SVX_RES( STR_CHARS_SPACING_CUSTOM ) ), MIB_RADIOCHECK ); + appendEntry( 5, String( SVX_RES( STR_CHARS_SPACING_CUSTOM ) ), MIB_RADIOCHECK ); appendSeparator(); - appendEntry( 6, String( SVX_RES( STR_CHARS_SPACING_KERN_PAIRS ) ), MIB_CHECKABLE ); + appendEntry( 6, String( SVX_RES( STR_CHARS_SPACING_KERN_PAIRS ) ), MIB_CHECKABLE ); SetOutputSizePixel( getMenuSize() ); diff --git a/svx/source/tbxctrls/fontworkgallery.src b/svx/source/tbxctrls/fontworkgallery.src index e5f52158b4b6..ffa1e7c9f3f0 100644 --- a/svx/source/tbxctrls/fontworkgallery.src +++ b/svx/source/tbxctrls/fontworkgallery.src @@ -130,101 +130,51 @@ DockingWindow RID_SVXFLOAT_FONTWORK_ALIGNMENT ImageBitmap = Bitmap { File = "fontworkalignleft_16.png"; }; MASKCOLOR }; - Image IMG_FONTWORK_ALIGN_LEFT_16_H - { - ImageBitmap = Bitmap { File = "fontworkalignleft_16_h.png"; }; - MASKCOLOR - }; Image IMG_FONTWORK_ALIGN_LEFT_26 { ImageBitmap = Bitmap { File = "fontworkalignleft_26.png"; }; MASKCOLOR }; - Image IMG_FONTWORK_ALIGN_LEFT_26_H - { - ImageBitmap = Bitmap { File = "fontworkalignleft_26_h.png"; }; - MASKCOLOR - }; Image IMG_FONTWORK_ALIGN_CENTER_16 { ImageBitmap = Bitmap { File = "fontworkaligncentered_16.png"; }; MASKCOLOR }; - Image IMG_FONTWORK_ALIGN_CENTER_16_H - { - ImageBitmap = Bitmap { File = "fontworkaligncentered_16_h.png"; }; - MASKCOLOR - }; Image IMG_FONTWORK_ALIGN_CENTER_26 { ImageBitmap = Bitmap { File = "fontworkaligncentered_26.png"; }; MASKCOLOR }; - Image IMG_FONTWORK_ALIGN_CENTER_26_H - { - ImageBitmap = Bitmap { File = "fontworkaligncentered_26_h.png"; }; - MASKCOLOR - }; Image IMG_FONTWORK_ALIGN_RIGHT_16 { ImageBitmap = Bitmap { File = "fontworkalignright_16.png"; }; MASKCOLOR }; - Image IMG_FONTWORK_ALIGN_RIGHT_16_H - { - ImageBitmap = Bitmap { File = "fontworkalignright_16_h.png"; }; - MASKCOLOR - }; Image IMG_FONTWORK_ALIGN_RIGHT_26 { ImageBitmap = Bitmap { File = "fontworkalignright_26.png"; }; MASKCOLOR }; - Image IMG_FONTWORK_ALIGN_RIGHT_26_H - { - ImageBitmap = Bitmap { File = "fontworkalignright_26_h.png"; }; - MASKCOLOR - }; Image IMG_FONTWORK_ALIGN_WORD_16 { ImageBitmap = Bitmap { File = "fontworkalignjustified_16.png"; }; MASKCOLOR }; - Image IMG_FONTWORK_ALIGN_WORD_16_H - { - ImageBitmap = Bitmap { File = "fontworkalignjustified_16_h.png"; }; - MASKCOLOR - }; Image IMG_FONTWORK_ALIGN_WORD_26 { ImageBitmap = Bitmap { File = "fontworkalignjustified_26.png"; }; MASKCOLOR }; - Image IMG_FONTWORK_ALIGN_WORD_26_H - { - ImageBitmap = Bitmap { File = "fontworkalignjustified_26_h.png"; }; - MASKCOLOR - }; Image IMG_FONTWORK_ALIGN_STRETCH_16 { ImageBitmap = Bitmap { File = "fontworkalignstretch_16.png"; }; MASKCOLOR }; - Image IMG_FONTWORK_ALIGN_STRETCH_16_H - { - ImageBitmap = Bitmap { File = "fontworkalignstretch_16_h.png"; }; - MASKCOLOR - }; Image IMG_FONTWORK_ALIGN_STRETCH_26 { ImageBitmap = Bitmap { File = "fontworkalignstretch_26.png"; }; MASKCOLOR }; - Image IMG_FONTWORK_ALIGN_STRETCH_26_H - { - ImageBitmap = Bitmap { File = "fontworkalignstretch_26_h.png"; }; - MASKCOLOR - }; }; DockingWindow RID_SVXFLOAT_FONTWORK_CHARSPACING diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index c031f6b87fc2..57954c550d62 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -116,8 +116,6 @@ void SvxLineBox::Select() { XLineStyle eXLS; USHORT nPos = GetSelectEntryPos(); -// SfxDispatcher* pDisp = rBindings.GetDispatcher(); - //DBG_ASSERT( pDisp, "invalid Dispatcher" ); switch ( nPos ) { @@ -152,7 +150,6 @@ void SvxLineBox::Select() SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LineDash" )), aArgs ); -// pDisp->Execute( SID_ATTR_LINE_DASH, SFX_CALLMODE_RECORD, &aLineDashItem, 0L ); } } break; @@ -167,7 +164,6 @@ void SvxLineBox::Select() SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:XLineStyle" )), aArgs ); -// pDisp->Execute( SID_ATTR_LINE_STYLE, SFX_CALLMODE_RECORD, &aLineStyleItem, 0L ); nCurPos = GetSelectEntryPos(); ReleaseFocus_Impl(); @@ -287,10 +283,8 @@ void SvxLineBox::FillControl() if ( pItem ) Fill( pItem->GetDashList() ); } - - -// rBindings.Invalidate( SID_ATTR_LINE_DASH ); } + //======================================================================== // SvxColorBox //======================================================================== @@ -332,7 +326,6 @@ IMPL_LINK( SvxColorBox, DelayHdl_Impl, Timer *, EMPTYARG ) const SvxColorTableItem* pItem = (const SvxColorTableItem*)( pSh->GetItem( SID_COLOR_TABLE ) ); if ( pItem ) Fill( pItem->GetColorTable() ); -// rBindings.Invalidate( nId ); } return 0; } @@ -373,7 +366,6 @@ void SvxColorBox::Select() SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), maCommand, aArgs ); -// rBindings.GetDispatcher()->Execute( nId, SFX_CALLMODE_RECORD, &aLineColorItem, 0L ); nCurPos = GetSelectEntryPos(); ReleaseFocus_Impl(); @@ -532,7 +524,6 @@ void SvxMetricField::Modify() SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LineWidth" )), aArgs ); -// rBindings.GetDispatcher()->Execute( SID_ATTR_LINE_WIDTH, SFX_CALLMODE_RECORD, &aLineWidthItem, 0L ); } // ----------------------------------------------------------------------- diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 8ae28bffc82c..5762964fbda2 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -276,15 +276,8 @@ public: const SfxPoolItem* pState ); virtual SfxPopupWindow* Clone() const; virtual void DataChanged( const DataChangedEvent& rDCEvt ); - - inline BOOL IsHighContrast( void ) const; }; -inline BOOL SvxFrameWindow_Impl::IsHighContrast( void ) const -{ - return GetSettings().GetStyleSettings().GetHighContrastMode(); -} - //======================================================================== // class SvxLineWindow_Impl --------------------------------------------------- //======================================================================== @@ -1066,7 +1059,7 @@ SvxFrameWindow_Impl::SvxFrameWindow_Impl( USHORT nId, const Reference< XFrame >& BindListener(); String sCommand(String::CreateFromAscii( ".uno:BorderReducedMode" )); AddStatusListener( sCommand ); - aImgList = ImageList( SVX_RES( IsHighContrast()? RID_SVXIL_FRAME_HC : RID_SVXIL_FRAME ) ); + aImgList = ImageList( SVX_RES( RID_SVXIL_FRAME ) ); /* * 1 2 3 4 @@ -1127,7 +1120,7 @@ void SvxFrameWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) { - aImgList = ImageList( SVX_RES( IsHighContrast()? RID_SVXIL_FRAME_HC : RID_SVXIL_FRAME ) ); + aImgList = ImageList( SVX_RES( RID_SVXIL_FRAME ) ); USHORT nNumOfItems = aFrameSet.GetItemCount(); diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src index f3e068f56226..e7ef82b0dc98 100644 --- a/svx/source/tbxctrls/tbcontrl.src +++ b/svx/source/tbxctrls/tbcontrl.src @@ -52,13 +52,6 @@ ImageList RID_SVXIL_FRAME IdCount = { 12 ; }; MASKCOLOR }; -ImageList RID_SVXIL_FRAME_HC -{ - Prefix = "frh"; - IdList = { 1 ; 2 ; 3 ; 4 ; 5 ; 6 ; 7 ; 8 ; 9 ; 10 ; 11 ; 12 ; }; - IdCount = { 12 ; }; - MASKCOLOR -}; String RID_SVXSTR_TRANSPARENT { Text [ en-US ] = "No Fill" ; |