[Libreoffice-commits] .: desktop/source editeng/source framework/inc framework/source sfx2/inc sfx2/source svx/source
Joseph Powers
jpowers at kemper.freedesktop.org
Tue Nov 16 21:22:41 PST 2010
desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 7 -
desktop/source/deployment/gui/dp_gui_extlistbox.hxx | 1
editeng/source/editeng/editview.cxx | 7 -
framework/inc/classes/addonsoptions.hxx | 18 ++--
framework/inc/classes/menumanager.hxx | 10 +-
framework/inc/helper/imageproducer.hxx | 2
framework/inc/uielement/newmenucontroller.hxx | 14 +--
framework/inc/uielement/toolbarmanager.hxx | 26 +++----
framework/source/classes/addonsoptions.cxx | 2
framework/source/classes/bmkmenu.cxx | 4 -
framework/source/classes/menumanager.cxx | 5 -
framework/source/helper/actiontriggerhelper.cxx | 6 -
framework/source/uielement/addonstoolbarmanager.cxx | 15 +---
framework/source/uielement/imagebuttontoolbarcontroller.cxx | 2
framework/source/uielement/menubarmanager.cxx | 2
framework/source/uielement/newmenucontroller.cxx | 4 -
framework/source/uielement/toolbarmanager.cxx | 44 +++++-------
framework/source/uielement/toolbarsmenucontroller.cxx | 2
sfx2/inc/docvor.hxx | 5 -
sfx2/inc/imgmgr.hxx | 16 ++--
sfx2/inc/sfx2/mnuitem.hxx | 4 -
sfx2/inc/sfx2/module.hxx | 3
sfx2/inc/sfx2/new.hxx | 9 --
sfx2/inc/sfx2/objsh.hxx | 30 ++++----
sfx2/inc/sfx2/styfitem.hxx | 4 -
sfx2/inc/sfx2/tbxctrl.hxx | 7 -
sfx2/source/appl/app.cxx | 2
sfx2/source/appl/imagemgr.cxx | 8 +-
sfx2/source/appl/module.cxx | 33 +--------
sfx2/source/dialog/styfitem.cxx | 8 +-
sfx2/source/dialog/taskpane.cxx | 8 +-
sfx2/source/dialog/templdlg.cxx | 22 ------
sfx2/source/doc/docvor.cxx | 11 +--
sfx2/source/doc/new.cxx | 13 ---
sfx2/source/doc/objcont.cxx | 34 ++++-----
sfx2/source/doc/sfxbasemodel.cxx | 2
sfx2/source/inc/virtmenu.hxx | 3
sfx2/source/menu/mnuitem.cxx | 8 +-
sfx2/source/menu/mnumgr.cxx | 15 +---
sfx2/source/menu/virtmenu.cxx | 17 +---
sfx2/source/toolbox/imgmgr.cxx | 44 +++++-------
sfx2/source/toolbox/tbxitem.cxx | 2
svx/source/customshapes/tbxcustomshapes.cxx | 2
svx/source/dialog/docrecovery.cxx | 2
svx/source/form/tbxform.cxx | 7 -
svx/source/intro/iso.src | 32 --------
svx/source/intro/ooo.src | 2
svx/source/tbxctrls/grafctrl.cxx | 32 ++++----
svx/source/tbxctrls/tbcontrl.src | 15 ++++
svx/source/tbxctrls/tbxalign.cxx | 4 -
50 files changed, 238 insertions(+), 337 deletions(-)
New commits:
commit df07e0fa0586d2ec9a0d72b00353e4af3510a341
Author: Joseph Powers <jpowers27 at cox.net>
Date: Tue Nov 16 19:01:58 2010 -0800
HC Cleanup - libs-core
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index aba29a6..1e0e489 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -529,7 +529,7 @@ void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl pEntr
if ( ! pEntry->m_aIcon )
aImage = m_aDefaultImage;
else
- aImage = isHCMode() ? pEntry->m_aIconHC : pEntry->m_aIcon;
+ aImage = pEntry->m_aIcon;
Size aImageSize = aImage.GetSizePixel();
if ( ( aImageSize.Width() <= ICON_WIDTH ) && ( aImageSize.Height() <= ICON_HEIGHT ) )
DrawImage( Point( aPos.X()+((ICON_WIDTH-aImageSize.Width())/2), aPos.Y()+((ICON_HEIGHT-aImageSize.Height())/2) ), aImage );
@@ -1180,11 +1180,6 @@ void ExtensionBox_Impl::checkEntries()
Invalidate();
}
}
-//------------------------------------------------------------------------------
-bool ExtensionBox_Impl::isHCMode()
-{
- return (bool)GetSettings().GetStyleSettings().GetHighContrastMode();
-}
//------------------------------------------------------------------------------
void ExtensionBox_Impl::SetScrollHdl( const Link& rLink )
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index f0122ab..7cdaa74 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -168,7 +168,6 @@ class ExtensionBox_Impl : public ::svt::IExtensionListBox
bool HandleTabKey( bool bReverse );
bool HandleCursorKey( USHORT nKeyCode );
bool FindEntryPos( const TEntry_Impl pEntry, long nStart, long nEnd, long &nFound );
- bool isHCMode();
void DeleteRemoved();
//-----------------
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 98e4818..6b3dbdd 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.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
@@ -1145,7 +1145,6 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack )
aPopupMenu.RemoveItem( MN_AUTOCORR ); // Loeschen?
SvtLinguConfig aCfg;
- const bool bHC = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
Reference< XDictionaryList > xDicList( SvxGetDictionaryList() );
Sequence< Reference< XDictionary > > aDics;
@@ -1158,7 +1157,7 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack )
uno::Reference< linguistic2::XDictionary > xDic( SvxGetOrCreatePosDic( xDicList ) );
if (xDic.is())
xDic->setActive( sal_True );
-
+
aDics = xDicList->getDictionaries();
pDic = aDics.getConstArray();
sal_uInt16 nCheckedLanguage = PIMPEE->GetLanguage( aPaM2 );
@@ -1185,7 +1184,7 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack )
if (xSvcInfo.is())
{
OUString aDictionaryImageUrl( aCfg.GetSpellAndGrammarContextDictionaryImage(
- xSvcInfo->getImplementationName(), bHC) );
+ xSvcInfo->getImplementationName()) );
if (aDictionaryImageUrl.getLength() > 0)
{
Image aImage( lcl_GetImageFromPngUrl( aDictionaryImageUrl ) );
diff --git a/framework/inc/classes/addonsoptions.hxx b/framework/inc/classes/addonsoptions.hxx
index 8dd1120..5dab0b4 100644
--- a/framework/inc/classes/addonsoptions.hxx
+++ b/framework/inc/classes/addonsoptions.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
@@ -191,7 +191,7 @@ class AddonsOptions
*//*-*****************************************************************************************************/
sal_Bool HasAddonsMenu() const;
-
+
/*-****************************************************************************************************//**
@short returns if an addons help menu is available
@descr Call to retrieve if a addons menu is available
@@ -210,7 +210,7 @@ class AddonsOptions
@return number of addons toolbars
*//*-*****************************************************************************************************/
sal_Int32 GetAddonsToolBarCount() const ;
-
+
/*-****************************************************************************************************//**
@short returns the complete addons menu
@descr Call it to get all entries of the addon menu.
@@ -224,9 +224,9 @@ class AddonsOptions
*//*-*****************************************************************************************************/
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& GetAddonsMenu() const;
-
+
/*-****************************************************************************************************//**
- @short Gets the menu bar part of all addon components registered
+ @short Gets the menu bar part of all addon components registered
@descr -
@seealso -
@@ -274,7 +274,7 @@ class AddonsOptions
@onerror We return sal_False
*//*-*****************************************************************************************************/
-
+
const MergeMenuInstructionContainer& GetMergeMenuInstructions() const;
/*-****************************************************************************************************//**
@@ -283,14 +283,14 @@ class AddonsOptions
@seealso -
- @return The filled
+ @return The filled
@onerror We return sal_False
*//*-*****************************************************************************************************/
bool GetMergeToolbarInstructions( const ::rtl::OUString& rToolbarName, MergeToolbarInstructionContainer& rToolbar ) const;
/*-****************************************************************************************************//**
- @short Gets the Add-On help menu part of all addon components registered
+ @short Gets the Add-On help menu part of all addon components registered
@descr -
@seealso -
@@ -314,8 +314,8 @@ class AddonsOptions
*//*-*****************************************************************************************************/
Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const;
-
Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig ) const;
+
//-------------------------------------------------------------------------------------------------------------
// private methods
//-------------------------------------------------------------------------------------------------------------
diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx
index 51dc9c0..98dd18c 100644
--- a/framework/inc/classes/menumanager.hxx
+++ b/framework/inc/classes/menumanager.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
@@ -77,7 +77,7 @@ class MenuManager : public ThreadHelpBase ,
{
public:
// #110897#
- MenuManager(
+ MenuManager(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
REFERENCE< XFRAME >& rFrame,
Menu* pMenu,
@@ -102,7 +102,11 @@ class MenuManager : public ThreadHelpBase ,
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& getServiceFactory();
static void UpdateSpecialWindowMenu( Menu* pMenu ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,IMutex& _rMutex);
- static void FillMenuImages(::com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& xFrame,Menu* _pMenu,sal_Bool bShowMenuImages);
+ static void FillMenuImages(
+ ::com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& xFrame,
+ Menu* _pMenu,
+ sal_Bool bShowMenuImages
+ );
protected:
DECL_LINK( Highlight, Menu * );
diff --git a/framework/inc/helper/imageproducer.hxx b/framework/inc/helper/imageproducer.hxx
index 6da7c58..4cc6e1b 100644
--- a/framework/inc/helper/imageproducer.hxx
+++ b/framework/inc/helper/imageproducer.hxx
@@ -56,6 +56,6 @@ Image SAL_CALL GetImageFromURL(
}
-#endif // __FRAMEWORK_HELPER_IMAGEPRODUCER_HXX_
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx
index 8859f73..e0cfa75 100644
--- a/framework/inc/uielement/newmenucontroller.hxx
+++ b/framework/inc/uielement/newmenucontroller.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
@@ -78,10 +78,10 @@ namespace framework
public:
NewMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
virtual ~NewMenuController();
-
+
// XServiceInfo
DECLARE_XSERVICEINFO
-
+
// XInitialization
virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
@@ -95,8 +95,8 @@ namespace framework
// XEventListener
virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException );
- DECL_STATIC_LINK( NewMenuController, ExecuteHdl_Impl, NewDocument* );
-
+ DECL_STATIC_LINK( NewMenuController, ExecuteHdl_Impl, NewDocument* );
+
private:
virtual void impl_setPopupMenu();
struct AddInfo
@@ -104,9 +104,9 @@ namespace framework
rtl::OUString aTargetFrame;
rtl::OUString aImageId;
};
-
+
typedef ::std::hash_map< int, AddInfo > AddInfoForId;
-
+
void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu );
void retrieveShortcutsFromConfiguration( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration >& rAccelCfg,
const ::com::sun::star::uno::Sequence< rtl::OUString >& rCommands,
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 26becf3..47b999d 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.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
@@ -101,8 +101,8 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
public ::cppu::OWeakObject
{
public:
- ToolBarManager( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServicveManager,
- const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
+ ToolBarManager( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServicveManager,
+ const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
const rtl::OUString& rResourceName,
ToolBar* pToolBar );
virtual ~ToolBarManager();
@@ -110,23 +110,23 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
// XInterface, XTypeProvider, XServiceInfo
FWK_DECLARE_XINTERFACE
FWK_DECLARE_XTYPEPROVIDER
-
+
ToolBox* GetToolBar() const;
-
+
// XFrameActionListener
virtual void SAL_CALL frameAction( const com::sun::star::frame::FrameActionEvent& Action ) throw ( ::com::sun::star::uno::RuntimeException );
-
+
// XStatusListener
virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
-
+
// XEventListener
virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException );
-
+
// XUIConfigurationListener
virtual void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
-
+ virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
+
// XComponent
void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException );
void SAL_CALL addEventListener( const com::sun::star::uno::Reference< XEventListener >& xListener ) throw( com::sun::star::uno::RuntimeException );
@@ -159,7 +159,7 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
sal_Int16 nWidth;
};
typedef std::vector< ControllerParams > ControllerParamsVector;
-
+
protected:
//added for 33668 by shizhoubo : 2008:04
DECL_LINK( Command, CommandEvent * );
@@ -198,7 +198,7 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
void ImplClearPopupMenu( ToolBox *pToolBar );
void RequestImages();
sal_uInt16 ConvertStyleToToolboxItemBits( sal_Int32 nStyle );
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetModelFromFrame() const;
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetModelFromFrame() const;
sal_Bool IsPluginMode() const;
Image QueryAddonsImage( const ::rtl::OUString& aCommandURL, bool bBigImages );
long HandleClick(void ( SAL_CALL ::com::sun::star::frame::XToolbarController::*_pClick )( ));
@@ -251,7 +251,7 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration > m_xModuleAcceleratorManager;
::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration > m_xGlobalAcceleratorManager;
};
-
+
}
#endif // __FRAMEWORK_UIELEMENT_TOOLBARMANAGER_HXX_
diff --git a/framework/source/classes/addonsoptions.cxx b/framework/source/classes/addonsoptions.cxx
index de84391..7b78d98 100644
--- a/framework/source/classes/addonsoptions.cxx
+++ b/framework/source/classes/addonsoptions.cxx
@@ -1778,7 +1778,7 @@ Image AddonsOptions::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig,
//*****************************************************************************************************************
// public method
//*****************************************************************************************************************
-Image AddonsOptions::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig ) const
+Image AddonsOptions::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig ) const
{
return GetImageFromURL( aURL, bBig, sal_False );
}
diff --git a/framework/source/classes/bmkmenu.cxx b/framework/source/classes/bmkmenu.cxx
index fecd1d6..39df90f 100644
--- a/framework/source/classes/bmkmenu.cxx
+++ b/framework/source/classes/bmkmenu.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
@@ -210,8 +210,6 @@ void BmkMenu::Initialize()
else
InsertItem( nId, aTitle );
- // Store values from configuration to the New and Wizard menu entries to enable
- // sfx2 based code to support high contrast mode correctly!
MenuConfiguration::Attributes* pUserAttributes = new MenuConfiguration::Attributes( aTargetFrame, aImageId );
SetUserValue( nId, (ULONG)pUserAttributes );
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 9817fbf..cc5eb53 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -309,7 +309,6 @@ MenuManager::MenuManager(
}
}
-
// retrieve label information for all menu items without item text
SetHdl();
@@ -823,10 +822,12 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu )
aCommand == aSpecialWindowCommand )
UpdateSpecialWindowMenu( pMenu,getServiceFactory(),m_aLock );
+ // Check if some modes have changed so we have to update our menu images
if ( bShowMenuImages != m_bShowMenuImages )
{
+ // The mode changed so we have to replace all images
m_bShowMenuImages = bShowMenuImages;
- FillMenuImages(m_xFrame,pMenu,bShowMenuImages);
+ FillMenuImages( m_xFrame, pMenu, bShowMenuImages );
}
if ( m_bInitialized )
diff --git a/framework/source/helper/actiontriggerhelper.cxx b/framework/source/helper/actiontriggerhelper.cxx
index 56ee06e..1245909 100644
--- a/framework/source/helper/actiontriggerhelper.cxx
+++ b/framework/source/helper/actiontriggerhelper.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
@@ -210,7 +210,7 @@ void InsertSubMenuItems( Menu* pSubMenu, USHORT& nItemId, Reference< XIndexConta
}
else
aImage = Image( aBitmap );
-
+
if ( !!aImage )
pSubMenu->SetItemImage( nNewItemId, aImage );
}
@@ -393,7 +393,7 @@ void ActionTriggerHelper::FillActionTriggerContainerFromMenu(
FillActionTriggerContainerWithMenu( pMenu, xActionTriggerContainer );
}
-Reference< XIndexContainer > ActionTriggerHelper::CreateActionTriggerContainerFromMenu(
+Reference< XIndexContainer > ActionTriggerHelper::CreateActionTriggerContainerFromMenu(
// #110897#
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
const Menu* pMenu,
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index ab03e3e..c2ebabc 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.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
@@ -142,7 +142,8 @@ static sal_Bool IsCorrectContext( const ::rtl::OUString& rModuleIdentifier, cons
static Image RetrieveImage( Reference< com::sun::star::frame::XFrame >& rFrame,
const rtl::OUString& aImageId,
const rtl::OUString& aURL,
- BOOL bBigImage )
+ BOOL bBigImage
+)
{
Image aImage;
@@ -214,10 +215,10 @@ void AddonsToolBarManager::RefreshImages()
if ( pRuntimeItemData )
aImageId = pRuntimeItemData->aImageId;
- m_pToolBar->SetItemImage( nId, RetrieveImage( m_xFrame,
- aImageId,
- aCommandURL,
- bBigImages ));
+ m_pToolBar->SetItemImage(
+ nId,
+ RetrieveImage( m_xFrame, aImageId, aCommandURL, bBigImages )
+ );
}
}
}
@@ -506,7 +507,6 @@ IMPL_LINK( AddonsToolBarManager, StateChanged, StateChangedType*, pStateChangedT
{
if ( *pStateChangedType == STATE_CHANGE_CONTROLBACKGROUND )
{
- // Check if we need to get new images for normal/high contrast mode
CheckAndUpdateImages();
}
return 1;
@@ -518,7 +518,6 @@ IMPL_LINK( AddonsToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEve
( pDataChangedEvent->GetType() == DATACHANGED_DISPLAY )) &&
( pDataChangedEvent->GetFlags() & SETTINGS_STYLE ))
{
- // Check if we need to get new images for normal/high contrast mode
CheckAndUpdateImages();
}
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index 257948a..c2268e9 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.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/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 521118c..08f3fe6 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -876,7 +876,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
m_bShowMenuImages = bShowMenuImages;
m_bRetrieveImages = sal_False;
m_nSymbolsStyle = nSymbolsStyle;
- MenuManager::FillMenuImages(m_xFrame,pMenu,bShowMenuImages);
+ MenuManager::FillMenuImages( m_xFrame, pMenu, bShowMenuImages );
}
// Try to map commands to labels
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index 3fdfe93..ce69f7e 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.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
@@ -488,7 +488,6 @@ void SAL_CALL NewMenuController::activate( const css::awt::MenuEvent& ) throw (R
if ( m_bShowImages != bShowImages )
{
m_bShowImages = bShowImages;
-
setMenuImages( pVCLPopupMenu, m_bShowImages );
}
@@ -556,7 +555,6 @@ void SAL_CALL NewMenuController::initialize( const Sequence< Any >& aArguments )
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
m_bShowImages = rSettings.GetUseImagesInMenus();
-
m_bNewMenu = m_aCommandURL.equalsAscii( ".uno:AddDirect" );
}
}
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 6abe6fe..1e4334a 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.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
@@ -340,7 +340,7 @@ void ToolBarManager::Destroy()
/* #i99167# removed change for i93173 since there is some weird crash */
// #i93173# delete toolbar lazily as we can still be in one of its handlers
m_pToolBar->doLazyDelete();
-
+
Link aEmpty;
m_pToolBar->SetSelectHdl( aEmpty );
m_pToolBar->SetActivateHdl( aEmpty );
@@ -746,7 +746,8 @@ void ToolBarManager::impl_elementChanged(bool _bRemove,const ::com::sun::star::u
Reference< XNameAccess > xNameAccess;
sal_Int16 nImageType = sal_Int16();
sal_Int16 nCurrentImageType = getImageTypeFromBools(
- SvtMiscOptions().AreCurrentSymbolsLarge());
+ SvtMiscOptions().AreCurrentSymbolsLarge()
+ );
if (( Event.aInfo >>= nImageType ) &&
( nImageType == nCurrentImageType ) &&
@@ -846,7 +847,7 @@ void ToolBarManager::RemoveControllers()
uno::Sequence< beans::PropertyValue > ToolBarManager::GetPropsForCommand( const ::rtl::OUString& rCmdURL )
{
Sequence< PropertyValue > aPropSeq;
-
+
// Retrieve properties for command
try
{
@@ -854,7 +855,7 @@ uno::Sequence< beans::PropertyValue > ToolBarManager::GetPropsForCommand( const
{
Reference< XModuleManager > xModuleManager( m_xServiceManager->createInstance( SERVICENAME_MODULEMANAGER ), UNO_QUERY_THROW );
Reference< XInterface > xIfac( m_xFrame, UNO_QUERY );
-
+
m_bModuleIdentified = sal_True;
m_aModuleIdentifier = xModuleManager->identify( xIfac );
@@ -865,7 +866,7 @@ uno::Sequence< beans::PropertyValue > ToolBarManager::GetPropsForCommand( const
xNameAccess->getByName( m_aModuleIdentifier ) >>= m_xUICommandLabels;
}
}
-
+
if ( m_xUICommandLabels.is() )
{
if ( rCmdURL.getLength() > 0 )
@@ -1024,9 +1025,9 @@ void ToolBarManager::CreateControllers()
MenuDescriptionMap::iterator it = m_aMenuMap.find( nId );
if ( it == m_aMenuMap.end() )
{
- xController = Reference< XStatusListener >(
+ xController = Reference< XStatusListener >(
new GenericToolbarController( m_xServiceManager, m_xFrame, m_pToolBar, nId, aCommandURL ));
-
+
// Accessibility support: Set toggle button role for specific commands
sal_Int32 nProps = RetrievePropertiesFromCommand( aCommandURL );
if ( nProps & UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON )
@@ -1088,7 +1089,7 @@ void ToolBarManager::CreateControllers()
aPropertyVector.push_back( makeAny( aPropValue ));
aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ParentWindow" ));
aPropValue.Value <<= xToolbarWindow;
- aPropertyVector.push_back( makeAny( aPropValue ));
+ aPropertyVector.push_back( makeAny( aPropValue ));
aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ModuleName" ));
aPropValue.Value <<= m_aModuleIdentifier;
aPropertyVector.push_back( makeAny( aPropValue ));
@@ -1103,17 +1104,17 @@ void ToolBarManager::CreateControllers()
Sequence< Any > aArgs( comphelper::containerToSequence( aPropertyVector ));
xInit->initialize( aArgs );
//for Support Visiblitly by shizhoubo
- if (pController)
+ if (pController)
{
// rtl::OUString aCommandURL = pController->m_aCommandURL;
- if(aCommandURL == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SwitchXFormsDesignMode" )) ||
- aCommandURL == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ViewDataSourceBrowser" )) ||
- aCommandURL == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ParaLeftToRight" )) ||
- aCommandURL == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ParaRightToLeft" ))
+ if(aCommandURL == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SwitchXFormsDesignMode" )) ||
+ aCommandURL == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ViewDataSourceBrowser" )) ||
+ aCommandURL == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ParaLeftToRight" )) ||
+ aCommandURL == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ParaRightToLeft" ))
)
pController->setFastPropertyValue_NoBroadcast(1,makeAny(sal_True));
}
-
+
//end
}
@@ -1313,7 +1314,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
xMenuContainer = m_xUICfgMgr->getSettings( aCommandURL, sal_False );
if ( xMenuContainer.is() && xMenuContainer->getCount() )
{
- Sequence< PropertyValue > aProps;
+ Sequence< PropertyValue > aProps;
// drop down menu info is currently
// the first ( and only ) menu
// in the menusettings container
@@ -1321,7 +1322,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
for ( sal_Int32 index=0; index<aProps.getLength(); ++index )
{
if ( aProps[ index ].Name.equalsAsciiL( ITEM_DESCRIPTOR_CONTAINER, ITEM_DESCRIPTOR_CONTAINER_LEN ))
-
+
{
aProps[ index ].Value >>= aMenuDesc;
break;
@@ -1816,9 +1817,8 @@ PopupMenu * ToolBarManager::GetToolBarCustomMeun(ToolBox* pToolBar)
pItemMenu->CheckItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->IsItemVisible( nId ) );
pItemMenu->SetItemCommand( STARTID_CUSTOMIZE_POPUPMENU+nPos, aCommandURL );
pItemMenu->SetItemImage( STARTID_CUSTOMIZE_POPUPMENU+nPos,
- GetImageFromURL( m_xFrame,
- aCommandURL,
- sal_False ));
+ GetImageFromURL( m_xFrame, aCommandURL, sal_False )
+ );
}
else
{
@@ -2114,7 +2114,6 @@ IMPL_LINK( ToolBarManager, StateChanged, StateChangedType*, pStateChangedType )
if ( *pStateChangedType == STATE_CHANGE_CONTROLBACKGROUND )
{
- // Check if we need to get new images for normal/high contrast mode
CheckAndUpdateImages();
}
else if ( *pStateChangedType == STATE_CHANGE_VISIBLE )
@@ -2135,7 +2134,6 @@ IMPL_LINK( ToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEvent )
( pDataChangedEvent->GetType() == DATACHANGED_DISPLAY )) &&
( pDataChangedEvent->GetFlags() & SETTINGS_STYLE ))
{
- // Check if we need to get new images for normal/high contrast mode
CheckAndUpdateImages();
}
@@ -2211,7 +2209,7 @@ IMPL_STATIC_LINK_NOINSTANCE( ToolBarManager, ExecuteHdl_Impl, ExecuteInfo*, pExe
{
pExecuteInfo->xLayoutManager->dockAllWindows( UIElementType::TOOLBAR );
}
- }
+ }
catch ( Exception& )
{
}
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 26656b0..55c4b61 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.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/inc/docvor.hxx b/sfx2/inc/docvor.hxx
index 1bd4d18..27d0815 100644
--- a/sfx2/inc/docvor.hxx
+++ b/sfx2/inc/docvor.hxx
@@ -57,11 +57,6 @@ friend class SfxOrganizeDlg_Impl;
Image aOpenedDocBmp;
Image aClosedDocBmp;
- Image aOpenedFolderBmpHC;
- Image aClosedFolderBmpHC;
- Image aOpenedDocBmpHC;
- Image aClosedDocBmpHC;
-
SfxOrganizeMgr* pMgr;
SfxOrganizeDlg_Impl* pDlg;
diff --git a/sfx2/inc/imgmgr.hxx b/sfx2/inc/imgmgr.hxx
index c3120fd..37daa8d 100644
--- a/sfx2/inc/imgmgr.hxx
+++ b/sfx2/inc/imgmgr.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,15 +54,15 @@ public:
// get images from resources
void SetImages( ToolBox& rToolBox );
- void SetImages( ToolBox& rToolBox, BOOL bHiContrast, BOOL bLarge );
- void SetImagesForceSize( ToolBox& rToolBox, BOOL bHiContrast, BOOL bLarge );
+ void SetImages( ToolBox& rToolBox, BOOL bLarge );
+ void SetImagesForceSize( ToolBox& rToolBox, BOOL bLarge );
- Image GetImage( USHORT nId, BOOL bLarge, BOOL bHiContrast ) const;
- Image GetImage( USHORT nId, BOOL bHiContrast ) const;
- Image SeekImage( USHORT nId, BOOL bLarge, BOOL bHiContrast ) const;
- Image SeekImage( USHORT nId, BOOL bHiContrast ) const;
+ Image GetImage( USHORT nId, BOOL bLarge ) const;
+ Image GetImage( USHORT nId) const;
+ Image SeekImage( USHORT nId, BOOL bLarge ) const;
+ Image SeekImage( USHORT nId ) const;
};
-#endif
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx
index 5b567c2..617ab7f 100644
--- a/sfx2/inc/sfx2/mnuitem.hxx
+++ b/sfx2/inc/sfx2/mnuitem.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
@@ -162,7 +162,7 @@ class SfxAppMenuControl_Impl : public SfxMenuControl
BOOL m_bShowMenuImages;
protected:
- DECL_LINK( Activate, Menu * ); // Needed to support high contrast images
+ DECL_LINK( Activate, Menu * );
public:
SFX_DECL_MENU_CONTROL();
diff --git a/sfx2/inc/sfx2/module.hxx b/sfx2/inc/sfx2/module.hxx
index 55be88a..8952812 100644
--- a/sfx2/inc/sfx2/module.hxx
+++ b/sfx2/inc/sfx2/module.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
@@ -105,7 +105,6 @@ public:
SAL_DLLPRIVATE SfxMenuCtrlFactArr_Impl* GetMenuCtrlFactories_Impl() const;
SAL_DLLPRIVATE SfxChildWinFactArr_Impl* GetChildWinFactories_Impl() const;
SAL_DLLPRIVATE ImageList* GetImageList_Impl( BOOL bBig );
- SAL_DLLPRIVATE ImageList* GetImageList_Impl( BOOL bBig, BOOL bHiContrast );
};
#endif
diff --git a/sfx2/inc/sfx2/new.hxx b/sfx2/inc/sfx2/new.hxx
index 1940ee4..d9baf16 100644
--- a/sfx2/inc/sfx2/new.hxx
+++ b/sfx2/inc/sfx2/new.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
@@ -63,13 +63,6 @@ protected:
virtual void Paint( const Rectangle& rRect );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
- /** state whether a system setting for high contrast should be evaluated
- and taken into account for this window.
-
- The default implementation uses the accessibility option IsForDrawings
- */
- virtual bool UseHighContrastSetting() const;
-
public:
SfxPreviewWin( Window* pParent,
const ResId& rResId,
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index f9eb6ae..565a241 100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.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
@@ -552,17 +552,22 @@ public:
virtual void SetOrganizerSearchMask(
SfxStyleSheetBasePool* ) const;
+ virtual sal_uInt16 GetContentCount( sal_uInt16 nIdx1 = INDEX_IGNORE );
+
+ virtual sal_Bool CanHaveChilds(
+ sal_uInt16 nIdx1,
+ sal_uInt16 nIdx2 = INDEX_IGNORE
+ );
- sal_uInt16 GetContentCount(sal_uInt16 nIdx);
- bool CanHaveChilds( sal_uInt16 nIdx1, sal_uInt16 nIdx2 );
- void GetContent( String &,
+ virtual void GetContent( String &,
Bitmap &rClosedBitmap,
Bitmap &rOpenedBitmap,
- bool &bCanDelete,
+ sal_Bool &bCanDelete,
sal_uInt16 nPos,
- sal_uInt16 nIdx1 );
+ sal_uInt16 nIdx1
+ );
- void TriggerHelpPI(sal_uInt16 nIdx1, sal_uInt16 nIdx2);
+ virtual void TriggerHelpPI( sal_uInt16 nIdx1, sal_uInt16 nIdx2 );
virtual Bitmap GetStyleFamilyBitmap(SfxStyleFamily eFamily);
@@ -592,10 +597,6 @@ public:
// F"ur Docs, die zum Formatieren die Viewgr"o\se
// ben"otigen
virtual SfxObjectShell* GetObjectShell();
- //void SetBaseURL( const String& rURL );
- //const String& GetBaseURL() const;
- //const String& GetBaseURLForSaving() const;
- //void SetEmptyBaseURL();
virtual SfxFrame* GetSmartSelf( SfxFrame* pSelf, SfxMedium& rMedium );
@@ -639,7 +640,6 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetStorage();
-//REMOVE void SetFileName( const ::rtl::OUString& );
SvGlobalName GetClassName() const;
// comphelper::IEmbeddedHelper
@@ -700,7 +700,7 @@ public:
// =================================
- SAL_DLLPRIVATE ::boost::shared_ptr<GDIMetaFile> CreatePreviewMetaFile_Impl( sal_Bool bFullContent, sal_Bool bHighContrast ) const;
+ SAL_DLLPRIVATE ::boost::shared_ptr<GDIMetaFile> CreatePreviewMetaFile_Impl( sal_Bool bFullContent ) const;
SAL_DLLPRIVATE sal_Bool IsOwnStorageFormat_Impl(const SfxMedium &) const;
@@ -786,8 +786,8 @@ public:
SAL_DLLPRIVATE sal_uInt16 ImplGetSignatureState( sal_Bool bScriptingContent = FALSE );
SAL_DLLPRIVATE ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation >
- ImplAnalyzeSignature(
- sal_Bool bScriptingContent,
+ ImplAnalyzeSignature(
+ sal_Bool bScriptingContent,
const ::com::sun::star::uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures >& xSigner
= ::com::sun::star::uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures >() );
diff --git a/sfx2/inc/sfx2/styfitem.hxx b/sfx2/inc/sfx2/styfitem.hxx
index 797c538..7a4614d 100644
--- a/sfx2/inc/sfx2/styfitem.hxx
+++ b/sfx2/inc/sfx2/styfitem.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
@@ -105,7 +105,7 @@ public:
@return
<TRUE/> if an image list for the requested mode could be found in the given resource.
*/
- sal_Bool updateImages( const ResId& _rId, const BmpColorMode _eMode );
+ sal_Bool updateImages( const ResId& _rId );
};
#endif
diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx
index c87e279..61b522f 100644
--- a/sfx2/inc/sfx2/tbxctrl.hxx
+++ b/sfx2/inc/sfx2/tbxctrl.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
@@ -56,7 +56,6 @@ class SfxUnoControllerItem;
svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const ::rtl::OUString& aCommandURL );
-//typedef SfxToolBoxControl* (*SfxToolBoxControlCtor)( USHORT nId, ToolBox &rTbx, SfxBindings & );
typedef SfxToolBoxControl* (*SfxToolBoxControlCtor)( USHORT nSlotId, USHORT nId, ToolBox& rBox );
struct SfxTbxCtrlFactory
@@ -367,7 +366,7 @@ protected:
virtual void Select( BOOL );
virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
virtual SfxPopupWindow* CreatePopupWindow();
- DECL_LINK( Activate, Menu * ); // Needed to support high contrast images
+ DECL_LINK( Activate, Menu * );
private:
String aLastURL;
BOOL bBigImages;
@@ -423,7 +422,7 @@ protected:
using SfxToolBoxControl::Select;
virtual void Select( BOOL );
virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
- DECL_LINK( Activate, Menu * ); // Needed to support high contrast images
+ DECL_LINK( Activate, Menu * );
public:
SFX_DECL_TOOLBOX_CONTROL();
SfxAddonsToolBoxControl_Impl( USHORT nSlotId, USHORT nId, ToolBox& rBox );
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index d284d84..474d1a5 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.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/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx
index 94b4753..569c14c 100644
--- a/sfx2/source/appl/imagemgr.cxx
+++ b/sfx2/source/appl/imagemgr.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
@@ -68,7 +68,11 @@ typedef std::hash_map< ::rtl::OUString,
::std::equal_to< ::rtl::OUString > > ModuleIdToImagegMgr;
-Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig )
+Image SAL_CALL GetImage(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+ const ::rtl::OUString& aURL,
+ BOOL bBig
+)
{
// TODO/LATeR: shouldn't this become a method at SfxViewFrame?! That would save the UnoTunnel
if ( !rFrame.is() )
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index 39661f9..ef3f934 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -66,12 +66,10 @@ public:
SfxChildWinFactArr_Impl* pFactArr;
ImageList* pImgListSmall;
ImageList* pImgListBig;
- ImageList* pImgListHiSmall;
- ImageList* pImgListHiBig;
SfxModule_Impl();
~SfxModule_Impl();
- ImageList* GetImageList( ResMgr*, BOOL, BOOL bHiContrast = FALSE );
+ ImageList* GetImageList( ResMgr* pResMgr, BOOL bBig );
};
SfxModule_Impl::SfxModule_Impl()
@@ -88,14 +86,11 @@ SfxModule_Impl::~SfxModule_Impl()
delete pFactArr;
delete pImgListSmall;
delete pImgListBig;
- delete pImgListHiSmall;
- delete pImgListHiBig;
}
-ImageList* SfxModule_Impl::GetImageList( ResMgr* pResMgr, BOOL bBig, BOOL bHiContrast )
+ImageList* SfxModule_Impl::GetImageList( ResMgr* pResMgr, BOOL bBig )
{
- ImageList*& rpList = bBig ? ( bHiContrast ? pImgListHiBig : pImgListBig ) :
- ( bHiContrast ? pImgListHiSmall : pImgListSmall );
+ ImageList*& rpList = bBig ? pImgListBig : pImgListSmall;
if ( !rpList )
{
ResId aResId( bBig ? ( RID_DEFAULTIMAGELIST_LC ) : ( RID_DEFAULTIMAGELIST_SC ), *pResMgr );
@@ -128,16 +123,7 @@ ResMgr* SfxModule::GetResMgr()
}
//====================================================================
-/*
-SfxModule::SfxModule( ResMgr* pMgrP, BOOL bDummyP,
- SfxObjectFactory* pFactoryP )
- : pResMgr( pMgrP ), bDummy( bDummyP ), pImpl(0L)
-{
- Construct_Impl();
- if ( pFactoryP )
- pFactoryP->SetModule_Impl( this );
-}
-*/
+
SfxModule::SfxModule( ResMgr* pMgrP, BOOL bDummyP,
SfxObjectFactory* pFactoryP, ... )
: pResMgr( pMgrP ), bDummy( bDummyP ), pImpl(0L)
@@ -168,8 +154,6 @@ void SfxModule::Construct_Impl()
pImpl->pFactArr=0;
pImpl->pImgListSmall=0;
pImpl->pImgListBig=0;
- pImpl->pImgListHiSmall=0;
- pImpl->pImgListHiBig=0;
SetPool( &pApp->GetPool() );
}
@@ -217,7 +201,6 @@ void SfxModule::RegisterChildWindow(SfxChildWinFactory *pFact)
if (!pImpl->pFactArr)
pImpl->pFactArr = new SfxChildWinFactArr_Impl;
-//#ifdef DBG_UTIL
for (USHORT nFactory=0; nFactory<pImpl->pFactArr->Count(); ++nFactory)
{
if (pFact->nId == (*pImpl->pFactArr)[nFactory]->nId)
@@ -227,7 +210,6 @@ void SfxModule::RegisterChildWindow(SfxChildWinFactory *pFact)
return;
}
}
-//#endif
pImpl->pFactArr->C40_INSERT(
SfxChildWinFactory, pFact, pImpl->pFactArr->Count() );
@@ -352,12 +334,7 @@ SfxChildWinFactArr_Impl* SfxModule::GetChildWinFactories_Impl() const
ImageList* SfxModule::GetImageList_Impl( BOOL bBig )
{
- return pImpl->GetImageList( pResMgr, bBig, FALSE );
-}
-
-ImageList* SfxModule::GetImageList_Impl( BOOL bBig, BOOL bHiContrast )
-{
- return pImpl->GetImageList( pResMgr, bBig, bHiContrast );
+ return pImpl->GetImageList( pResMgr, bBig );
}
SfxTabPage* SfxModule::CreateTabPage( USHORT, Window*, const SfxItemSet& )
diff --git a/sfx2/source/dialog/styfitem.cxx b/sfx2/source/dialog/styfitem.cxx
index 3cacbea..e3f547c 100644
--- a/sfx2/source/dialog/styfitem.cxx
+++ b/sfx2/source/dialog/styfitem.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
@@ -128,7 +128,7 @@ SfxStyleFamilies::SfxStyleFamilies( const ResId& rResId ) :
FreeResource();
- updateImages( rResId, BMP_COLOR_NORMAL );
+ updateImages( rResId );
}
// -----------------------------------------------------------------------
@@ -149,7 +149,7 @@ SfxStyleFamilies::~SfxStyleFamilies()
// -----------------------------------------------------------------------
-sal_Bool SfxStyleFamilies::updateImages( const ResId& _rId, const BmpColorMode _eMode )
+sal_Bool SfxStyleFamilies::updateImages( const ResId& _rId )
{
sal_Bool bSuccess = sal_False;
@@ -157,7 +157,7 @@ sal_Bool SfxStyleFamilies::updateImages( const ResId& _rId, const BmpColorMode _
::svt::OLocalResourceAccess aLocalRes( _rId );
// check if the image list is present
- ResId aImageListId( (sal_uInt16)_eMode + 1, *_rId.GetResMgr() );
+ ResId aImageListId( (sal_uInt16) 1, *_rId.GetResMgr() );
aImageListId.SetRT( RSC_IMAGELIST );
if ( aLocalRes.IsAvailableRes( aImageListId ) )
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index fb78c23..d1de5e0 100644
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.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
@@ -607,7 +607,7 @@ namespace sfx2
// assuming that nobody will insert hundreths of panels, a simple O(n) search should suffice here ...
while ( nPanelPos > 0 )
{
- const short nCompare = i_pPanelCompare->compareToolPanelsURLs(
+ const short nCompare = i_pPanelCompare->compareToolPanelsURLs(
*resource,
GetPanelResourceURL( --nPanelPos )
);
@@ -1011,7 +1011,7 @@ namespace sfx2
if ( i_pToolBox->GetCurItemId() == m_nViewMenuID )
{
i_pToolBox->EndSelection();
-
+
::std::auto_ptr< PopupMenu > pMenu = impl_createPopupMenu();
pMenu->SetSelectHdl( LINK( this, TaskPaneController_Impl, OnMenuItemSelected ) );
@@ -1255,7 +1255,7 @@ namespace sfx2
);
pMenu->RemoveDisabledEntries( FALSE, FALSE );
-
+
return pMenu;
}
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index b671bbf..ff7d461 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -2375,8 +2375,7 @@ void SfxTemplateDialog_Impl::updateFamilyImages()
return;
// let the families collection update the images
- sal_Bool bIsHighContrast = m_pFloat->GetSettings().GetStyleSettings().GetHighContrastMode();
- pStyleFamilies->updateImages( *m_pStyleFamiliesId, bIsHighContrast ? BMP_COLOR_HIGHCONTRAST : BMP_COLOR_NORMAL );
+ pStyleFamilies->updateImages( *m_pStyleFamiliesId );
// and set the new images on our toolbox
USHORT nLoop = pStyleFamilies->Count();
@@ -2421,14 +2420,6 @@ void SfxCommonTemplateDialog_Impl::InvalidateBindings()
SfxTemplateDialog_Impl::~SfxTemplateDialog_Impl()
{
-/*
- SfxImageManager* pImgMgr = pBindings->GetImageManager();
- if ( pImgMgr )
- {
- pImgMgr->ReleaseToolBox( &m_aActionTbL );
- pImgMgr->ReleaseToolBox( &m_aActionTbR );
- }
-*/
}
//-------------------------------------------------------------------------
@@ -2448,10 +2439,6 @@ void SfxTemplateDialog_Impl::Resize()
FloatingWindow *pF = m_pFloat->GetFloatingWindow();
if ( pF )
{
-// if(pF->IsZoomedIn() && m_bZoomIn==FALSE)
-// pF->SetText(String(SfxResId( DLG_STYLE_DESIGNER )));
-// if(!pF->IsZoomedIn() && m_bZoomIn==TRUE && GetFamilyItem_Impl())
-// UpdateStyles_Impl(UPDATE_FAMILY); //Bereich wieder in Titel schreiben
m_bZoomIn = pF->IsRollUp();
if ( m_bZoomIn )
return;
@@ -2841,13 +2828,6 @@ void SfxTemplateCatalog_Impl::EnableItem( USHORT nMesId, BOOL bCheck )
aOkBtn.Enable( bCheck );
if ( nMesId > SFX_STYLE_FAMILY_PSEUDO || nMesId < SFX_STYLE_FAMILY_CHAR )
return;
-
-/* for(USHORT i=0;i<aFamIds.Count&&aFamIds[i]!=nMesId;i++);
- if(i!=aFamIds.Count())
- aFamList.SelectEntry(aFamIds[i]);
- else
- DBG_ERROR("Entry nicht gefunden");*/
-
}
//-------------------------------------------------------------------------
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index bc021a9..fe22072 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -1193,9 +1193,9 @@ void SfxOrganizeListBox_Impl::RequestingChilds( SvLBoxEntry* pEntry )
const bool bCanHaveChilds =
aRef->CanHaveChilds(aPath[nDocLevel+1],
aPath[nDocLevel+2]);
- for(USHORT i = 0; i < nCount; ++i)
+ for(sal_uInt16 i = 0; i < nCount; ++i)
{
- bool bDeletable;
+ sal_Bool bDeletable;
aRef->GetContent(
aText, aClosedBmp, aOpenedBmp, bDeletable,
i, aPath[nDocLevel+1]);
@@ -1483,17 +1483,16 @@ const Image &SfxOrganizeListBox_Impl::GetOpenedBmp(USHORT nLevel) const
*/
{
- BOOL bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
const Image* pRet = NULL;
switch( nLevel )
{
case 0:
- pRet = bHC ? &aOpenedFolderBmpHC : &aOpenedFolderBmp; break;
+ pRet = &aOpenedFolderBmp; break;
case 1:
- pRet = bHC ? &aOpenedDocBmpHC : &aOpenedDocBmp; break;
+ pRet = &aOpenedDocBmp; break;
default:
- pRet = bHC ? &aClosedFolderBmpHC : &aClosedFolderBmp; break;
+ pRet = &aClosedFolderBmp; break;
}
return *pRet;
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 5a07801..52e36d7 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -174,8 +174,7 @@ SfxPreviewWin::SfxPreviewWin(
SetHelpId( HID_PREVIEW_FRAME );
// adjust contrast mode initially
- bool bUseContrast = UseHighContrastSetting();
- SetDrawMode( bUseContrast ? OUTPUT_DRAWMODE_CONTRAST : OUTPUT_DRAWMODE_COLOR );
+ SetDrawMode( OUTPUT_DRAWMODE_COLOR );
// #107818# This preview window is for document previews. Therefore
// right-to-left mode should be off
@@ -216,18 +215,10 @@ void SfxPreviewWin::DataChanged( const DataChangedEvent& rDCEvt )
if( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
(rDCEvt.GetFlags() & SETTINGS_STYLE) )
{
- // adjust contrast mode
- bool bUseContrast = UseHighContrastSetting();
- SetDrawMode( bUseContrast ? OUTPUT_DRAWMODE_CONTRAST : OUTPUT_DRAWMODE_COLOR );
+ SetDrawMode( OUTPUT_DRAWMODE_COLOR );
}
}
-bool SfxPreviewWin::UseHighContrastSetting() const
-{
- return GetSettings().GetStyleSettings().GetHighContrastMode();
-}
-
-
class SfxNewFileDialog_Impl
{
FixedText aRegionFt;
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 6ecc69f..94489c4 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.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
@@ -119,16 +119,14 @@ bool operator> (const util::DateTime& i_rLeft, const util::DateTime& i_rRight)
return sal_False;
}
-
::boost::shared_ptr<GDIMetaFile>
SfxObjectShell::GetPreviewMetaFile( sal_Bool bFullContent ) const
{
- return CreatePreviewMetaFile_Impl( bFullContent, sal_False );
+ return CreatePreviewMetaFile_Impl( bFullContent );
}
-
::boost::shared_ptr<GDIMetaFile>
-SfxObjectShell::CreatePreviewMetaFile_Impl( sal_Bool bFullContent, sal_Bool bHighContrast ) const
+SfxObjectShell::CreatePreviewMetaFile_Impl( sal_Bool bFullContent ) const
{
// Nur wenn gerade nicht gedruckt wird, darf DoDraw aufgerufen
// werden, sonst wird u.U. der Printer abgeschossen !
@@ -143,10 +141,6 @@ SfxObjectShell::CreatePreviewMetaFile_Impl( sal_Bool bFullContent, sal_Bool bHig
VirtualDevice aDevice;
aDevice.EnableOutput( FALSE );
- // adjust the output device if HC-metafile is requested
- if ( bHighContrast )
- aDevice.SetDrawMode( aDevice.GetDrawMode() | DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT );
-
MapMode aMode( ((SfxObjectShell*)this)->GetMapUnit() );
aDevice.SetMapMode( aMode );
pFile->SetPrefMapMode( aMode );
@@ -361,7 +355,7 @@ void SfxObjectShell::TriggerHelpPI(USHORT nIdx1, USHORT nIdx2)
}
}
-bool SfxObjectShell::CanHaveChilds(sal_uInt16 nIdx1, sal_uInt16 nIdx2)
+sal_Bool SfxObjectShell::CanHaveChilds(sal_uInt16 nIdx1, sal_uInt16 nIdx2)
{
switch(nIdx1)
{
@@ -378,8 +372,12 @@ bool SfxObjectShell::CanHaveChilds(sal_uInt16 nIdx1, sal_uInt16 nIdx2)
//--------------------------------------------------------------------
void SfxObjectShell::GetContent(String &rText,
- Bitmap &rClosedBitmap, Bitmap &rOpenedBitmap,
- bool &bCanDel, sal_uInt16 i, sal_uInt16 nIdx)
+ Bitmap &rClosedBitmap,
+ Bitmap &rOpenedBitmap,
+ sal_Bool &bCanDel,
+ sal_uInt16 i,
+ sal_uInt16 nIdx
+)
{
bCanDel=true;
@@ -696,7 +694,7 @@ BOOL SfxObjectShell::Print
boost::shared_ptr< vcl::PrinterController > pController( pAdaptor );
pAdaptor->StartPage();
-
+
pPrinter->SetMapMode(MapMode(MAP_10TH_MM));
Font aFont( DEFINE_CONST_UNICODE( "Arial" ), Size(0, 64)); // 18pt
aFont.SetWeight(WEIGHT_BOLD);
@@ -790,7 +788,7 @@ BOOL SfxObjectShell::Print
pStyle = pIter->Next();
}
pAdaptor->EndPage();
-
+
Printer::PrintJob( pController, rPrt.GetJobSetup() );
delete pIter;
@@ -1080,10 +1078,10 @@ void SfxObjectShell::ResetFromTemplate( const String& rTemplateName, const Strin
xDocProps->setTemplateName( ::rtl::OUString() );
xDocProps->setTemplateDate( util::DateTime() );
xDocProps->resetUserData( ::rtl::OUString() );
-
+
// TODO/REFACTOR:
// Title?
-
+
if( ::utl::LocalFileHelper::IsLocalFile( rFileName ) )
{
String aFoundName;
@@ -1092,13 +1090,13 @@ void SfxObjectShell::ResetFromTemplate( const String& rTemplateName, const Strin
INetURLObject aObj( rFileName );
xDocProps->setTemplateURL( aObj.GetMainURL(INetURLObject::DECODE_TO_IURI) );
xDocProps->setTemplateName( rTemplateName );
-
+
::DateTime now;
xDocProps->setTemplateDate( util::DateTime(
now.Get100Sec(), now.GetSec(), now.GetMin(),
now.GetHour(), now.GetDay(), now.GetMonth(),
now.GetYear() ) );
-
+
SetQueryLoadTemplate( sal_True );
}
}
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 1214c3c..dae91d7 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1996,7 +1996,7 @@ uno::Any SAL_CALL SfxBaseModel::getTransferData( const DATAFLAVOR& aFlavor )
if ( aFlavor.DataType == getCppuType( (const Sequence< sal_Int8 >*) 0 ) )
{
::boost::shared_ptr<GDIMetaFile> pMetaFile =
- m_pData->m_pObjectShell->CreatePreviewMetaFile_Impl( sal_True, sal_True );
+ m_pData->m_pObjectShell->CreatePreviewMetaFile_Impl( sal_True );
if ( pMetaFile )
{
diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx
index acf3aec..c9e3304 100644
--- a/sfx2/source/inc/virtmenu.hxx
+++ b/sfx2/source/inc/virtmenu.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
@@ -124,7 +124,6 @@ public:
void SetResMgr(ResMgr* pMgr) {pResMgr = pMgr; }
ResMgr* GetResMgr() { return pResMgr; }
void SetHelpIds( ResMgr* );
- BOOL IsHiContrastMode() const;
void UpdateImages();
DECL_LINK( Select, Menu * );
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index 5fc1966..49c931e 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.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
@@ -530,8 +530,8 @@ SfxUnoMenuControl* SfxMenuControl::CreateControl( const String& rCmd,
return new SfxUnoMenuControl( rCmd, nId, rMenu, rBindings, pVirt );
}
-SfxUnoMenuControl* SfxMenuControl::CreateControl( const String& rCmd,
- USHORT nId, Menu& rMenu, const String& sItemText, const String& sHelpText,
+SfxUnoMenuControl* SfxMenuControl::CreateControl( const String& rCmd,
+ USHORT nId, Menu& rMenu, const String& sItemText, const String& sHelpText,
SfxBindings& rBindings, SfxVirtualMenu* pVirt)
{
return new SfxUnoMenuControl( rCmd, nId, rMenu, sItemText, sHelpText, rBindings, pVirt);
@@ -549,7 +549,7 @@ SfxUnoMenuControl::SfxUnoMenuControl( const String& rCmd, USHORT nSlotId,
pUnoCtrl->GetNewDispatch();
}
-SfxUnoMenuControl::SfxUnoMenuControl(
+SfxUnoMenuControl::SfxUnoMenuControl(
const String& rCmd, USHORT nSlotId, Menu& /*rMenu*/,
const String& rItemText, const String& rHelpText,
SfxBindings& rBindings, SfxVirtualMenu* pVirt)
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index d77163b..276f443 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.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
@@ -181,10 +181,10 @@ void InsertVerbs_Impl( SfxBindings* pBindings, const com::sun::star::uno::Sequen
static Image lcl_GetImageFromPngUrl( const ::rtl::OUString &rFileUrl )
{
Image aRes;
-
+
::rtl::OUString aTmp;
osl::FileBase::getSystemPathFromFileURL( rFileUrl, aTmp );
-
+
Graphic aGraphic;
const String aFilterName( RTL_CONSTASCII_USTRINGPARAM( IMP_PNG ) );
if( GRFILTER_OK == GraphicFilter::LoadGraphic( aTmp, aFilterName, aGraphic ) )
@@ -228,11 +228,10 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu )
if (nNumSynonyms > 0)
{
SvtLinguConfig aCfg;
- const bool bHC = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
-
+
Image aImage;
String sThesImplName( aHelper.GetThesImplName( aLocale ) );
- ::rtl::OUString aSynonymsImageUrl( aCfg.GetSynonymsContextImage( sThesImplName, bHC ) );
+ ::rtl::OUString aSynonymsImageUrl( aCfg.GetSynonymsContextImage( sThesImplName ) );
if (sThesImplName.Len() > 0 && aSynonymsImageUrl.getLength() > 0)
aImage = Image( lcl_GetImageFromPngUrl( aSynonymsImageUrl ) );
@@ -240,7 +239,7 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu )
{
//! item ids should start with values > 0, since 0 has special meaning
const USHORT nId = i + 1;
-
+
String aItemText( GetThesaurusReplaceText_Impl( aSynonyms[i] ) );
pThesSubMenu->InsertItem( nId, aItemText );
::rtl::OUString aCmd( ::rtl::OUString::createFromAscii( ".uno:ThesaurusFromContext?WordReplace:string=" ) );
@@ -622,7 +621,7 @@ void SfxPopupMenuManager::ExecutePopup( const ResId& rResId, SfxViewFrame* pFram
aPop.Execute( rPoint, pWindow );
// #i112646 avoid crash when context menu is closed.
- // the (manually inserted) sub-menu needs to be destroyed before
+ // the (manually inserted) sub-menu needs to be destroyed before
// aPop gets destroyed.
delete pThesSubMenu;
pThesSubMenu = 0;
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index 2ced6fe..1f51b12 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.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
@@ -134,7 +134,8 @@ void SfxMenuImageControl_Impl::Update()
static Image RetrieveAddOnImage( Reference< com::sun::star::frame::XFrame >& rFrame,
const rtl::OUString& aImageId,
const rtl::OUString& aURL,
- BOOL bBigImage )
+ BOOL bBigImage
+)
{
Image aImage;
@@ -194,7 +195,7 @@ SfxVirtualMenu::SfxVirtualMenu( USHORT nOwnId,
SfxVirtualMenu* pOwnParent, Menu& rMenu, BOOL bWithHelp,
SfxBindings &rBindings, BOOL bOLEServer, BOOL bRes, BOOL bIsAddonMenu ):
pItems(0),
- pImageControl(0),
+ pImageControl(0),
pBindings(&rBindings),
pResMgr(0),
pAutoDeactivate(0),
@@ -320,14 +321,6 @@ SfxVirtualMenu::~SfxVirtualMenu()
DBG_ASSERT( !nLocks, "destroying active menu" );
}
//--------------------------------------------------------------------
-
-BOOL SfxVirtualMenu::IsHiContrastMode() const
-{
- const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
- return rSettings.GetHighContrastMode();
-}
-
-//--------------------------------------------------------------------
// internal: creates the virtual menu from the pSVMenu
void SfxVirtualMenu::CreateFromSVMenu()
@@ -407,7 +400,7 @@ void SfxVirtualMenu::CreateFromSVMenu()
if ( pPopup )
{
-
+
SfxMenuControl *pMnuCtrl =
SfxMenuControl::CreateControl(nSlotId, *pPopup, *pBindings);
diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx
index 8b4402d..ac3c008 100644
--- a/sfx2/source/toolbox/imgmgr.cxx
+++ b/sfx2/source/toolbox/imgmgr.cxx
@@ -66,8 +66,8 @@ public:
ImageList* m_pImageList[IMAGELIST_COUNT];
SfxModule* m_pModule;
- ImageList* GetImageList( BOOL bBig, BOOL bHiContrast );
- Image GetImage( USHORT nId, BOOL bBig, BOOL bHiContrast );
+ ImageList* GetImageList( BOOL bBig );
+ Image GetImage( USHORT nId, BOOL bBig );
void SetSymbolsSize_Impl( sal_Int16 );
DECL_LINK( OptionsChanged_Impl, void* );
@@ -169,7 +169,7 @@ SfxImageManager_Impl::~SfxImageManager_Impl()
//-------------------------------------------------------------------------
-ImageList* SfxImageManager_Impl::GetImageList( BOOL bBig, BOOL bHiContrast )
+ImageList* SfxImageManager_Impl::GetImageList( BOOL bBig )
{
sal_Int32 nIndex = impl_convertBools( bBig );
if ( !m_pImageList[nIndex] )
@@ -177,7 +177,7 @@ ImageList* SfxImageManager_Impl::GetImageList( BOOL bBig, BOOL bHiContrast )
if ( !m_pModule )
m_pImageList[nIndex] = ::GetImageList( bBig );
else
- m_pImageList[nIndex] = m_pModule->GetImageList_Impl( bBig, bHiContrast );
+ m_pImageList[nIndex] = m_pModule->GetImageList_Impl( bBig );
}
return m_pImageList[nIndex];
@@ -185,9 +185,9 @@ ImageList* SfxImageManager_Impl::GetImageList( BOOL bBig, BOOL bHiContrast )
//-------------------------------------------------------------------------
-Image SfxImageManager_Impl::GetImage( USHORT nId, BOOL bBig, BOOL bHiContrast )
+Image SfxImageManager_Impl::GetImage( USHORT nId, BOOL bBig )
{
- ImageList* pImageList = GetImageList( bBig, bHiContrast );
+ ImageList* pImageList = GetImageList( bBig );
if ( pImageList )
return pImageList->GetImage( nId );
return Image();
@@ -210,14 +210,13 @@ void SfxImageManager_Impl::SetSymbolsSize_Impl( sal_Int16 nNewSymbolsSize )
if ( pInf->nFlags & SFX_TOOLBOX_CHANGESYMBOLSET )
{
ToolBox *pBox = pInf->pToolBox;
- BOOL bHiContrast = pBox->GetSettings().GetStyleSettings().GetHighContrastMode();
USHORT nCount = pBox->GetItemCount();
for ( USHORT nPos=0; nPos<nCount; nPos++ )
{
USHORT nId = pBox->GetItemId( nPos );
if ( pBox->GetItemType(nPos) == TOOLBOXITEM_BUTTON )
{
- pBox->SetItemImage( nId, GetImage( nId, bLarge, bHiContrast ) );
+ pBox->SetItemImage( nId, GetImage( nId, bLarge ) );
SfxStateCache *pCache = SfxViewFrame::Current()->GetBindings().GetStateCache( nId );
if ( pCache )
pCache->SetCachedState();
@@ -296,9 +295,9 @@ SfxImageManager* SfxImageManager::GetImageManager( SfxModule* pModule )
//-------------------------------------------------------------------------
-Image SfxImageManager::GetImage( USHORT nId, BOOL bBig, BOOL bHiContrast ) const
+Image SfxImageManager::GetImage( USHORT nId, BOOL bBig ) const
{
- ImageList* pImageList = pImp->GetImageList( bBig, bHiContrast );
+ ImageList* pImageList = pImp->GetImageList( bBig );
if ( pImageList && pImageList->HasImageAtPos( nId ) )
return pImageList->GetImage( nId );
return Image();
@@ -306,23 +305,23 @@ Image SfxImageManager::GetImage( USHORT nId, BOOL bBig, BOOL bHiContrast ) const
//-------------------------------------------------------------------------
-Image SfxImageManager::GetImage( USHORT nId, BOOL bHiContrast ) const
+Image SfxImageManager::GetImage( USHORT nId ) const
{
BOOL bLarge = SvtMiscOptions().AreCurrentSymbolsLarge();
- return GetImage( nId, bLarge, bHiContrast );
+ return GetImage( nId, bLarge );
}
//-------------------------------------------------------------------------
-Image SfxImageManager::SeekImage( USHORT nId, BOOL bBig, BOOL bHiContrast ) const
+Image SfxImageManager::SeekImage( USHORT nId, BOOL bBig ) const
{
sal_Bool bGlobal = ( pImp->m_pModule == 0 );
- ImageList* pImageList = pImp->GetImageList( bBig, bHiContrast );
+ ImageList* pImageList = pImp->GetImageList( bBig );
if ( pImageList && pImageList->HasImageAtPos( nId ) )
return pImageList->GetImage( nId );
else if ( !bGlobal )
{
- pImageList = ::GetImageManager( 0 )->GetImageList( bBig, bHiContrast );
+ pImageList = ::GetImageManager( 0 )->GetImageList( bBig );
if ( pImageList )
return pImageList->GetImage( nId );
}
@@ -331,10 +330,10 @@ Image SfxImageManager::SeekImage( USHORT nId, BOOL bBig, BOOL bHiContrast ) cons
//-------------------------------------------------------------------------
-Image SfxImageManager::SeekImage( USHORT nId, BOOL bHiContrast ) const
+Image SfxImageManager::SeekImage( USHORT nId ) const
{
BOOL bLarge = SvtMiscOptions().AreCurrentSymbolsLarge();
- return SeekImage( nId, bLarge, bHiContrast );
+ return SeekImage( nId, bLarge );
}
//-------------------------------------------------------------------------
@@ -368,16 +367,16 @@ void SfxImageManager::ReleaseToolBox( ToolBox *pBox )
//-------------------------------------------------------------------------
-void SfxImageManager::SetImages( ToolBox& rToolBox, BOOL bHiContrast, BOOL bLarge )
+void SfxImageManager::SetImages( ToolBox& rToolBox, BOOL bLarge )
{
- SetImagesForceSize( rToolBox, bLarge, bHiContrast );
+ SetImagesForceSize( rToolBox, bLarge );
}
//-------------------------------------------------------------------------
-void SfxImageManager::SetImagesForceSize( ToolBox& rToolBox, BOOL bHiContrast, BOOL bLarge )
+void SfxImageManager::SetImagesForceSize( ToolBox& rToolBox, BOOL bLarge )
{
- ImageList* pImageList = pImp->GetImageList( bLarge, bHiContrast );
+ ImageList* pImageList = pImp->GetImageList( bLarge );
USHORT nCount = rToolBox.GetItemCount();
for (USHORT n=0; n<nCount; n++)
@@ -405,8 +404,7 @@ void SfxImageManager::SetImagesForceSize( ToolBox& rToolBox, BOOL bHiContrast, B
void SfxImageManager::SetImages( ToolBox& rToolBox )
{
BOOL bLarge = ( pImp->m_nSymbolsSize == SFX_SYMBOLS_SIZE_LARGE );
- BOOL bHiContrast = rToolBox.GetSettings().GetStyleSettings().GetHighContrastMode();
- SetImagesForceSize( rToolBox, bHiContrast, bLarge );
+ SetImagesForceSize( rToolBox, bLarge );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 2af713c..c511782 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.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/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx
index 0f9d3c4..bcaf8a6 100644
--- a/svx/source/customshapes/tbxcustomshapes.cxx
+++ b/svx/source/customshapes/tbxcustomshapes.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/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 63a60d8..5b8de39 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -773,7 +773,6 @@ SaveDialog::SaveDialog(Window* pParent,
m_aTitleFT.SetFont(aFont);
m_aOkBtn.SetClickHdl( LINK( this, SaveDialog, OKButtonHdl ) );
-// m_aFileListLB.EnableInput( sal_False );
m_aFileListLB.SetControlBackground( rStyleSettings.GetDialogColor() );
// fill listbox with current open documents
@@ -846,7 +845,6 @@ SaveProgressDialog::SaveProgressDialog(Window* pParent,
FreeResource();
PluginProgress* pProgress = new PluginProgress( &m_aProgrParent, pCore->getSMGR() );
m_xProgress = css::uno::Reference< css::task::XStatusIndicator >(static_cast< css::task::XStatusIndicator* >(pProgress), css::uno::UNO_QUERY_THROW);
-// m_aProgrBaseTxt = m_aProgrFT.GetText();
}
//===============================================
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index beb9ec0..d533d9c 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.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
@@ -208,10 +208,7 @@ void SvxFmTbxCtlConfig::StateChanged(USHORT nSID, SfxItemState eState, const Sfx
{ // set a new image, matching to this slot
rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlot ));
- Image aImage = GetImage( m_xFrame,
- aSlotURL,
- hasBigImages() );
-
+ Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() );
GetToolBox().SetItemImage( GetId(), aImage );
nLastSlot = nSlot;
}
diff --git a/svx/source/intro/iso.src b/svx/source/intro/iso.src
index bc18368..be0ec5d 100644
--- a/svx/source/intro/iso.src
+++ b/svx/source/intro/iso.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
@@ -167,32 +167,4 @@ ImageList RID_SVTOOLS_IMAGELIST_SMALL
X_IMAGE_LIST
};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// ******************************************************************* EOF
diff --git a/svx/source/intro/ooo.src b/svx/source/intro/ooo.src
index 35c32fe..6bc1b62 100644
--- a/svx/source/intro/ooo.src
+++ b/svx/source/intro/ooo.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
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index f349b31..0978976 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -259,13 +259,13 @@ static USHORT ImplGetRID( const OUString& aCommand )
{
static const CommandToRID aImplCommandToResMap[] =
{
- { ".uno:GrafRed", RID_SVXIMG_GRAF_RED },
- { ".uno:GrafGreen", RID_SVXIMG_GRAF_GREEN },
- { ".uno:GrafBlue", RID_SVXIMG_GRAF_BLUE },
- { ".uno:GrafLuminance", RID_SVXIMG_GRAF_LUMINANCE },
- { ".uno:GrafContrast", RID_SVXIMG_GRAF_CONTRAST },
- { ".uno:GrafGamma", RID_SVXIMG_GRAF_GAMMA },
- { ".uno:GrafTransparence", RID_SVXIMG_GRAF_TRANSPARENCE },
+ { ".uno:GrafRed", RID_SVXIMG_GRAF_RED },
+ { ".uno:GrafGreen", RID_SVXIMG_GRAF_GREEN },
+ { ".uno:GrafBlue", RID_SVXIMG_GRAF_BLUE },
+ { ".uno:GrafLuminance", RID_SVXIMG_GRAF_LUMINANCE },
+ { ".uno:GrafContrast", RID_SVXIMG_GRAF_CONTRAST },
+ { ".uno:GrafGamma", RID_SVXIMG_GRAF_GAMMA },
+ { ".uno:GrafTransparence", RID_SVXIMG_GRAF_TRANSPARENCE },
{ 0, 0 }
};
@@ -309,10 +309,14 @@ public:
// -----------------------------------------------------------------------------
-ImplGrafControl::ImplGrafControl( Window* pParent, USHORT nSlotId, const rtl::OUString& rCmd, const Reference< XFrame >& rFrame ) :
- Control( pParent, WB_TABSTOP ),
- maImage ( this ),
- maField ( this, rCmd, rFrame )
+ImplGrafControl::ImplGrafControl(
+ Window* pParent,
+ USHORT nSlotId,
+ const rtl::OUString& rCmd,
+ const Reference< XFrame >& rFrame
+) : Control( pParent, WB_TABSTOP )
+ , maImage( this )
+ , maField( this, rCmd, rFrame )
{
ResId aResId( ImplGetRID( rCmd ), DIALOG_MGR() ) ;
Image aImage( aResId );
@@ -393,9 +397,9 @@ ImplGrafModeControl::ImplGrafModeControl( Window* pParent, const Reference< XFra
{
SetSizePixel( Size( 100, 260 ) );
- InsertEntry( SVX_RESSTR( RID_SVXSTR_GRAFMODE_STANDARD ) );
- InsertEntry( SVX_RESSTR( RID_SVXSTR_GRAFMODE_GREYS ) );
- InsertEntry( SVX_RESSTR( RID_SVXSTR_GRAFMODE_MONO ) );
+ InsertEntry( SVX_RESSTR( RID_SVXSTR_GRAFMODE_STANDARD ) );
+ InsertEntry( SVX_RESSTR( RID_SVXSTR_GRAFMODE_GREYS ) );
+ InsertEntry( SVX_RESSTR( RID_SVXSTR_GRAFMODE_MONO ) );
InsertEntry( SVX_RESSTR( RID_SVXSTR_GRAFMODE_WATERMARK ) );
Show();
diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src
index 4df0442..c0f8874 100644
--- a/svx/source/tbxctrls/tbcontrl.src
+++ b/svx/source/tbxctrls/tbcontrl.src
@@ -40,11 +40,13 @@ Image RID_SVX_RELOAD_NORMAL
ImageBitmap = Bitmap { File = "reload.bmp" ; };
MASKCOLOR
};
+
Image RID_SVX_RELOAD_SPECIAL
{
ImageBitmap = Bitmap { File = "reloads.bmp" ; };
MASKCOLOR
};
+
ImageList RID_SVXIL_FRAME
{
Prefix = "fr";
@@ -52,26 +54,32 @@ ImageList RID_SVXIL_FRAME
IdCount = { 12 ; };
MASKCOLOR
};
+
String RID_SVXSTR_TRANSPARENT
{
Text [ en-US ] = "No Fill" ;
};
String RID_SVXSTR_FILLPATTERN
+
{
Text [ en-US ] = "Pattern" ;
};
+
String RID_SVXSTR_FRAME
{
Text [ en-US ] = "Borders" ;
};
+
String RID_SVXSTR_FRAME_STYLE
{
Text [ en-US ] = "Border Style" ;
};
+
String RID_SVXSTR_FRAME_COLOR
{
Text [ en-US ] = "Border Color" ;
};
+
ComboBox RID_SVXTBX_STYLE
{
HelpId = HID_STYLE_LISTBOX ;
@@ -83,22 +91,27 @@ ComboBox RID_SVXTBX_STYLE
Border = TRUE ;
Hide = TRUE ;
};
+
String RID_SVXSTR_EXTRAS_CHARBACKGROUND
{
Text [ en-US ] = "Highlighting" ;
};
+
String RID_SVXSTR_BACKGROUND
{
Text [ en-US ] = "Background";
};
+
String RID_SVXSTR_AUTOMATIC
{
Text [ en-US ] = "Automatic";
};
+
String RID_SVXSTR_PAGES
{
Text [ en-US ] = "Pages";
};
+
Image RID_SVXIMG_GRAF_RED
{
ImageBitmap = Bitmap { File = "sc10865.bmp" ; };
@@ -134,10 +147,12 @@ Image RID_SVXIMG_GRAF_TRANSPARENCE
ImageBitmap = Bitmap { File = "sc10869.bmp" ; };
MASKCOLOR
};
+
String RID_SVXSTR_CLEARFORM
{
Text [ en-US ] = "Clear formatting";
};
+
String RID_SVXSTR_MORE
{
Text [ en-US ] = "More...";
diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx
index 182c2fc..bf1d015 100644
--- a/svx/source/tbxctrls/tbxalign.cxx
+++ b/svx/source/tbxctrls/tbxalign.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
@@ -102,7 +102,7 @@ SfxPopupWindow* SvxTbxCtlAlign::CreatePopupWindow()
::rtl::OUString SAL_CALL SvxTbxCtlAlign::getSubToolbarName() throw (::com::sun::star::uno::RuntimeException)
{
- // Provide the controlled sub-toolbar name, so we are notified whenever
+ // Provide the controlled sub-toolbar name, so we are notified whenever
// this toolbar executes a function.
SolarMutexGuard aGuard;
return m_aSubTbName;
More information about the Libreoffice-commits
mailing list