[Libreoffice-commits] .: desktop/source fpicker/source framework/inc framework/source sfx2/inc sfx2/source svx/inc svx/source
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Sat Nov 6 08:13:10 PDT 2010
desktop/source/deployment/gui/dp_gui.hrc | 57 +--
desktop/source/deployment/gui/dp_gui_dialog.src | 53 +--
desktop/source/deployment/gui/dp_gui_dialog2.src | 26 -
desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 28 -
desktop/source/deployment/gui/dp_gui_extlistbox.hxx | 12
desktop/source/deployment/gui/license_dialog.cxx | 19 -
fpicker/source/office/iodlg.cxx | 11
fpicker/source/office/iodlg.src | 9
fpicker/source/office/iodlgimp.cxx | 2
framework/inc/classes/addonmenu.hxx | 35 +-
framework/inc/classes/bmkmenu.hxx | 33 +-
framework/inc/classes/resource.hrc | 30 +-
framework/inc/framework.hrc | 24 -
framework/inc/helper/imageproducer.hxx | 16 -
framework/source/classes/addonsoptions.cxx | 20 -
framework/source/classes/menumanager.cxx | 4
framework/source/classes/resource.src | 36 +-
framework/source/helper/imageproducer.cxx | 9
framework/source/services/backingwindow.cxx | 48 +--
framework/source/services/fwk_services.src | 74 -----
framework/source/uielement/controlmenucontroller.cxx | 45 +--
framework/source/uielement/menubarmanager.cxx | 4
sfx2/inc/docvor.hxx | 3
sfx2/inc/fwkhelper.hxx | 6
sfx2/inc/imagemgr.hxx | 8
sfx2/inc/sfx2/sfx.hrc | 2
sfx2/source/appl/app.hrc | 29 -
sfx2/source/appl/module.cxx | 8
sfx2/source/appl/newhelp.cxx | 112 ++++---
sfx2/source/appl/newhelp.src | 143 ++-------
sfx2/source/dialog/dialog.hrc | 4
sfx2/source/dialog/templdlg.cxx | 8
sfx2/source/dialog/templdlg.src | 17 -
sfx2/source/dialog/titledockwin.cxx | 19 -
sfx2/source/dialog/titledockwin.src | 8
sfx2/source/doc/docvor.cxx | 2
sfx2/source/doc/new.cxx | 5
sfx2/source/inc/sfxlocal.hrc | 3
sfx2/source/toolbox/imgmgr.cxx | 78 ++---
svx/inc/fontworkgallery.hrc | 12
svx/inc/gallery.hrc | 4
svx/inc/imapdlg.hxx | 3
svx/inc/svx/bmpmask.hxx | 3
svx/inc/svx/dialogs.hrc | 88 ++---
svx/inc/svx/fontwork.hxx | 3
svx/inc/svx/langbox.hxx | 9
svx/source/dialog/_bmpmask.cxx | 9
svx/source/dialog/_contdlg.cxx | 11
svx/source/dialog/bmpmask.hrc | 5
svx/source/dialog/bmpmask.src | 7
svx/source/dialog/contdlg.hrc | 3
svx/source/dialog/contdlg.src | 13
svx/source/dialog/contimp.hxx | 3
svx/source/dialog/docrecovery.cxx | 13
svx/source/dialog/docrecovery.hrc | 5
svx/source/dialog/docrecovery.src | 14
svx/source/dialog/fontwork.cxx | 23 -
svx/source/dialog/fontwork.hrc | 3
svx/source/dialog/fontwork.src | 57 ---
svx/source/dialog/frmsel.cxx | 2
svx/source/dialog/hyprlink.cxx | 2
svx/source/dialog/imapdlg.cxx | 7
svx/source/dialog/imapdlg.hrc | 3
svx/source/dialog/imapdlg.src | 9
svx/source/dialog/langbox.cxx | 17 -
svx/source/dialog/langbox.src | 8
svx/source/form/datanavi.cxx | 21 -
svx/source/form/datanavi.src | 14
svx/source/form/filtnav.cxx | 62 +---
svx/source/form/fmexpl.cxx | 31 +-
svx/source/form/fmexpl.src | 9
svx/source/form/fmshimp.cxx | 10
svx/source/form/navigatortree.cxx | 35 --
svx/source/form/navigatortreemodel.cxx | 26 -
svx/source/gallery2/galbrws2.cxx | 6
svx/source/gallery2/gallery.src | 15 -
svx/source/inc/datanavi.hrc | 12
svx/source/inc/datanavi.hxx | 5
svx/source/inc/docrecovery.hxx | 5
svx/source/inc/fmexpl.hxx | 13
svx/source/inc/fmresids.hrc | 3
svx/source/sdr/contact/viewcontactofsdrpage.cxx | 40 +-
svx/source/src/app.src | 16 -
svx/source/stbctrls/stbctrls.src | 51 ---
svx/source/stbctrls/xmlsecctrl.cxx | 15 -
svx/source/stbctrls/zoomsliderctrl.cxx | 9
svx/source/tbxctrls/extrusioncontrols.cxx | 279 +++++++++----------
svx/source/tbxctrls/extrusioncontrols.hrc | 27 -
svx/source/tbxctrls/extrusioncontrols.hxx | 34 --
svx/source/tbxctrls/extrusioncontrols.src | 278 +-----------------
svx/source/tbxctrls/fontworkgallery.cxx | 58 +--
svx/source/tbxctrls/fontworkgallery.src | 70 ----
svx/source/tbxctrls/itemwin.cxx | 13
svx/source/tbxctrls/tbcontrl.cxx | 13
svx/source/tbxctrls/tbcontrl.src | 9
svx/source/tbxctrls/tbxcolorupdate.cxx | 2
96 files changed, 822 insertions(+), 1745 deletions(-)
New commits:
commit 858a431c25f7c8616c97bbe79b7cfb5913e59353
Author: Joseph Powers <jpowers27 at cox.net>
Date: Fri Nov 5 19:24:42 2010 -0700
High-Contrast Cleanup Phase #1
diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/source/deployment/gui/dp_gui.hrc
index 19b2faf..77b3fa0 100755
--- a/desktop/source/deployment/gui/dp_gui.hrc
+++ b/desktop/source/deployment/gui/dp_gui.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@
#define RID_DLG_EXTENSION_MANAGER RID_DEPLOYMENT_GUI_START
#define RID_DLG_UPDATE_REQUIRED (RID_DEPLOYMENT_GUI_START + 11)
-#define RID_EM_BTN_CLOSE 10
+#define RID_EM_BTN_CLOSE 10
#define RID_EM_BTN_HELP 11
#define RID_EM_BTN_ADD 12
#define RID_EM_BTN_CHECK_UPDATES 13
@@ -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
@@ -123,8 +122,8 @@
#define RID_DLG_UPDATE_BROWSERBASED 25
#define RID_DLG_UPDATE_PUBLISHER_LABEL 26
#define RID_DLG_UPDATE_PUBLISHER_LINK 27
-#define RID_DLG_UPDATE_RELEASENOTES_LABEL 28
-#define RID_DLG_UPDATE_RELEASENOTES_LINK 29
+#define RID_DLG_UPDATE_RELEASENOTES_LABEL 28
+#define RID_DLG_UPDATE_RELEASENOTES_LINK 29
#define RID_DLG_UPDATE_NOUPDATE 30
#define RID_DLG_UPDATE_VERSION 31
@@ -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 db2e097..cb9454f 100755
--- a/desktop/source/deployment/gui/dp_gui_dialog.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -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";
@@ -123,7 +129,7 @@ String RID_STR_ERROR_MISSING_LICENSE
// ---------------------------------------------------
// row 1 | multi line edit
// ---------------------------------------------------
-// row 2 | fixed text
+// row 2 | fixed text
// ---------------------------------------------------
// row 3 | img | fixed text | fixed text | button
// ----------------------------------------------------
@@ -131,7 +137,7 @@ String RID_STR_ERROR_MISSING_LICENSE
// ---------------------------------------------------
// row 5 |fixed line
// ---------------------------------------------------
-// row 6 | | |button | button
+// row 6 | | |button | button
// ---------------------------------------------------
// | col 1 | col 2 | col3 | col4 | col5
@@ -177,7 +183,6 @@ ModalDialog RID_DLG_LICENSE
Moveable = TRUE;
Closeable = TRUE;
Sizeable = FALSE;
-// Hide = TRUE;
MultiLineEdit ML_LICENSE
{
@@ -187,7 +192,7 @@ ModalDialog RID_DLG_LICENSE
VScroll = TRUE;
ReadOnly = TRUE;
};
-
+
FixedText FT_LICENSE_HEADER
{
Pos = MAP_APPFONT(COL1_X, ROW2_Y);
@@ -195,14 +200,16 @@ ModalDialog RID_DLG_LICENSE
WordBreak = TRUE;
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);
Size = MAP_APPFONT( COL2_WIDTH, ROW3_HEIGHT );
NoLabel = TRUE;
Text [ en-US ] = "1.";
- };
+ };
+
//spans col3 + col4
FixedText FT_LICENSE_BODY_1_TXT
{
@@ -211,14 +218,16 @@ ModalDialog RID_DLG_LICENSE
WordBreak = TRUE;
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);
Size = MAP_APPFONT(COL2_WIDTH, ROW4_HEIGHT);
NoLabel = TRUE;
Text [ en-US ] = "2.";
- };
+ };
+
FixedText FT_LICENSE_BODY_2_TXT
{
Pos = MAP_APPFONT(COL3_X, ROW4_Y);
@@ -226,22 +235,24 @@ ModalDialog RID_DLG_LICENSE
WordBreak = TRUE;
NoLabel = TRUE;
Text [ en-US ] = "Accept the License Agreement for the extension by pressing the \'Accept\' button.";
-
- };
+
+ };
+
PushButton PB_LICENSE_DOWN
{
TabStop = TRUE ;
Pos = MAP_APPFONT(COL5_X , ROW3_Y) ;
Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT) ;
Text [ en-US ] = "~Scroll Down";
-
+
};
+
FixedLine FL_LICENSE
{
Pos = MAP_APPFONT ( 0, ROW5_Y) ;
Size = MAP_APPFONT ( LIC_DLG_WIDTH, ROW5_HEIGHT ) ;
};
-
+
FixedImage FI_LICENSE_ARROW1
{
Pos = MAP_APPFONT (COL1_X, ROW3_Y) ;
@@ -252,7 +263,7 @@ ModalDialog RID_DLG_LICENSE
MASKCOLOR
};
};
-
+
FixedImage FI_LICENSE_ARROW2
{
Pos = MAP_APPFONT (COL1_X, ROW4_Y) ;
@@ -263,13 +274,7 @@ ModalDialog RID_DLG_LICENSE
MASKCOLOR
};
};
-
- Image IMG_LICENCE_ARROW_HC
- {
- ImageBitmap = Bitmap { File = "sch06300.png"; };
- MASKCOLOR
- };
-
+
OKButton BTN_LICENSE_ACCEPT
{
Pos = MAP_APPFONT(COL4_X, ROW6_Y);
@@ -279,7 +284,7 @@ ModalDialog RID_DLG_LICENSE
DefButton = TRUE;
Text [ en-US ] = "Accept";
};
-
+
CancelButton BTN_LICENSE_DECLINE
{
Pos = MAP_APPFONT(COL5_X, ROW6_Y);
@@ -287,7 +292,7 @@ ModalDialog RID_DLG_LICENSE
Text [ en-US ] = "Decline" ;
TabStop = TRUE;
};
-
+
};
@@ -338,7 +343,7 @@ WARNINGBOX RID_WARNINGBOX_DISABLE_SHARED_EXTENSION
"Click \'Cancel\' to stop disabling the extension.";
};
-
+
String RID_STR_UNSUPPORTED_PLATFORM
{
Text [ en-US ] = "The extension \'%Name\' does not work on this computer.";
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.src b/desktop/source/deployment/gui/dp_gui_dialog2.src
index b74a802..5c5fc24 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -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;
@@ -205,7 +185,7 @@ QueryBox RID_QUERYBOX_INSTALL_FOR_ALL
// ---------------------------------------------------
// row 1 | multi line edit
// ---------------------------------------------------
-// row 2 | fixed text
+// row 2 | fixed text
// ---------------------------------------------------
// row 3 | img | fixed text | fixed text | button
// ----------------------------------------------------
@@ -213,7 +193,7 @@ QueryBox RID_QUERYBOX_INSTALL_FOR_ALL
// ---------------------------------------------------
// row 5 |fixed line
// ---------------------------------------------------
-// row 6 | | |button | button
+// row 6 | | |button | button
// ---------------------------------------------------
// | col 1 | col 2 | col3 | col4 | col5
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 7612606..36c7afe 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -79,7 +79,7 @@ Entry_Impl::Entry_Impl( const uno::Reference< deployment::XPackage > &xPackage,
beans::StringPair aInfo( m_xPackage->getPublisherInfo() );
m_sPublisher = aInfo.First;
m_sPublisherURL = aInfo.Second;
-
+
// get the icons for the package if there are any
uno::Reference< graphic::XGraphic > xGraphic = xPackage->getIcon( false );
if ( xGraphic.is() )
@@ -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 )
{
@@ -329,7 +325,7 @@ void ExtensionBox_Impl::select( sal_Int32 nIndex )
{
const ::osl::MutexGuard aGuard( m_entriesMutex );
checkIndex( nIndex );
- selectEntry( nIndex );
+ selectEntry( nIndex );
}
//------------------------------------------------------------------------------
@@ -377,7 +373,7 @@ void ExtensionBox_Impl::CalcActiveHeight( const long nPos )
if ( aText.getLength() )
aText += OUSTR("\n");
aText += m_vEntries[ nPos ]->m_sDescription;
-
+
Rectangle aRect = GetTextRect( Rectangle( Point(), aSize ), aText,
TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK );
aTextHeight += aRect.GetHeight();
@@ -450,10 +446,10 @@ void ExtensionBox_Impl::DeleteRemoved()
void ExtensionBox_Impl::selectEntry( const long nPos )
{
//ToDo whe should not use the guard at such a big scope here.
- //Currently it is used to gard m_vEntries and m_nActive. m_nActive will be
+ //Currently it is used to gard m_vEntries and m_nActive. m_nActive will be
//modified in this function.
//It would be probably best to always use a copy of m_vEntries
- //and some other state variables from ExtensionBox_Impl for
+ //and some other state variables from ExtensionBox_Impl for
//the whole painting operation. See issue i86993
::osl::ClearableMutexGuard guard(m_entriesMutex);
@@ -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,16 +630,16 @@ 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 ) );
DrawLine( rRect.BottomLeft(), rRect.BottomRight() );
}
@@ -1052,7 +1048,7 @@ void ExtensionBox_Impl::removeEntry( const uno::Reference< deployment::XPackage
long nPos = iIndex - m_vEntries.begin();
// Entries mustn't removed here, because they contain a hyperlink control
- // which can only be deleted when the thread has the solar mutex. Therefor
+ // which can only be deleted when the thread has the solar mutex. Therefor
// the entry will be moved into the m_vRemovedEntries list which will be
// cleared on the next paint event
m_vRemovedEntries.push_back( *iIndex );
@@ -1127,7 +1123,7 @@ void ExtensionBox_Impl::checkEntries()
long nNewPos = -1;
long nPos = 0;
bool bNeedsUpdate = false;
-
+
::osl::ClearableMutexGuard guard(m_entriesMutex);
typedef std::vector< TEntry_Impl >::iterator ITER;
ITER iIndex = m_vEntries.begin();
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index 4726a0c..f0122ab 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -137,22 +137,18 @@ 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;
com::sun::star::uno::Reference< ExtensionRemovedListener > m_xRemoveListener;
TheExtensionManager *m_pManager;
//This mutex is used for synchronizing access to m_vEntries.
- //Currently it is used to synchronize adding, removing entries and
+ //Currently it is used to synchronize adding, removing entries and
//functions like getItemName, getItemDescription, etc. to prevent
//that m_vEntries is accessed at an invalid index.
//ToDo: There are many more places where m_vEntries is read and which may
@@ -194,7 +190,7 @@ public:
const Size GetMinOutputSizePixel() const;
void SetExtraSize( long nSize ) { m_nExtraHeight = nSize; }
- TEntry_Impl GetEntryData( long nPos ) { return m_vEntries[ nPos ]; }
+ TEntry_Impl GetEntryData( long nPos ) { return m_vEntries[ nPos ]; }
long GetEntryCount() { return (long) m_vEntries.size(); }
Rectangle GetEntryRect( const long nPos ) const;
bool HasActive() { return m_bHasActive; }
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index 9fd55d2..32faa71 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -90,7 +90,7 @@ protected:
};
struct LicenseDialogImpl : public ModalDialog
-{
+{
cssu::Reference<cssu::XComponentContext> m_xComponentContext;
FixedText m_ftHead;
FixedText m_ftBody1;
@@ -102,7 +102,7 @@ struct LicenseDialogImpl : public ModalDialog
LicenseView m_mlLicense;
PushButton m_pbDown;
FixedLine m_flBottom;
-
+
OKButton m_acceptButton;
CancelButton m_declineButton;
@@ -121,7 +121,7 @@ struct LicenseDialogImpl : public ModalDialog
const ::rtl::OUString & sLicenseText);
virtual void Activate();
-
+
};
LicenseView::LicenseView( Window* pParent, const ResId& rResId )
@@ -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);
@@ -229,7 +222,7 @@ LicenseDialogImpl::LicenseDialogImpl(
m_fiArrow2.Show(false);
m_mlLicense.SetText(sLicenseText);
m_ftHead.SetText(m_ftHead.GetText() + OUString('\n') + sExtensionName);
-
+
m_mlLicense.SetEndReachedHdl( LINK(this, LicenseDialogImpl, EndReachedHdl) );
m_mlLicense.SetScrolledHdl( LINK(this, LicenseDialogImpl, ScrolledHdl) );
m_pbDown.SetClickHdl( LINK(this, LicenseDialogImpl, PageDownHdl) );
@@ -307,7 +300,7 @@ LicenseDialog::LicenseDialog( Sequence<Any> const& args,
//______________________________________________________________________________
void LicenseDialog::setTitle( OUString const & ) throw (RuntimeException)
{
-
+
}
//______________________________________________________________________________
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 149a963..d8873f1 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -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 413f91c..249383d 100644
--- a/fpicker/source/office/iodlg.src
+++ b/fpicker/source/office/iodlg.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -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/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index 6b630af..fe1f8d0 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/framework/inc/classes/addonmenu.hxx b/framework/inc/classes/addonmenu.hxx
index 9a10738..d636536 100644
--- a/framework/inc/classes/addonmenu.hxx
+++ b/framework/inc/classes/addonmenu.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -51,33 +51,34 @@ 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 );
-
+
void SetCommandURL( const rtl::OUString& aCmdURL ) { m_aCommandURL = aCmdURL; }
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;
};
@@ -92,9 +93,9 @@ class AddonMenuManager
static sal_Bool HasAddonMenuElements();
static sal_Bool HasAddonHelpMenuElements();
-
+
static sal_Bool IsAddonMenuId( USHORT nId ) { return (( nId >= ADDONMENU_ITEMID_START ) && ( nId < ADDONMENU_ITEMID_END )); }
-
+
// Check if the context string matches the provided xModel context
static sal_Bool IsCorrectContext( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rModel, const rtl::OUString& aContext );
@@ -103,7 +104,7 @@ class AddonMenuManager
// Create the Add-Ons menu
static AddonMenu* CreateAddonMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
-
+
// Merge the Add-Ons help menu items into the given menu bar at a defined pos
static void MergeAddonHelpMenu( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
MenuBar* pMergeMenuBar );
@@ -113,16 +114,16 @@ class AddonMenuManager
const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rModel,
USHORT nMergeAtPos,
MenuBar* pMergeMenuBar );
-
+
// Returns the next position to insert a menu item/sub menu
static USHORT GetNextPos( USHORT nPos );
-
+
// Build up the menu item and sub menu into the provided pCurrentMenu. The sub menus should be of type nSubMenuType.
static void BuildMenu( PopupMenu* pCurrentMenu,
MenuType nSubMenuType,
USHORT nInsPos,
USHORT& nUniqueMenuId,
- com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > aAddonMenuDefinition,
+ com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > aAddonMenuDefinition,
const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rModel );
diff --git a/framework/inc/classes/bmkmenu.hxx b/framework/inc/classes/bmkmenu.hxx
index 7c0a860..840a2b7 100644
--- a/framework/inc/classes/bmkmenu.hxx
+++ b/framework/inc/classes/bmkmenu.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -54,25 +54,28 @@ class BmkMenu_Impl;
class BmkMenu : public AddonMenu
{
public:
- enum BmkMenuType
- {
- BMK_NEWMENU,
- BMK_WIZARDMENU
- };
-
- BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
- BmkMenuType nType );
- ~BmkMenu();
-
- void Initialize(); // Synchrones Laden der Eintraege
+ enum BmkMenuType
+ {
+ BMK_NEWMENU,
+ BMK_WIZARDMENU
+ };
+
+ BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+ BmkMenuType nType
+ );
+
+ ~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 5929b8b..cc85041 100644
--- a/framework/inc/classes/resource.hrc
+++ b/framework/inc/classes/resource.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -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 86ad3f7..396dbe5 100644
--- a/framework/inc/framework.hrc
+++ b/framework/inc/framework.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -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 4bf4fc6..573448c 100644
--- a/framework/inc/helper/imageproducer.hxx
+++ b/framework/inc/helper/imageproducer.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -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 15ba895..8513f60 100644
--- a/framework/source/classes/addonsoptions.cxx
+++ b/framework/source/classes/addonsoptions.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -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/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 902566e..1041bf7 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -258,7 +258,7 @@ MenuManager::MenuManager(
// MenuManager* pSubMenuManager = new MenuManager( rFrame, pSubMenu, sal_True, sal_False );
AddMenu(pSubMenu,::rtl::OUString(),nItemId,sal_True,sal_False);
-
+
if ( bShowMenuImages && !pMenu->GetItemImage( nItemId ))
{
Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast );
diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src
index 60ce86e..7a9749f 100644
--- a/framework/source/classes/resource.src
+++ b/framework/source/classes/resource.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -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)
@@ -293,7 +291,7 @@ String STR_FULL_DISC_MSG
String STR_RESTORE_TOOLBARS
{
- Text [ en-US ] = "~Reset" ;
+ Text [ en-US ] = "~Reset" ;
};
String STR_CORRUPT_UICFG_SHARE
@@ -322,33 +320,39 @@ 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 ] = " ";
+ 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 ] = " ";
+ Text [ en-US ] = "Reset to Default Language" ;
+ Text [ x-comment ] = " ";
};
+
String STR_LANGSTATUS_MORE
{
- Text [ en-US ] = "More..." ;
- Text [ x-comment ] = " ";
+ Text [ en-US ] = "More..." ;
+ Text [ x-comment ] = " ";
};
+
String STR_SET_LANGUAGE_FOR_SELECTION
{
- Text [ en-US ] = "Set Language for Selection" ;
- Text [ x-comment ] = " ";
+ 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 ] = " ";
+ 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" ;
- Text [ x-comment ] = " ";
+ Text [ en-US ] = "Set Language for all Text" ;
+ Text [ x-comment ] = " ";
};
diff --git a/framework/source/helper/imageproducer.cxx b/framework/source/helper/imageproducer.cxx
index c29a771..5a2750b 100644
--- a/framework/source/helper/imageproducer.cxx
+++ b/framework/source/helper/imageproducer.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -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 fa806f8..6d83baf 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -245,7 +245,7 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
// add some breathing space for the images
maButtonImageSize.Width() += 12;
maButtonImageSize.Height() += 12;
-
+
}
@@ -286,12 +286,12 @@ void BackingWindow::prepareRecentFileMenu()
mpRecentMenu = new PopupMenu();
mpRecentMenu->Clear();
maRecentFiles.clear();
-
+
// get recent file list and dispatch arguments
Sequence< Sequence< PropertyValue > > aHistoryList( SvtHistoryOptions().GetList( ePICKLIST ) );
sal_Int32 nPickListMenuItems = ( aHistoryList.getLength() > 99 ) ? 99 : aHistoryList.getLength();
-
+
if( ( nPickListMenuItems > 0 ) )
{
maRecentFiles.reserve( nPickListMenuItems );
@@ -299,11 +299,11 @@ void BackingWindow::prepareRecentFileMenu()
{
Sequence< PropertyValue >& rPickListEntry = aHistoryList[i];
rtl::OUString aURL, aFilter, aFilterOpt, aTitle;
-
+
for ( sal_Int32 j = 0; j < rPickListEntry.getLength(); j++ )
{
const Any& a = rPickListEntry[j].Value;
-
+
if ( rPickListEntry[j].Name == HISTORY_PROPERTYNAME_URL )
a >>= aURL;
else if ( rPickListEntry[j].Name == HISTORY_PROPERTYNAME_FILTER )
@@ -330,7 +330,7 @@ void BackingWindow::prepareRecentFileMenu()
nArgs--;
rArgsList[nArgs].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ));
rArgsList[nArgs].Value = makeAny( aFilter );
-
+
if( aFilterOpt.getLength() )
{
nArgs--;
@@ -346,20 +346,20 @@ void BackingWindow::prepareRecentFileMenu()
nArgs--;
rArgsList[nArgs].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Referer" ));
rArgsList[nArgs].Value = makeAny( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:user" ) ) );
-
+
// and finally create an entry in the popupmenu
rtl::OUString aMenuTitle;
INetURLObject aURLObj( aURL );
-
+
if ( aURLObj.GetProtocol() == INET_PROT_FILE )
{
// Do handle file URL differently => convert it to a system
// path and abbreviate it with a special function:
String aFileSystemPath( aURLObj.getFSysPath( INetURLObject::FSYS_DETECT ) );
-
+
rtl::OUString aSystemPath( aFileSystemPath );
rtl::OUString aCompactedSystemPath;
-
+
oslFileError nError = osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, 46, NULL );
if ( !nError )
aMenuTitle = String( aCompactedSystemPath );
@@ -404,13 +404,13 @@ void BackingWindow::initBackground()
maWelcomeTextColor = maLabelTextColor = Color( COL_WHITE );
else if( mnLayoutStyle == 1 )
maWelcomeTextColor = maLabelTextColor = Color( COL_BLACK );
- else
+ else
maWelcomeTextColor = maLabelTextColor = Color( 0x26, 0x35, 0x42 );
-
+
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;
@@ -461,7 +461,7 @@ void BackingWindow::initBackground()
loadImage( FwkResId( BMP_BACKING_FORMULA ), maMathButton );
loadImage( FwkResId( BMP_BACKING_OPENFILE ), maOpenButton );
loadImage( FwkResId( BMP_BACKING_OPENTEMPLATE ), maTemplateButton );
-
+
maOpenButton.SetMenuMode( MENUBUTTON_MENUMODE_TIMED );
maOpenButton.SetSelectHdl( LINK( this, BackingWindow, SelectHdl ) );
maOpenButton.SetActivateHdl( LINK( this, BackingWindow, ActivateHdl ) );
@@ -524,7 +524,7 @@ void BackingWindow::initControls()
if( mnLayoutStyle == 1 )
{
- maWelcome.Show();
+ maWelcome.Show();
maProduct.Show();
}
@@ -595,19 +595,19 @@ void BackingWindow::initControls()
maMathButton, aMnemns );
nYPos += 3*maButtonImageSize.Height() / 2;
-
+
layoutButton( NULL, 0, aFileNewAppsAvailable,
aModuleOptions, SvtModuleOptions::E_SWRITER,
maOpenButton, aMnemns, maOpenString );
layoutButton( NULL, 1, aFileNewAppsAvailable,
aModuleOptions, SvtModuleOptions::E_SWRITER,
- maTemplateButton, aMnemns, maTemplateString );
+ maTemplateButton, aMnemns, maTemplateString );
nYPos += 10;
DBG_ASSERT( nYPos < maControlRect.GetHeight(), "misformatting !" );
if( mnColumnWidth[0] + mnColumnWidth[1] + mnBtnPos + 20 > maControlRect.GetWidth() )
maControlRect.Right() = maControlRect.Left() + mnColumnWidth[0] + mnColumnWidth[1] + mnBtnPos + 20;
-
+
mnTextColumnWidth[0] = mnColumnWidth[0];
mnTextColumnWidth[1] = mnColumnWidth[1];
@@ -649,7 +649,7 @@ void BackingWindow::initControls()
maBackgroundMiddle = BitmapEx();
Resize();
-
+
maWriterButton.GrabFocus();
}
@@ -688,7 +688,7 @@ void BackingWindow::layoutButton(
String aText( i_rStr.Len() ? i_rStr : SvFileInformationManager::GetDescription( INetURLObject( aURL ) ) );
i_rMnemns.CreateMnemonic( aText );
i_rBtn.SetText( aText );
-
+
long nTextWidth = i_rBtn.GetTextWidth( i_rBtn.GetText() );
nTextWidth += maButtonImageSize.Width() + 8; // add some fuzz to be on the safe side
@@ -811,7 +811,7 @@ long BackingWindow::Notify( NotifyEvent& rNEvt )
else if( maDBButton.HasFocus() )
maMathButton.GrabFocus();
else if( maMathButton.HasFocus() )
- maTemplateButton.GrabFocus();
+ maTemplateButton.GrabFocus();
return 1;
}
}
@@ -873,7 +873,7 @@ void BackingWindow::Resize()
nYPos += nPDelta - nDiff;
nYPos += nWDelta/2 - nDiff;
-
+
if( mnLayoutStyle != 1 )
nYPos = maControlRect.Top() + mnBtnTop;
@@ -952,7 +952,7 @@ IMPL_LINK( BackingWindow, ToolboxHdl, void*, EMPTYARG )
rtl::OUString sURL;
//throws css::container::NoSuchElementException, css::lang::WrappedTargetException
Any value( xNameAccess->getByName(rtl::OUString::createFromAscii(pNode)) );
- sURL = value.get<rtl::OUString> ();
+ sURL = value.get<rtl::OUString> ();
localizeWebserviceURI(sURL);
Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute(
diff --git a/framework/source/services/fwk_services.src b/framework/source/services/fwk_services.src
index 15d735d..d2368f9 100644
--- a/framework/source/services/fwk_services.src
+++ b/framework/source/services/fwk_services.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -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 c5c1275..f6d2157 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -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)
@@ -194,7 +193,7 @@ const char* aCommands[] =
//_________________________________________________________________________________________________________________
// Defines
//_________________________________________________________________________________________________________________
-//
+//
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
@@ -233,11 +232,11 @@ ControlMenuController::~ControlMenuController()
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 ))
{
ImageList aImageList( aResId );
@@ -259,13 +258,13 @@ void ControlMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rP
{
VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu );
PopupMenu* pVCLPopupMenu = 0;
-
+
SolarMutexGuard aSolarMutexGuard;
-
+
resetPopupMenu( rPopupMenu );
if ( pPopupMenu )
pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu();
-
+
if ( pVCLPopupMenu && m_pResPopupMenu )
*pVCLPopupMenu = *m_pResPopupMenu;
}
@@ -279,7 +278,7 @@ void SAL_CALL ControlMenuController::disposing( const EventObject& ) throw ( Run
m_xFrame.clear();
m_xDispatch.clear();
m_xServiceManager.clear();
-
+
if ( m_xPopupMenu.is() )
m_xPopupMenu->removeMenuListener( Reference< css::awt::XMenuListener >(( OWeakObject *)this, UNO_QUERY ));
m_xPopupMenu.clear();
@@ -290,8 +289,8 @@ void SAL_CALL ControlMenuController::disposing( const EventObject& ) throw ( Run
void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException )
{
osl::ResettableMutexGuard aLock( m_aMutex );
-
- USHORT nMenuId = 0;
+
+ USHORT nMenuId = 0;
for (sal_uInt32 i=0; i < SAL_N_ELEMENTS(aCommands); ++i)
{
if ( Event.FeatureURL.Complete.equalsAscii( aCommands[i] ))
@@ -304,9 +303,9 @@ void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Eve
if ( nMenuId )
{
VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( m_xPopupMenu );
-
+
SolarMutexGuard aSolarMutexGuard;
-
+
PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu();
if ( !Event.IsEnabled && pVCLPopupMenu->GetItemPos( nMenuId ) != MENU_ITEM_NOTFOUND )
@@ -325,11 +324,11 @@ void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Eve
if ( nPrevInConversion != MENU_ITEM_NOTFOUND )
break;
}
-
+
if ( MENU_ITEM_NOTFOUND == nPrevInConversion )
// none of the items which precede the nSID-slot in the source menu are present in our conversion menu
nPrevInConversion = sal::static_int_cast< sal_uInt16 >(-1); // put the item at the first position
-
+
pVCLPopupMenu->InsertItem( nMenuId, m_pResPopupMenu->GetItemText( nMenuId ), m_pResPopupMenu->GetItemBits( nMenuId ), ++nPrevInConversion );
pVCLPopupMenu->SetItemImage( nMenuId, m_pResPopupMenu->GetItemImage( nMenuId ));
pVCLPopupMenu->SetHelpId( nMenuId, m_pResPopupMenu->GetHelpId( nMenuId ));
@@ -355,11 +354,11 @@ void ControlMenuController::impl_select(const Reference< XDispatch >& /*_xDispat
void SAL_CALL ControlMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException)
{
osl::ResettableMutexGuard aLock( m_aMutex );
-
+
if ( m_xPopupMenu.is() )
{
SolarMutexGuard aSolarMutexGuard;
-
+
// Check if some modes have changed so we have to update our menu images
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
sal_Bool bIsHiContrast = rSettings.GetHighContrastMode();
@@ -404,25 +403,25 @@ void ControlMenuController::impl_setPopupMenu()
}
} // if ( m_pResPopupMenu == 0 )
}
-
+
void SAL_CALL ControlMenuController::updatePopupMenu() throw (::com::sun::star::uno::RuntimeException)
{
osl::ResettableMutexGuard aLock( m_aMutex );
throwIfDisposed();
-
+
if ( m_xFrame.is() && m_xPopupMenu.is() )
{
URL aTargetURL;
Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
fillPopupMenu( m_xPopupMenu );
m_aURLToDispatchMap.free();
-
+
for (sal_uInt32 i=0; i < SAL_N_ELEMENTS(aCommands); ++i)
{
aTargetURL.Complete = rtl::OUString::createFromAscii( aCommands[i] );
m_xURLTransformer->parseStrict( aTargetURL );
-
+
Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
if ( xDispatch.is() )
{
@@ -439,7 +438,7 @@ void SAL_CALL ControlMenuController::initialize( const Sequence< Any >& aArgumen
{
osl::ResettableMutexGuard aLock( m_aMutex );
svt::PopupMenuControllerBase::initialize(aArguments);
- m_aBaseURL = ::rtl::OUString();
+ m_aBaseURL = ::rtl::OUString();
}
}
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 1c27297..6f0e5c4 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -1809,7 +1809,7 @@ void MenuBarManager::FillMenu(
if ( nStyle & ::com::sun::star::ui::ItemStyle::RADIO_CHECK )
nBits |= MIB_RADIOCHECK;
pMenu->SetItemBits( nId, nBits );
- }
+ }
if ( xIndexContainer.is() )
{
PopupMenu* pNewPopupMenu = new PopupMenu;
diff --git a/sfx2/inc/docvor.hxx b/sfx2/inc/docvor.hxx
index 095806c..cc83e57 100644
--- a/sfx2/inc/docvor.hxx
+++ b/sfx2/inc/docvor.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -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 075ed3d..1b23e4c 100644
--- a/sfx2/inc/fwkhelper.hxx
+++ b/sfx2/inc/fwkhelper.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -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 b72e3b7..5e27120 100644
--- a/sfx2/inc/imagemgr.hxx
+++ b/sfx2/inc/imagemgr.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -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 0978783..73c049c 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 1f9c125..2aa696c 100644
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/source/appl/app.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -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 add555d..39661f9 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -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 8d8ca17..3400efb 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -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 cb89ed9..c59eb50 100644
--- a/sfx2/source/appl/newhelp.src
+++ b/sfx2/source/appl/newhelp.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -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 9664ff1..993cbc4 100644
--- a/sfx2/source/dialog/dialog.hrc
+++ b/sfx2/source/dialog/dialog.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -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 9b443e8..ee8cad7 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -1747,7 +1747,7 @@ BOOL SfxCommonTemplateDialog_Impl::Execute_Impl(
*pIdx = i;
}
}
-
+
// Reset destroyed flag otherwise we use the pointer in the dtor
// where the local stack object is already destroyed. This would
// overwrite objects on the stack!! See #i100110
@@ -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 6bb33ca..63e9f6e 100644
--- a/sfx2/source/dialog/templdlg.src
+++ b/sfx2/source/dialog/templdlg.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -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 2f57260..ed5940c 100644
--- a/sfx2/source/dialog/titledockwin.cxx
+++ b/sfx2/source/dialog/titledockwin.cxx
@@ -1,7 +1,7 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -133,7 +133,7 @@ namespace sfx2
void TitledDockingWindow::impl_layout()
{
m_bLayoutPending = false;
-
+
m_aToolbox.ShowItem( 1, !IsFloatingMode() );
const Size aToolBoxSize( m_aToolbox.CalcWindowSizePixel() );
@@ -202,8 +202,8 @@ namespace sfx2
// Paint title bar background.
Rectangle aTitleBarBox( Rectangle(
nOuterLeft,
- 0,
- nOuterRight,
+ 0,
+ nOuterRight,
nInnerTop-1
) );
DrawRect( aTitleBarBox );
@@ -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 );
}
@@ -275,7 +270,7 @@ namespace sfx2
// resized.
impl_scheduleLayout();
Invalidate();
-
+
return nItemId;
}
@@ -343,7 +338,7 @@ namespace sfx2
if ( IsControlFont() )
aFont.Merge( GetControlFont() );
SetZoomedPointFont( aFont );
-
+
// Color.
Color aColor;
if ( IsControlForeground() )
diff --git a/sfx2/source/dialog/titledockwin.src b/sfx2/source/dialog/titledockwin.src
index 4abd718..ede6c4b 100644
--- a/sfx2/source/dialog/titledockwin.src
+++ b/sfx2/source/dialog/titledockwin.src
@@ -1,6 +1,6 @@
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -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/docvor.cxx b/sfx2/source/doc/docvor.cxx
index 09379cb..7214654 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 7207f90..5a07801 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -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 5ce33ed..7096d71 100644
--- a/sfx2/source/inc/sfxlocal.hrc
+++ b/sfx2/source/inc/sfxlocal.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -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 169288a..8b4402d 100644
--- a/sfx2/source/toolbox/imgmgr.cxx
+++ b/sfx2/source/toolbox/imgmgr.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -69,11 +69,11 @@ public:
ImageList* GetImageList( BOOL bBig, BOOL bHiContrast );
Image GetImage( USHORT nId, BOOL bBig, BOOL bHiContrast );
void SetSymbolsSize_Impl( sal_Int16 );
-
+
DECL_LINK( OptionsChanged_Impl, void* );
DECL_LINK( SettingsChanged_Impl, void* );
-
+
SfxImageManager_Impl( SfxModule* pModule );
~SfxImageManager_Impl();
};
@@ -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 )
{
@@ -108,9 +104,9 @@ static SfxImageManager_Impl* GetImageManager( SfxModule* pModule )
else
{
pImpl = new SfxImageManager_Impl( pModule );
- m_ImageManager_ImplMap.insert(
- SfxImageManagerMap::value_type(
- sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >( pModule )),
+ m_ImageManager_ImplMap.insert(
+ SfxImageManagerMap::value_type(
+ sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >( pModule )),
sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >( pImpl )) ));
}
return pImpl;
@@ -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;
-
- // 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();
+ ImageList* rpList = NULL;
- ResId aResId( bBig ? ( bHiContrast ? RID_DEFAULTIMAGELIST_LCH : RID_DEFAULTIMAGELIST_LC ) :
- ( bHiContrast ? RID_DEFAULTIMAGELIST_SCH : RID_DEFAULTIMAGELIST_SC ), *pResMgr);
+ ResMgr *pResMgr = SfxApplication::GetOrCreate()->GetOffResManager_Impl();
- aResId.SetRT( RSC_IMAGELIST );
+ ResId aResId( bBig ? ( RID_DEFAULTIMAGELIST_LC ) : ( RID_DEFAULTIMAGELIST_SC ), *pResMgr);
- DBG_ASSERT( pResMgr->IsAvailable(aResId), "No default ImageList!" );
+ aResId.SetRT( RSC_IMAGELIST );
- if ( pResMgr->IsAvailable(aResId) )
- rpList = new ImageList( aResId );
- else
- rpList = new ImageList();
- }
+ DBG_ASSERT( pResMgr->IsAvailable(aResId), "No default 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;
}
@@ -163,7 +151,7 @@ SfxImageManager_Impl::SfxImageManager_Impl( SfxModule* pModule ) :
{
for ( sal_uInt32 i = 0; i < IMAGELIST_COUNT; i++ )
m_pImageList[i] = 0;
-
+
m_aOpt.AddListenerLink( LINK( this, SfxImageManager_Impl, OptionsChanged_Impl ) );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list