summaryrefslogtreecommitdiff
path: root/sfx2/source
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2/source')
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx1
-rwxr-xr-xsfx2/source/dialog/dinfdlg.src5
-rw-r--r--sfx2/source/dialog/recfloat.src1
-rw-r--r--sfx2/source/doc/doc.hrc8
-rw-r--r--sfx2/source/doc/doc.src8
-rw-r--r--sfx2/source/doc/docvor.cxx26
-rw-r--r--sfx2/source/doc/docvor.hrc4
-rw-r--r--sfx2/source/doc/docvor.src53
-rw-r--r--sfx2/source/doc/objcont.cxx48
-rw-r--r--sfx2/source/inc/sfxlocal.hrc1
10 files changed, 13 insertions, 142 deletions
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index a52cfe3d8edf..36d5564148df 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1770,7 +1770,6 @@ CustomPropertyLine::CustomPropertyLine( Window* pParent ) :
m_aDateField.SetExtDateFormat( XTDATEF_SYSTEM_SHORT_YYYY );
m_aRemoveButton.SetModeImage( SfxResId( SFX_IMG_PROPERTY_REMOVE ), BMP_COLOR_NORMAL );
- m_aRemoveButton.SetModeImage( SfxResId( SFX_IMG_PROPERTY_REMOVE_HC ), BMP_COLOR_HIGHCONTRAST );
}
void CustomPropertyLine::SetRemoved()
diff --git a/sfx2/source/dialog/dinfdlg.src b/sfx2/source/dialog/dinfdlg.src
index 53b0f35685cb..ddc76d54ce19 100755
--- a/sfx2/source/dialog/dinfdlg.src
+++ b/sfx2/source/dialog/dinfdlg.src
@@ -672,11 +672,6 @@ Image SFX_IMG_PROPERTY_REMOVE
ImageBitmap = Bitmap { File = "deleterow.bmp" ; };
MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; };
};
-Image SFX_IMG_PROPERTY_REMOVE_HC
-{
- ImageBitmap = Bitmap { File = "deleterow_h.bmp" ; };
- MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; };
-};
QueryBox SFX_QB_WRONG_TYPE
{
diff --git a/sfx2/source/dialog/recfloat.src b/sfx2/source/dialog/recfloat.src
index 5bdde1f57ab6..7c35f2106cee 100644
--- a/sfx2/source/dialog/recfloat.src
+++ b/sfx2/source/dialog/recfloat.src
@@ -30,7 +30,6 @@
// -----------------------------------------------------------------------
#define STD_MASKCOLOR Color { Red = 0xC000; Green = 0xC000; Blue = 0xC000; }
-#define STD_HC_MASKCOLOR Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }
FloatingWindow SID_RECORDING_FLOATWINDOW
{
diff --git a/sfx2/source/doc/doc.hrc b/sfx2/source/doc/doc.hrc
index 1176936cb3e7..5f3507334fac 100644
--- a/sfx2/source/doc/doc.hrc
+++ b/sfx2/source/doc/doc.hrc
@@ -62,14 +62,6 @@
#define BMP_STYLES_FAMILY3 (RID_SFX_DOC_START+ 4)
#define BMP_STYLES_FAMILY4 (RID_SFX_DOC_START+ 5)
-#define BMP_STYLES_CLOSED_HC (RID_SFX_DOC_START+ 6)
-#define BMP_STYLES_OPENED_HC (RID_SFX_DOC_START+ 7)
-
-#define BMP_STYLES_FAMILY1_HC (RID_SFX_DOC_START+ 8)
-#define BMP_STYLES_FAMILY2_HC (RID_SFX_DOC_START+ 9)
-#define BMP_STYLES_FAMILY3_HC (RID_SFX_DOC_START+ 10)
-#define BMP_STYLES_FAMILY4_HC (RID_SFX_DOC_START+ 11)
-
#define STR_STYLES (RID_SFX_DOC_START+ 18)
#define STR_MACROS (RID_SFX_DOC_START+ 19)
diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src
index be025879318d..10d264181288 100644
--- a/sfx2/source/doc/doc.src
+++ b/sfx2/source/doc/doc.src
@@ -72,9 +72,6 @@ String STR_QUERY_SAVE_DOCUMENT
Bitmap BMP_STYLES_CLOSED { File = "newex.bmp" ; };
Bitmap BMP_STYLES_OPENED { File = "newex.bmp" ; };
-Bitmap BMP_STYLES_CLOSED_HC { File = "newex_h.bmp" ; };
-Bitmap BMP_STYLES_OPENED_HC { File = "newex_h.bmp" ; };
-
String STR_STYLES
{
Text [ en-US ] = "Styles" ;
@@ -100,11 +97,6 @@ Bitmap BMP_STYLES_FAMILY2 { File = "styfam2.bmp" ; };
Bitmap BMP_STYLES_FAMILY3 { File = "styfam3.bmp" ; };
Bitmap BMP_STYLES_FAMILY4 { File = "styfam4.bmp" ; };
-Bitmap BMP_STYLES_FAMILY1_HC { File = "styfam1_h.bmp" ; };
-Bitmap BMP_STYLES_FAMILY2_HC { File = "styfam2_h.bmp" ; };
-Bitmap BMP_STYLES_FAMILY3_HC { File = "styfam3_h.bmp" ; };
-Bitmap BMP_STYLES_FAMILY4_HC { File = "styfam4_h.bmp" ; };
-
ErrorBox MSG_PRINT_ERROR
{
BUTTONS = WB_OK ;
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index 23000346edf4..ea3b383982fc 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -104,19 +104,13 @@ public:
inline void SfxOrganizeListBox_Impl::SetBitmaps(
- const Image &rOFolder, const Image &rCFolder, const Image &rODoc, const Image &rCDoc,
- const Image &rOFolderHC, const Image &rCFolderHC, const Image &rODocHC, const Image &rCDocHC )
+ const Image &rOFolder, const Image &rCFolder, const Image &rODoc, const Image &rCDoc )
{
aOpenedFolderBmp = rOFolder;
aClosedFolderBmp = rCFolder;
aOpenedDocBmp = rODoc;
aClosedDocBmp = rCDoc;
- aOpenedFolderBmpHC = rOFolderHC;
- aClosedFolderBmpHC = rCFolderHC;
- aOpenedDocBmpHC = rODocHC;
- aClosedDocBmpHC = rCDocHC;
-
}
//=========================================================================
@@ -325,15 +319,8 @@ void SfxOrganizeDlg_Impl::InitBitmaps( void )
Image aOpenedDocBmp( SfxResId( IMG_OPENED_DOC ) );
Image aClosedDocBmp( SfxResId( IMG_CLOSED_DOC ) );
- Image aOpenedFolderBmpHC( SfxResId( IMG_OPENED_FOLDER_HC ) );
- Image aClosedFolderBmpHC( SfxResId( IMG_CLOSED_FOLDER_HC ) );
- Image aOpenedDocBmpHC( SfxResId( IMG_OPENED_DOC_HC ) );
- Image aClosedDocBmpHC( SfxResId( IMG_CLOSED_DOC_HC ) );
-
- aLeftLb.SetBitmaps( aOpenedFolderBmp, aClosedFolderBmp, aOpenedDocBmp, aClosedDocBmp,
- aOpenedFolderBmpHC, aClosedFolderBmpHC, aOpenedDocBmpHC, aClosedDocBmpHC );
- aRightLb.SetBitmaps( aOpenedFolderBmp, aClosedFolderBmp, aOpenedDocBmp, aClosedDocBmp,
- aOpenedFolderBmpHC, aClosedFolderBmpHC, aOpenedDocBmpHC, aClosedDocBmpHC );
+ aLeftLb.SetBitmaps( aOpenedFolderBmp, aClosedFolderBmp, aOpenedDocBmp, aClosedDocBmp );
+ aRightLb.SetBitmaps( aOpenedFolderBmp, aClosedFolderBmp, aOpenedDocBmp, aClosedDocBmp );
}
//=========================================================================
@@ -1472,15 +1459,16 @@ const Image &SfxOrganizeListBox_Impl::GetClosedBmp(USHORT nLevel) const
*/
{
- BOOL bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
const Image* pRet = NULL;
switch( nLevel )
{
default: DBG_ERROR( "Bitmaps ueberindiziert" );
- case 0: pRet = bHC? &aClosedFolderBmpHC : &aClosedFolderBmp; break;
- case 1: pRet = bHC? &aClosedDocBmpHC : &aClosedDocBmp; break;
+ case 0: pRet = &aClosedFolderBmp;
+ break;
+ case 1: pRet = &aClosedDocBmp;
+ break;
}
return *pRet;
diff --git a/sfx2/source/doc/docvor.hrc b/sfx2/source/doc/docvor.hrc
index 842aa73fb8a3..c17f424a2a90 100644
--- a/sfx2/source/doc/docvor.hrc
+++ b/sfx2/source/doc/docvor.hrc
@@ -29,10 +29,6 @@
#define IMG_CLOSED_FOLDER 1
#define IMG_OPENED_DOC 3
#define IMG_CLOSED_DOC 4
-#define IMG_OPENED_FOLDER_HC 5
-#define IMG_CLOSED_FOLDER_HC 6
-#define IMG_OPENED_DOC_HC 7
-#define IMG_CLOSED_DOC_HC 8
#define ACC_EDIT 1
#define ID_COPY 201
diff --git a/sfx2/source/doc/docvor.src b/sfx2/source/doc/docvor.src
index 2c9975de9bb8..0c82ba60638c 100644
--- a/sfx2/source/doc/docvor.src
+++ b/sfx2/source/doc/docvor.src
@@ -259,57 +259,4 @@ ModalDialog DLG_ORGANIZE
MASKCOLOR ;
ImageBitmap = Bitmap { File = "doccl.bmp" ; } ;
};
- Image IMG_OPENED_FOLDER_HC
- {
- MASKCOLOR ;
- ImageBitmap = Bitmap { File = "folderop_h.bmp" ; } ;
- };
- Image IMG_CLOSED_FOLDER_HC
- {
- MASKCOLOR ;
- ImageBitmap = Bitmap { File = "foldercl_h.bmp" ; } ;
- };
- Image IMG_OPENED_DOC_HC
- {
- MASKCOLOR ;
- ImageBitmap = Bitmap { File = "doccl_h.bmp" ; } ;
- };
- Image IMG_CLOSED_DOC_HC
- {
- MASKCOLOR ;
- ImageBitmap = Bitmap { File = "doccl_h.bmp" ; } ;
- };
- /* FixedText FT_DEFAULT_TEMPLATE_LABEL
- {
- Pos = MAP_APPFONT ( 3 , 161 ) ;
- Size = MAP_APPFONT ( 61 , 10 ) ;
- Text [ en-US ] = "Default template:" ;
- };
- FixedText FT_DEFAULT_TEMPLATE
- {
- Pos = MAP_APPFONT ( 66 , 161 ) ;
- Size = MAP_APPFONT ( 131 , 10 ) ;
- };*/
};
- // ********************************************************************** EOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index f7712651c330..a98a2723b15d 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -437,37 +437,14 @@ void SfxObjectShell::GetContent(String &rText,
{
case CONTENT_STYLE:
nTextResId = STR_STYLES;
- if ( eColorMode == BMP_COLOR_NORMAL )
- {
- nClosedBitmapResId= BMP_STYLES_CLOSED;
- nOpenedBitmapResId= BMP_STYLES_OPENED;
- }
- else
- {
- nClosedBitmapResId= BMP_STYLES_CLOSED_HC;
- nOpenedBitmapResId= BMP_STYLES_OPENED_HC;
- }
+ nClosedBitmapResId= BMP_STYLES_CLOSED;
+ nOpenedBitmapResId= BMP_STYLES_OPENED;
break;
case CONTENT_MACRO:
nTextResId = STR_MACROS;
- if ( eColorMode == BMP_COLOR_NORMAL )
- {
- nClosedBitmapResId= BMP_STYLES_CLOSED;
- nOpenedBitmapResId= BMP_STYLES_OPENED;
- }
- else
- {
- nClosedBitmapResId= BMP_STYLES_CLOSED_HC;
- nOpenedBitmapResId= BMP_STYLES_OPENED_HC;
- }
- break;
-/*
- case CONTENT_CONFIG:
- nTextResId = STR_CONFIG;
nClosedBitmapResId= BMP_STYLES_CLOSED;
nOpenedBitmapResId= BMP_STYLES_OPENED;
break;
- */
}
if ( nTextResId )
@@ -493,19 +470,6 @@ void SfxObjectShell::GetContent(String &rText,
break;
case CONTENT_MACRO:
break;
-/*
- case CONTENT_CONFIG:
- if ( GetConfigManager() )
- {
- rText = GetConfigManager()->GetItem(i);
- bCanDel = GetConfigManager()->CanDelete(i);
- }
- else
- rText = String();
- rClosedBitmap = Bitmap(SfxResId(BMP_STYLES_CLOSED));
- rOpenedBitmap = Bitmap(SfxResId(BMP_STYLES_OPENED));
- break;
-*/
}
}
@@ -524,16 +488,16 @@ Bitmap SfxObjectShell::GetStyleFamilyBitmap(SfxStyleFamily eFamily, BmpColorMode
switch(eFamily)
{
case SFX_STYLE_FAMILY_CHAR:
- nResId = ( eColorMode == BMP_COLOR_NORMAL ) ? BMP_STYLES_FAMILY1 : BMP_STYLES_FAMILY1_HC;
+ nResId = BMP_STYLES_FAMILY1;
break;
case SFX_STYLE_FAMILY_PARA:
- nResId = ( eColorMode == BMP_COLOR_NORMAL ) ? BMP_STYLES_FAMILY2 : BMP_STYLES_FAMILY2_HC;
+ nResId = BMP_STYLES_FAMILY2;
break;
case SFX_STYLE_FAMILY_FRAME:
- nResId = ( eColorMode == BMP_COLOR_NORMAL ) ? BMP_STYLES_FAMILY3 : BMP_STYLES_FAMILY3_HC;
+ nResId = BMP_STYLES_FAMILY3;
break;
case SFX_STYLE_FAMILY_PAGE :
- nResId = ( eColorMode == BMP_COLOR_NORMAL ) ? BMP_STYLES_FAMILY4 : BMP_STYLES_FAMILY4_HC;
+ nResId = BMP_STYLES_FAMILY4;
break;
case SFX_STYLE_FAMILY_PSEUDO:
case SFX_STYLE_FAMILY_ALL:
diff --git a/sfx2/source/inc/sfxlocal.hrc b/sfx2/source/inc/sfxlocal.hrc
index 7096d71fabdc..a6a7d85de0e5 100644
--- a/sfx2/source/inc/sfxlocal.hrc
+++ b/sfx2/source/inc/sfxlocal.hrc
@@ -67,7 +67,6 @@
// Images ----------------------------------------------------------------
#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)
#endif
generated by cgit (git 2.34.1) at 2025-01-01 04:51:04 +0000