diff options
Diffstat (limited to 'framework')
94 files changed, 480 insertions, 622 deletions
diff --git a/framework/inc/classes/addonmenu.hxx b/framework/inc/classes/addonmenu.hxx index d3518843a6c1..90f6cb42bded 100644 --- a/framework/inc/classes/addonmenu.hxx +++ b/framework/inc/classes/addonmenu.hxx @@ -51,18 +51,19 @@ namespace framework class AddonMenu : public PopupMenu { public: - AddonMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); - ~AddonMenu(); + AddonMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); + ~AddonMenu(); protected: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; }; class AddonMenuManager; + class AddonPopupMenu : public AddonMenu { public: - ~AddonPopupMenu(); + ~AddonPopupMenu(); // Check if command URL string has the unique prefix to identify addon popup menus static sal_Bool IsCommandURLPrefix( const rtl::OUString& aCmdURL ); @@ -71,12 +72,12 @@ class AddonPopupMenu : public AddonMenu const rtl::OUString& GetCommandURL() const { return m_aCommandURL; } protected: - void Initialize( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rAddonPopupMenuDefinition ); + void Initialize( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rAddonPopupMenuDefinition ); private: - AddonPopupMenu( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame ); + AddonPopupMenu( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame ); - rtl::OUString m_aCommandURL; + rtl::OUString m_aCommandURL; friend class AddonMenuManager; }; diff --git a/framework/inc/classes/addonsoptions.hxx b/framework/inc/classes/addonsoptions.hxx index eef01ef79467..4d77e4cf0885 100644 --- a/framework/inc/classes/addonsoptions.hxx +++ b/framework/inc/classes/addonsoptions.hxx @@ -313,9 +313,9 @@ class AddonsOptions @onerror An empty image *//*-*****************************************************************************************************/ - Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast, sal_Bool bNoScale ) const; + Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const; + Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig ) const; - Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast ) const; //------------------------------------------------------------------------------------------------------------- // private methods //------------------------------------------------------------------------------------------------------------- diff --git a/framework/inc/classes/bmkmenu.hxx b/framework/inc/classes/bmkmenu.hxx index 2645a535950f..6bfc741857c5 100644 --- a/framework/inc/classes/bmkmenu.hxx +++ b/framework/inc/classes/bmkmenu.hxx @@ -54,25 +54,28 @@ class BmkMenu_Impl; class BmkMenu : public AddonMenu { public: - enum BmkMenuType - { - BMK_NEWMENU, - BMK_WIZARDMENU - }; + enum BmkMenuType + { + BMK_NEWMENU, + BMK_WIZARDMENU + }; - BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - BmkMenuType nType ); - ~BmkMenu(); + BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + BmkMenuType nType + ); - void Initialize(); // Synchrones Laden der Eintraege + ~BmkMenu(); + + void Initialize(); // Synchrones Laden der Eintraege protected: BmkMenu::BmkMenuType m_nType; - USHORT CreateMenuId(); + USHORT CreateMenuId(); private: - BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - BmkMenuType, BmkMenu* pRoot ); + BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + BmkMenuType, BmkMenu* pRoot + ); BmkMenu_Impl* _pImp; }; diff --git a/framework/inc/classes/checkediterator.hxx b/framework/inc/classes/checkediterator.hxx index 353e0a43ae77..4ae7d17eddb2 100644 --- a/framework/inc/classes/checkediterator.hxx +++ b/framework/inc/classes/checkediterator.hxx @@ -44,9 +44,7 @@ //_________________________________________________________________________________________________________________ #include <sal/types.h> -#ifndef __SGI_STL_ITERATOR #include <iterator> -#endif //_________________________________________________________________________________________________________________ // namespace diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx index 2c55f287e82f..99ad2e9268d8 100644 --- a/framework/inc/classes/menumanager.hxx +++ b/framework/inc/classes/menumanager.hxx @@ -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 bIsHiContrast,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 * ); @@ -144,7 +148,6 @@ class MenuManager : public ThreadHelpBase , sal_Bool m_bDeleteChildren; sal_Bool m_bActive; sal_Bool m_bIsBookmarkMenu; - sal_Bool m_bWasHiContrast; sal_Bool m_bShowMenuImages; ::rtl::OUString m_aMenuItemCommand; Menu* m_pVCLMenu; diff --git a/framework/inc/classes/resource.hrc b/framework/inc/classes/resource.hrc index 8c9bd2e854b0..22fd6740c397 100644 --- a/framework/inc/classes/resource.hrc +++ b/framework/inc/classes/resource.hrc @@ -69,19 +69,19 @@ #define RID_IMAGE_STATUSBAR_LOGO (RID_IMAGE_START+0) // License Dialog -#define DLG_LICENSE (RID_FWK_DIALOG_START+256) -#define ML_LICENSE (RID_FWK_DIALOG_START+11) -#define FT_INFO1 (RID_FWK_DIALOG_START+12) -#define FT_INFO2 (RID_FWK_DIALOG_START+13) -#define FT_INFO3 (RID_FWK_DIALOG_START+14) -#define FT_INFO2_1 (RID_FWK_DIALOG_START+15) -#define FT_INFO3_1 (RID_FWK_DIALOG_START+16) -#define FL_DIVIDE (RID_FWK_DIALOG_START+17) -#define PB_PAGEDOWN (RID_FWK_DIALOG_START+18) -#define IMG_ARROW (RID_FWK_DIALOG_START+19) -#define LICENSE_ACCEPT (RID_FWK_DIALOG_START+20) -#define LICENSE_NOTACCEPT (RID_FWK_DIALOG_START+21) -#define PB_DECLINE (RID_FWK_DIALOG_START+22) -#define PB_ACCEPT (RID_FWK_DIALOG_START+23) +#define DLG_LICENSE (RID_FWK_DIALOG_START+256) +#define ML_LICENSE (RID_FWK_DIALOG_START+11) +#define FT_INFO1 (RID_FWK_DIALOG_START+12) +#define FT_INFO2 (RID_FWK_DIALOG_START+13) +#define FT_INFO3 (RID_FWK_DIALOG_START+14) +#define FT_INFO2_1 (RID_FWK_DIALOG_START+15) +#define FT_INFO3_1 (RID_FWK_DIALOG_START+16) +#define FL_DIVIDE (RID_FWK_DIALOG_START+17) +#define PB_PAGEDOWN (RID_FWK_DIALOG_START+18) +#define IMG_ARROW (RID_FWK_DIALOG_START+19) +#define LICENSE_ACCEPT (RID_FWK_DIALOG_START+20) +#define LICENSE_NOTACCEPT (RID_FWK_DIALOG_START+21) +#define PB_DECLINE (RID_FWK_DIALOG_START+22) +#define PB_ACCEPT (RID_FWK_DIALOG_START+23) #endif diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx index 39b6d14e716f..29c553d2173b 100644 --- a/framework/inc/dispatch/interceptionhelper.hxx +++ b/framework/inc/dispatch/interceptionhelper.hxx @@ -58,9 +58,7 @@ #include <cppuhelper/weak.hxx> #include <cppuhelper/weakref.hxx> -#ifndef __SGI_STL_DEQUE #include <deque> -#endif //_________________________________________________________________________________________________________________ // namespace diff --git a/framework/inc/framework.hrc b/framework/inc/framework.hrc index 1817b60d90e9..05af2f8ce35f 100644 --- a/framework/inc/framework.hrc +++ b/framework/inc/framework.hrc @@ -30,19 +30,19 @@ #include "svl/solar.hrc" -#define RID_FWK_START 260 +#define RID_FWK_START 260 -#define RID_GROUPS_OFFSET 32000 -#define RID_GROUPS_END 32767 +#define RID_GROUPS_OFFSET 32000 +#define RID_GROUPS_END 32767 #define RID_FWK_DIALOG_START_CORRECT (RID_FWK_START + 2048) -#define DLG_FILTER_SELECT (RID_FWK_DIALOG_START_CORRECT + 0) +#define DLG_FILTER_SELECT (RID_FWK_DIALOG_START_CORRECT + 0) -#define STR_FILTER_DOWNLOAD (RID_FWK_START+0) -#define STR_FILTER_CHOOSER (RID_FWK_START+1) -#define STR_FILTER_OTHERS (RID_FWK_START+2) -#define STR_FILTER_ZIPPED (RID_FWK_START+3) +#define STR_FILTER_DOWNLOAD (RID_FWK_START+0) +#define STR_FILTER_CHOOSER (RID_FWK_START+1) +#define STR_FILTER_OTHERS (RID_FWK_START+2) +#define STR_FILTER_ZIPPED (RID_FWK_START+3) // ResIds for BackingWindow #define DLG_BACKING (RID_FWK_DIALOG_START_CORRECT+100) @@ -57,13 +57,7 @@ #define STR_BACKING_TPLREP 9 #define RES_BACKING_IMAGES (DLG_BACKING+1) -#define RES_BACKING_IMAGES_HC (DLG_BACKING+2) -#define BMP_BACKING_BACKGROUND_LEFT 1 -#define BMP_BACKING_BACKGROUND_MIDDLE 2 -#define BMP_BACKING_BACKGROUND_RIGHT 3 -#define BMP_BACKING_BACKGROUND_RTL_LEFT 4 -#define BMP_BACKING_BACKGROUND_RTL_RIGHT 5 #define BMP_BACKING_EXT 6 #define BMP_BACKING_REG 7 #define BMP_BACKING_INFO 8 diff --git a/framework/inc/helper/imageproducer.hxx b/framework/inc/helper/imageproducer.hxx index 36542832bf18..7a488011dedc 100644 --- a/framework/inc/helper/imageproducer.hxx +++ b/framework/inc/helper/imageproducer.hxx @@ -40,14 +40,22 @@ 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 +); 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 +); } -#endif // __FRAMEWORK_HELPER_IMAGEPRODUCER_HXX_ +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/macros/debug/memorymeasure.hxx b/framework/inc/macros/debug/memorymeasure.hxx index b0c441127337..a7bf5c1df258 100644 --- a/framework/inc/macros/debug/memorymeasure.hxx +++ b/framework/inc/macros/debug/memorymeasure.hxx @@ -50,9 +50,7 @@ #include <rtl/strbuf.hxx> #endif - #ifndef __SGI_STL_VECTOR #include <vector> - #endif /*_____________________________________________________________________________________________________________ LOGFILE_MEMORYMEASURE diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx index 8c72a556f4a7..f031a37ff8b4 100644 --- a/framework/inc/macros/xserviceinfo.hxx +++ b/framework/inc/macros/xserviceinfo.hxx @@ -157,7 +157,7 @@ ________________________________________________________________________________ throw( css::uno::Exception ) \ { \ /* retrieve component context from the given service manager */ \ - static const ::rtl::OUString PROP_DEFAULTCONTEXT = ::rtl::OUString::createFromAscii("DefaultContext"); \ + static const ::rtl::OUString PROP_DEFAULTCONTEXT(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")); \ css::uno::Reference< css::beans::XPropertySet > xSMGRProps(xServiceManager, css::uno::UNO_QUERY_THROW); \ css::uno::Reference< css::uno::XComponentContext > xComponentContext; \ xSMGRProps->getPropertyValue( PROP_DEFAULTCONTEXT ) >>= xComponentContext; \ diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx index 8dcc87227780..79e04ca967ac 100644 --- a/framework/inc/services/desktop.hxx +++ b/framework/inc/services/desktop.hxx @@ -429,6 +429,8 @@ class Desktop : // interfaces */ ::sal_Bool impl_closeFrames(::sal_Bool bAllowUI); + sal_Bool impl_terminate(); + //------------------------------------------------------------------------------------------------------------- // debug methods // (should be private everytime!) @@ -507,6 +509,8 @@ class Desktop : // interfaces css::uno::Reference< css::frame::XUntitledNumbers > m_xTitleNumberGenerator; + bool m_bTerminating; // we are in the process of terminating already + }; // class Desktop } // namespace framework diff --git a/framework/inc/services/substitutepathvars.hxx b/framework/inc/services/substitutepathvars.hxx index 63d7523b9e90..e575ff7ee469 100644 --- a/framework/inc/services/substitutepathvars.hxx +++ b/framework/inc/services/substitutepathvars.hxx @@ -192,10 +192,9 @@ enum PreDefVariable PREDEFVAR_PROGURL, PREDEFVAR_USERURL, PREDEFVAR_WORKDIRURL, - // --> PB 2004-10-27 #i32656# - new variable of hierachy service + // New variable of hierachy service (#i32656#) PREDEFVAR_BASEINSTURL, PREDEFVAR_USERDATAURL, - // <-- PREDEFVAR_BRANDBASEURL, PREDEFVAR_COUNT }; diff --git a/framework/inc/uiconfiguration/imagetype.hxx b/framework/inc/uiconfiguration/imagetype.hxx index 9ccf1c8ebb3d..4c2b2b687321 100644 --- a/framework/inc/uiconfiguration/imagetype.hxx +++ b/framework/inc/uiconfiguration/imagetype.hxx @@ -39,8 +39,6 @@ enum ImageType { ImageType_Color = 0, ImageType_Color_Large, - ImageType_HC, - ImageType_HC_Large, ImageType_COUNT }; diff --git a/framework/inc/uielement/controlmenucontroller.hxx b/framework/inc/uielement/controlmenucontroller.hxx index 3bbc0ba9b055..9d307bba4af5 100644 --- a/framework/inc/uielement/controlmenucontroller.hxx +++ b/framework/inc/uielement/controlmenucontroller.hxx @@ -106,8 +106,7 @@ namespace framework void updateImagesPopupMenu( PopupMenu* pPopupMenu ); void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); - sal_Bool m_bWasHiContrast : 1, - m_bShowMenuImages : 1; + sal_Bool m_bShowMenuImages : 1; PopupMenu* m_pResPopupMenu; UrlToDispatchMap m_aURLToDispatchMap; }; diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx index 3555ea9fc7df..bc9c422dd24d 100644 --- a/framework/inc/uielement/menubarmanager.hxx +++ b/framework/inc/uielement/menubarmanager.hxx @@ -248,7 +248,6 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener m_bDeleteChildren : 1, m_bActive : 1, m_bIsBookmarkMenu : 1, - m_bWasHiContrast : 1, m_bShowMenuImages : 1; sal_Bool m_bRetrieveImages : 1, m_bAcceleratorCfg : 1; diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx index 628f360e506d..e89002ff19ae 100644 --- a/framework/inc/uielement/newmenucontroller.hxx +++ b/framework/inc/uielement/newmenucontroller.hxx @@ -113,12 +113,11 @@ namespace framework std::vector< KeyCode >& aMenuShortCuts ); void setAccelerators( PopupMenu* pPopupMenu ); void determineAndSetNewDocAccel( PopupMenu* pPopupMenu, const KeyCode& rKeyCode ); - void setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImages, sal_Bool bHiContrast ); + void setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImages ); private: // members sal_Bool m_bShowImages : 1, - m_bHiContrast : 1, m_bNewMenu : 1, m_bModuleIdentified : 1, m_bAcceleratorCfg : 1; diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index f09ec6b6db75..0fbd7b6d3e6b 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -200,7 +200,7 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener sal_uInt16 ConvertStyleToToolboxItemBits( sal_Int32 nStyle ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetModelFromFrame() const; sal_Bool IsPluginMode() const; - Image QueryAddonsImage( const ::rtl::OUString& aCommandURL, bool bBigImages, bool bHiContrast ); + Image QueryAddonsImage( const ::rtl::OUString& aCommandURL, bool bBigImages ); long HandleClick(void ( SAL_CALL ::com::sun::star::frame::XToolbarController::*_pClick )( )); void setToolBarImage(const Image& _aImage,const CommandToInfoMap::const_iterator& _pIter); void impl_elementChanged(bool _bRemove,const ::com::sun::star::ui::ConfigurationEvent& Event ); @@ -215,7 +215,6 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener typedef ::std::hash_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > > MenuDescriptionMap; sal_Bool m_bDisposed : 1, - m_bIsHiContrast : 1, m_bSmallSymbols : 1, m_bModuleIdentified : 1, m_bAddedToTaskPaneList : 1, diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index d00c2d451566..6577ece9d77f 100644 --- a/framework/source/accelerators/acceleratorconfiguration.cxx +++ b/framework/source/accelerators/acceleratorconfiguration.cxx @@ -189,13 +189,13 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE (aKeyEvent.Modifiers == 0) ) throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("Such key event seams not to be supported by any operating system."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Such key event seams not to be supported by any operating system.")), static_cast< ::cppu::OWeakObject* >(this), 0); if (!sCommand.getLength()) throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")), static_cast< ::cppu::OWeakObject* >(this), 1); @@ -235,7 +235,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati { if (!sCommand.getLength()) throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")), static_cast< ::cppu::OWeakObject* >(this), 1); @@ -272,7 +272,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::g const ::rtl::OUString& rCommand = lCommandList[i]; if (!rCommand.getLength()) throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")), static_cast< ::cppu::OWeakObject* >(this), (sal_Int16)i); @@ -301,7 +301,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co { if (!sCommand.getLength()) throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")), static_cast< ::cppu::OWeakObject* >(this), 0); @@ -311,7 +311,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co AcceleratorCache& rCache = impl_getCFG(sal_True); // TRUE => force getting of a writeable cache! if (!rCache.hasCommand(sCommand)) throw css::container::NoSuchElementException( - ::rtl::OUString::createFromAscii("Command does not exists inside this container."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command does not exists inside this container.")), static_cast< ::cppu::OWeakObject* >(this)); rCache.removeCommand(sCommand); @@ -342,7 +342,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::reload() xIn = xStream->getInputStream(); if (!xIn.is()) throw css::io::IOException( - ::rtl::OUString::createFromAscii("Could not open accelerator configuration for reading."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Could not open accelerator configuration for reading.")), static_cast< ::cppu::OWeakObject* >(this)); // impl_ts_load() does not clear the cache @@ -381,7 +381,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::store() if (!xOut.is()) throw css::io::IOException( - ::rtl::OUString::createFromAscii("Could not open accelerator configuration for saving."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Could not open accelerator configuration for saving.")), static_cast< ::cppu::OWeakObject* >(this)); impl_ts_save(xOut); @@ -408,7 +408,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::R if (!xOut.is()) throw css::io::IOException( - ::rtl::OUString::createFromAscii("Could not open accelerator configuration for saving."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Could not open accelerator configuration for saving.")), static_cast< ::cppu::OWeakObject* >(this)); impl_ts_save(xOut); @@ -635,9 +635,9 @@ AcceleratorCache& XMLBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bWriteA //----------------------------------------------- ::comphelper::Locale XMLBasedAcceleratorConfiguration::impl_ts_getLocale() const { - static ::rtl::OUString LOCALE_PACKAGE = ::rtl::OUString::createFromAscii("/org.openoffice.Setup"); - static ::rtl::OUString LOCALE_PATH = ::rtl::OUString::createFromAscii("L10N" ); - static ::rtl::OUString LOCALE_KEY = ::rtl::OUString::createFromAscii("ooLocale" ); + static ::rtl::OUString LOCALE_PACKAGE(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup")); + static ::rtl::OUString LOCALE_PATH(RTL_CONSTASCII_USTRINGPARAM("L10N")); + static ::rtl::OUString LOCALE_KEY(RTL_CONSTASCII_USTRINGPARAM("ooLocale")); // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); @@ -760,13 +760,13 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE (aKeyEvent.Modifiers == 0) ) throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("Such key event seams not to be supported by any operating system."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Such key event seams not to be supported by any operating system.")), static_cast< ::cppu::OWeakObject* >(this), 0); if (!sCommand.getLength()) throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")), static_cast< ::cppu::OWeakObject* >(this), 1); @@ -883,7 +883,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati { if (!sCommand.getLength()) throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")), static_cast< ::cppu::OWeakObject* >(this), 1); @@ -947,7 +947,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::g const ::rtl::OUString& rCommand = lCommandList[i]; if (!rCommand.getLength()) throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")), static_cast< ::cppu::OWeakObject* >(this), (sal_Int16)i); @@ -980,7 +980,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co { if (!sCommand.getLength()) throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("Empty command strings are not allowed here."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command strings are not allowed here.")), static_cast< ::cppu::OWeakObject* >(this), 0); @@ -992,7 +992,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co if (!rPrimaryCache.hasCommand(sCommand) && !rSecondaryCache.hasCommand(sCommand)) throw css::container::NoSuchElementException( - ::rtl::OUString::createFromAscii("Command does not exists inside this container."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command does not exists inside this container.")), static_cast< ::cppu::OWeakObject* >(this)); if (rPrimaryCache.hasCommand(sCommand)) @@ -1084,17 +1084,17 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::storeToStorage(const css::uno::R return; long nOpenModes = css::embed::ElementModes::READWRITE; - css::uno::Reference< css::embed::XStorage > xAcceleratorTypeStorage = xStorage->openStorageElement(::rtl::OUString::createFromAscii("accelerator"), nOpenModes); + css::uno::Reference< css::embed::XStorage > xAcceleratorTypeStorage = xStorage->openStorageElement(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("accelerator")), nOpenModes); if (!xAcceleratorTypeStorage.is()) return; - css::uno::Reference< css::io::XStream > xStream = xAcceleratorTypeStorage->openStreamElement(::rtl::OUString::createFromAscii("current"), nOpenModes); + css::uno::Reference< css::io::XStream > xStream = xAcceleratorTypeStorage->openStreamElement(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("current")), nOpenModes); css::uno::Reference< css::io::XOutputStream > xOut; if (xStream.is()) xOut = xStream->getOutputStream(); if (!xOut.is()) throw css::io::IOException( - ::rtl::OUString::createFromAscii("Could not open accelerator configuration for saving."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Could not open accelerator configuration for saving.")), static_cast< ::cppu::OWeakObject* >(this)); // the original m_aCache has been split into primay cache and secondary cache... @@ -1293,7 +1293,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const } const ::rtl::OUString sIsoLang = impl_ts_getLocale().toISO(); - const ::rtl::OUString sDefaultLocale = ::rtl::OUString::createFromAscii("en-US"); + const ::rtl::OUString sDefaultLocale(RTL_CONSTASCII_USTRINGPARAM("en-US")); css::uno::Reference< css::container::XNameAccess > xKey; css::uno::Reference< css::container::XNameAccess > xCommand; @@ -1342,7 +1342,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const sal_Int32 nIndex = 0; ::rtl::OUString sKeyCommand = sKey.getToken(0, '_', nIndex); - ::rtl::OUString sPrefix = ::rtl::OUString::createFromAscii("KEY_"); + ::rtl::OUString sPrefix(RTL_CONSTASCII_USTRINGPARAM("KEY_")); aKeyEvent.KeyCode = m_rKeyMapping->mapIdentifierToCode(sPrefix + sKeyCommand); css::uno::Sequence< ::rtl::OUString > sToken(4); @@ -1577,7 +1577,7 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPr sal_Int32 nIndex = 0; sKeyIdentifier = sKey.getToken(0, '_', nIndex); - aKeyEvent.KeyCode = m_rKeyMapping->mapIdentifierToCode(::rtl::OUString::createFromAscii("KEY_")+sKeyIdentifier); + aKeyEvent.KeyCode = m_rKeyMapping->mapIdentifierToCode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KEY_"))+sKeyIdentifier); css::uno::Sequence< ::rtl::OUString > sToken(3); const sal_Int32 nToken = 3; @@ -1677,9 +1677,9 @@ AcceleratorCache& XCUBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bPrefer //----------------------------------------------- ::comphelper::Locale XCUBasedAcceleratorConfiguration::impl_ts_getLocale() const { - static ::rtl::OUString LOCALE_PACKAGE = ::rtl::OUString::createFromAscii("/org.openoffice.Setup"); - static ::rtl::OUString LOCALE_PATH = ::rtl::OUString::createFromAscii("L10N" ); - static ::rtl::OUString LOCALE_KEY = ::rtl::OUString::createFromAscii("ooLocale" ); + static ::rtl::OUString LOCALE_PACKAGE(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup")); + static ::rtl::OUString LOCALE_PATH(RTL_CONSTASCII_USTRINGPARAM("L10N")); + static ::rtl::OUString LOCALE_KEY(RTL_CONSTASCII_USTRINGPARAM("ooLocale")); // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); diff --git a/framework/source/accelerators/acceleratorexecute.cxx b/framework/source/accelerators/acceleratorexecute.cxx index 185cb3fbfb49..298c02b27f10 100644 --- a/framework/source/accelerators/acceleratorexecute.cxx +++ b/framework/source/accelerators/acceleratorexecute.cxx @@ -358,7 +358,7 @@ IMPL_LINK(AcceleratorExecute, impl_ts_asyncCallback, void*, pVoid) if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# { Sequence<css::beans::PropertyValue> source; - ::comphelper::UiEventsLogger::appendDispatchOrigin(OUString::createFromAscii("AcceleratorExecute")); + ::comphelper::UiEventsLogger::appendDispatchOrigin(OUString(RTL_CONSTASCII_USTRINGPARAM("AcceleratorExecute"))); ::comphelper::UiEventsLogger::logDispatch(aURL, source); } xDispatch->dispatch(aURL, css::uno::Sequence< css::beans::PropertyValue >()); diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx index bd8a34b1f565..36999f0a64e0 100644 --- a/framework/source/accelerators/documentacceleratorconfiguration.cxx +++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx @@ -121,7 +121,7 @@ void SAL_CALL DocumentAcceleratorConfiguration::initialize(const css::uno::Seque ::comphelper::SequenceAsHashMap lArgs(lArguments); m_xDocumentRoot = lArgs.getUnpackedValueOrDefault( - ::rtl::OUString::createFromAscii("DocumentRoot"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentRoot")), css::uno::Reference< css::embed::XStorage >()); aWriteLock.unlock(); diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx index 07e98c8c6e76..42f2bba1d283 100644 --- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx +++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx @@ -114,12 +114,12 @@ void SAL_CALL ModuleAcceleratorConfiguration::initialize(const css::uno::Sequenc WriteGuard aWriteLock(m_aLock); ::comphelper::SequenceAsHashMap lArgs(lArguments); - m_sModule = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("ModuleIdentifier"), ::rtl::OUString()); - m_sLocale = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("Locale") , ::rtl::OUString::createFromAscii("x-default")); + m_sModule = lArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleIdentifier")), ::rtl::OUString()); + m_sLocale = lArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Locale")) , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("x-default"))); if (!m_sModule.getLength()) throw css::uno::RuntimeException( - ::rtl::OUString::createFromAscii("The module dependend accelerator configuration service was initialized with an empty module identifier!"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("The module dependend accelerator configuration service was initialized with an empty module identifier!")), static_cast< ::cppu::OWeakObject* >(this)); aWriteLock.unlock(); diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index 6287a796c966..bcd4788790d0 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -212,7 +212,7 @@ void PresetHandler::forgetCachedStorages() //----------------------------------------------- ::rtl::OUString lcl_getLocalizedMessage(::sal_Int32 nID) { - ::rtl::OUString sMessage = ::rtl::OUString::createFromAscii("Unknown error."); + ::rtl::OUString sMessage(RTL_CONSTASCII_USTRINGPARAM("Unknown error.")); switch(nID) { @@ -260,7 +260,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag // Note: May be an user uses URLs without a final slash! Check it ... nPos = sShareLayer.lastIndexOf('/'); if (nPos != sShareLayer.getLength()-1) - sShareLayer += ::rtl::OUString::createFromAscii("/"); + sShareLayer += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); sShareLayer += RELPATH_SHARE_LAYER; // folder /* @@ -316,7 +316,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag // Note: May be an user uses URLs without a final slash! Check it ... sal_Int32 nPos = sUserLayer.lastIndexOf('/'); if (nPos != sUserLayer.getLength()-1) - sUserLayer += ::rtl::OUString::createFromAscii("/"); + sUserLayer += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); sUserLayer += RELPATH_USER_LAYER; // storage file @@ -416,7 +416,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType { if (!xDocumentRoot.is()) throw css::uno::RuntimeException( - ::rtl::OUString::createFromAscii("There is valid root storage, where the UI configuration can work on."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("There is valid root storage, where the UI configuration can work on.")), css::uno::Reference< css::uno::XInterface >()); m_lDocumentStorages.setRootStorage(xDocumentRoot); xShare = xDocumentRoot; diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx index 6537f934d680..88d3fe1977c6 100644 --- a/framework/source/accelerators/storageholder.cxx +++ b/framework/source/accelerators/storageholder.cxx @@ -64,7 +64,7 @@ #define PATH_SEPERATOR_ASCII "/" #define PATH_SEPERATOR_UNICODE ((sal_Unicode)'/') -#define PATH_SEPERATOR ::rtl::OUString::createFromAscii(PATH_SEPERATOR_ASCII) +#define PATH_SEPERATOR ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PATH_SEPERATOR_ASCII)) //=============================================== // namespace diff --git a/framework/source/classes/addonsoptions.cxx b/framework/source/classes/addonsoptions.cxx index ccfbbfbffca1..ae1a7553f28a 100644 --- a/framework/source/classes/addonsoptions.cxx +++ b/framework/source/classes/addonsoptions.cxx @@ -269,7 +269,7 @@ class AddonsOptions_Impl : public ConfigItem const Sequence< Sequence< PropertyValue > >& GetAddonsToolBarPart ( sal_uInt32 nIndex ) const ; const ::rtl::OUString GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const; const Sequence< Sequence< PropertyValue > >& GetAddonsHelpMenu () const ; - Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast, sal_Bool bNoScale ) const; + Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const; const MergeMenuInstructionContainer& GetMergeMenuInstructions() const; bool GetMergeToolbarInstructions( const ::rtl::OUString& rToolbarName, MergeToolbarInstructionContainer& rToolbarInstructions ) const; @@ -292,13 +292,9 @@ class AddonsOptions_Impl : public ConfigItem { Image aImageSmall; Image aImageBig; - Image aImageSmallHC; - Image aImageBigHC; Image aImageSmallNoScale; Image aImageBigNoScale; - Image aImageSmallHCNoScale; - Image aImageBigHCNoScale; }; typedef std::hash_map< ::rtl::OUString, ImageEntry, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ImageManager; @@ -366,15 +362,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; @@ -607,27 +603,17 @@ bool AddonsOptions_Impl::GetMergeToolbarInstructions( //***************************************************************************************************************** // public method //***************************************************************************************************************** -Image AddonsOptions_Impl::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast, sal_Bool bNoScale ) const +Image AddonsOptions_Impl::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const { Image aImage; ImageManager::const_iterator pIter = m_aImageManager.find( aURL ); if ( pIter != m_aImageManager.end() ) { - if ( !bHiContrast ) - { - if ( bNoScale ) - aImage = ( bBig ? pIter->second.aImageBigNoScale : pIter->second.aImageSmallNoScale ); - if ( !aImage ) - aImage = ( bBig ? pIter->second.aImageBig : pIter->second.aImageSmall ); - } - else - { - if ( bNoScale ) - aImage = ( bBig ? pIter->second.aImageBigHCNoScale : pIter->second.aImageSmallHCNoScale ); - if ( !aImage ) - aImage = ( bBig ? pIter->second.aImageBigHC : pIter->second.aImageSmallHC ); - } + if ( bNoScale ) + aImage = ( bBig ? pIter->second.aImageBigNoScale : pIter->second.aImageSmallNoScale ); + if ( !aImage ) + aImage = ( bBig ? pIter->second.aImageBig : pIter->second.aImageSmall ); } return aImage; @@ -1406,8 +1392,8 @@ void AddonsOptions_Impl::ReadImageFromURL( ImageSize nImageSize, const ::rtl::OU //***************************************************************************************************************** void AddonsOptions_Impl::ReadAndAssociateImages( const ::rtl::OUString& aURL, const ::rtl::OUString& aImageId ) { - const int MAX_NUM_IMAGES = 4; - const char* aExtArray[MAX_NUM_IMAGES] = { "_16", "_26", "_16h", "_26h" }; + const int MAX_NUM_IMAGES = 2; + const char* aExtArray[MAX_NUM_IMAGES] = { "_16", "_26" }; const char* pBmpExt = ".bmp"; if ( aImageId.getLength() == 0 ) @@ -1442,14 +1428,6 @@ void AddonsOptions_Impl::ReadAndAssociateImages( const ::rtl::OUString& aURL, co aImageEntry.aImageBig = aImage; aImageEntry.aImageBigNoScale = aImageNoScale; break; - case 2: - aImageEntry.aImageSmallHC = aImage; - aImageEntry.aImageSmallHCNoScale = aImageNoScale; - break; - case 3: - aImageEntry.aImageBigHC = aImage; - aImageEntry.aImageBigHCNoScale = aImageNoScale; - break; } } } @@ -1482,8 +1460,7 @@ AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const ::rtl:: if (( aPropertyData[i] >>= aImageDataSeq ) && aImageDataSeq.getLength() > 0 && ( CreateImageFromSequence( aImage, - (( i == OFFSET_IMAGES_BIG ) || - ( i == OFFSET_IMAGES_BIGHC )), + ( i == OFFSET_IMAGES_BIG ), aImageDataSeq )) ) { if ( !pEntry ) @@ -1493,10 +1470,6 @@ AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const ::rtl:: pEntry->aImageSmall = aImage; else if ( i == OFFSET_IMAGES_BIG ) pEntry->aImageBig = aImage; - else if ( i == OFFSET_IMAGES_SMALLHC ) - pEntry->aImageSmallHC = aImage; - else - pEntry->aImageBigHC = aImage; } } else @@ -1523,21 +1496,11 @@ AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const ::rtl:: pEntry->aImageSmall = aImage; pEntry->aImageSmallNoScale = aImageNoScale; } - else if ( i == OFFSET_IMAGES_BIG_URL && !pEntry->aImageBig ) + else if ( !pEntry->aImageBig ) { pEntry->aImageBig = aImage; pEntry->aImageBigNoScale = aImageNoScale; } - else if ( i == OFFSET_IMAGES_SMALLHC_URL && !pEntry->aImageSmallHC ) - { - pEntry->aImageSmallHC = aImage; - pEntry->aImageSmallHCNoScale = aImageNoScale; - } - else if ( !pEntry->aImageBigHC ) - { - pEntry->aImageBigHC = aImage; - pEntry->aImageBigHCNoScale = aImageNoScale; - } } } } @@ -1806,18 +1769,18 @@ bool AddonsOptions::GetMergeToolbarInstructions( //***************************************************************************************************************** // public method //***************************************************************************************************************** -Image AddonsOptions::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast, sal_Bool bNoScale ) const +Image AddonsOptions::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const { MutexGuard aGuard( GetOwnStaticMutex() ); - return m_pDataContainer->GetImageFromURL( aURL, bBig, bHiContrast, bNoScale ); + return m_pDataContainer->GetImageFromURL( aURL, bBig, bNoScale ); } //***************************************************************************************************************** // public method //***************************************************************************************************************** -Image AddonsOptions::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast ) const +Image AddonsOptions::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig ) const { - return GetImageFromURL( aURL, bBig, bHiContrast, sal_False ); + return GetImageFromURL( aURL, bBig, sal_False ); } //***************************************************************************************************************** diff --git a/framework/source/classes/bmkmenu.cxx b/framework/source/classes/bmkmenu.cxx index 2910cd65bd07..32da85841494 100644 --- a/framework/source/classes/bmkmenu.cxx +++ b/framework/source/classes/bmkmenu.cxx @@ -171,8 +171,6 @@ void BmkMenu::Initialize() ::rtl::OUString aTargetFrame; ::rtl::OUString aImageId; - BOOL bIsHiContrastMode = rSettings.GetHighContrastMode(); - UINT32 i, nCount = aDynamicMenuEntries.getLength(); for ( i = 0; i < nCount; ++i ) { @@ -192,7 +190,7 @@ void BmkMenu::Initialize() { if ( aImageId.getLength() > 0 ) { - Image aImage = GetImageFromURL( m_xFrame, aImageId, FALSE, bIsHiContrastMode ); + Image aImage = GetImageFromURL( m_xFrame, aImageId, FALSE ); if ( !!aImage ) { bImageSet = sal_True; @@ -202,7 +200,7 @@ void BmkMenu::Initialize() if ( !bImageSet ) { - Image aImage = GetImageFromURL( m_xFrame, aURL, FALSE, bIsHiContrastMode ); + Image aImage = GetImageFromURL( m_xFrame, aURL, FALSE ); if ( !aImage ) InsertItem( nId, aTitle ); else @@ -212,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/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx index 1a68e18cb8bb..d5e2e602b445 100644 --- a/framework/source/classes/fwktabwindow.cxx +++ b/framework/source/classes/fwktabwindow.cxx @@ -50,12 +50,11 @@ #include <vcl/image.hxx> #include <vcl/msgbox.hxx> -const ::rtl::OUString SERVICENAME_WINPROVIDER - = ::rtl::OUString::createFromAscii("com.sun.star.awt.ContainerWindowProvider"); -const ::rtl::OUString EXTERNAL_EVENT = ::rtl::OUString::createFromAscii("external_event"); -const ::rtl::OUString BACK_METHOD = ::rtl::OUString::createFromAscii("back"); -const ::rtl::OUString INITIALIZE_METHOD = ::rtl::OUString::createFromAscii("initialize"); -const ::rtl::OUString OK_METHOD = ::rtl::OUString::createFromAscii("ok"); +const ::rtl::OUString SERVICENAME_WINPROVIDER(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.ContainerWindowProvider")); +const ::rtl::OUString EXTERNAL_EVENT(RTL_CONSTASCII_USTRINGPARAM("external_event")); +const ::rtl::OUString BACK_METHOD(RTL_CONSTASCII_USTRINGPARAM("back")); +const ::rtl::OUString INITIALIZE_METHOD(RTL_CONSTASCII_USTRINGPARAM("initialize")); +const ::rtl::OUString OK_METHOD(RTL_CONSTASCII_USTRINGPARAM("ok")); using namespace ::com::sun::star; diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index 2275a1d7eb82..15e6a815b787 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -152,7 +152,6 @@ MenuManager::MenuManager( SAL_STATIC_CAST( ::com::sun::star::uno::XInterface*, (OWeakObject*)this )->acquire(); const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - m_bWasHiContrast = rSettings.GetHighContrastMode(); m_bShowMenuImages = rSettings.GetUseImagesInMenus(); sal_Int32 nAddonsURLPrefixLength = ADDONSPOPUPMENU_URL_PREFIX.getLength(); @@ -212,7 +211,7 @@ MenuManager::MenuManager( // Set image for the addon popup menu item if ( bShowMenuImages && !pPopupMenu->GetItemImage( ITEMID_ADDONLIST )) { - Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast ); + Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE ); if ( !!aImage ) pPopupMenu->SetItemImage( ITEMID_ADDONLIST, aImage ); } @@ -239,7 +238,7 @@ MenuManager::MenuManager( AddMenu(pSubMenu,::rtl::OUString(),nItemId,sal_True,sal_False); if ( bShowMenuImages && !pMenu->GetItemImage( nItemId )) { - Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast ); + Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE ); if ( !!aImage ) pMenu->SetItemImage( nItemId, aImage ); } @@ -261,7 +260,7 @@ MenuManager::MenuManager( if ( bShowMenuImages && !pMenu->GetItemImage( nItemId )) { - Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast ); + Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE ); if ( !!aImage ) pMenu->SetItemImage( nItemId, aImage ); } @@ -282,14 +281,14 @@ MenuManager::MenuManager( if ( pMenuAttributes && pMenuAttributes->aImageId.getLength() > 0 ) { // Retrieve image id from menu attributes - aImage = GetImageFromURL( rFrame, aImageId, FALSE, m_bWasHiContrast ); + aImage = GetImageFromURL( rFrame, aImageId, FALSE ); } if ( !aImage ) { - aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast ); + aImage = GetImageFromURL( rFrame, aItemCommand, FALSE ); if ( !aImage ) - aImage = AddonsOptions().GetImageFromURL( aItemCommand, FALSE, m_bWasHiContrast ); + aImage = AddonsOptions().GetImageFromURL( aItemCommand, FALSE ); } if ( !!aImage ) @@ -297,7 +296,7 @@ MenuManager::MenuManager( } else if ( !pMenu->GetItemImage( nItemId )) { - Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast ); + Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE ); if ( !!aImage ) pMenu->SetItemImage( nItemId, aImage ); } @@ -310,7 +309,6 @@ MenuManager::MenuManager( } } - // retrieve label information for all menu items without item text SetHdl(); @@ -825,14 +823,11 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu ) UpdateSpecialWindowMenu( pMenu,getServiceFactory(),m_aLock ); // Check if some modes have changed so we have to update our menu images - sal_Bool bIsHiContrast = rSettings.GetHighContrastMode(); - - if ( m_bWasHiContrast != bIsHiContrast || bShowMenuImages != m_bShowMenuImages ) + if ( bShowMenuImages != m_bShowMenuImages ) { // The mode changed so we have to replace all images - m_bWasHiContrast = bIsHiContrast; m_bShowMenuImages = bShowMenuImages; - FillMenuImages(m_xFrame,pMenu,bIsHiContrast,bShowMenuImages); + FillMenuImages( m_xFrame, pMenu, bShowMenuImages ); } if ( m_bInitialized ) @@ -1028,7 +1023,7 @@ USHORT MenuManager::FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pMenu, } return nItemId; } -void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_Bool bIsHiContrast,sal_Bool bShowMenuImages) +void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_Bool bShowMenuImages) { AddonsOptions aAddonOptions; @@ -1058,7 +1053,7 @@ void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_B if ( aImageId.getLength() > 0 ) { - Image aImage = GetImageFromURL( _xFrame, aImageId, FALSE, bIsHiContrast ); + Image aImage = GetImageFromURL( _xFrame, aImageId, FALSE ); if ( !!aImage ) { bImageSet = sal_True; @@ -1069,9 +1064,9 @@ void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_B if ( !bImageSet ) { rtl::OUString aMenuItemCommand = _pMenu->GetItemCommand( nId ); - Image aImage = GetImageFromURL( _xFrame, aMenuItemCommand, FALSE, bIsHiContrast ); + Image aImage = GetImageFromURL( _xFrame, aMenuItemCommand, FALSE ); if ( !aImage ) - aImage = aAddonOptions.GetImageFromURL( aMenuItemCommand, FALSE, bIsHiContrast ); + aImage = aAddonOptions.GetImageFromURL( aMenuItemCommand, FALSE ); _pMenu->SetItemImage( nId, aImage ); } diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src index 1cd9ecc6dd30..3f354d438879 100644 --- a/framework/source/classes/resource.src +++ b/framework/source/classes/resource.src @@ -131,8 +131,6 @@ String STR_STATUSBAR_LOGOTEXT // License Dialog // *********************************************************************** #define LICENSE_DIALOG_WIDTH 260 -//#define LICENSE_DIALOG_HEIGTH 185 -//#define LICENSE_DIALOG_HEIGTH 190 #define LICENSE_RIGHT_BORDER 7 #define LICENSE_BOTTOM_BORDER 0 #define LICENSE_ROW_1 (7) @@ -322,31 +320,37 @@ String STR_LANGSTATUS_MULTIPLE_LANGUAGES Text [ en-US ] = "Multiple Languages" ; Text [ x-comment ] = " "; }; + String STR_LANGSTATUS_NONE { Text [ en-US ] = "None (Do not check spelling)" ; Text [ x-comment ] = " "; }; + String STR_RESET_TO_DEFAULT_LANGUAGE { Text [ en-US ] = "Reset to Default Language" ; Text [ x-comment ] = " "; }; + String STR_LANGSTATUS_MORE { Text [ en-US ] = "More..." ; Text [ x-comment ] = " "; }; + String STR_SET_LANGUAGE_FOR_SELECTION { Text [ en-US ] = "Set Language for Selection" ; Text [ x-comment ] = " "; }; + String STR_SET_LANGUAGE_FOR_PARAGRAPH { Text [ en-US ] = "Set Language for Paragraph" ; Text [ x-comment ] = " "; }; + String STR_SET_LANGUAGE_FOR_ALL_TEXT { Text [ en-US ] = "Set Language for all Text" ; diff --git a/framework/source/classes/taskcreator.cxx b/framework/source/classes/taskcreator.cxx index 7eb96c9f7ef3..6edfc8d192ac 100644 --- a/framework/source/classes/taskcreator.cxx +++ b/framework/source/classes/taskcreator.cxx @@ -105,9 +105,9 @@ TaskCreator::~TaskCreator() css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const ::rtl::OUString& sName , sal_Bool bVisible ) { - static ::rtl::OUString PACKAGE = ::rtl::OUString::createFromAscii("org.openoffice.Office.TabBrowse"); - static ::rtl::OUString RELPATH = ::rtl::OUString::createFromAscii("TaskCreatorService" ); - static ::rtl::OUString KEY = ::rtl::OUString::createFromAscii("ImplementationName" ); + static ::rtl::OUString PACKAGE(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.TabBrowse")); + static ::rtl::OUString RELPATH(RTL_CONSTASCII_USTRINGPARAM("TaskCreatorService")); + static ::rtl::OUString KEY(RTL_CONSTASCII_USTRINGPARAM("ImplementationName")); /* SAFE { */ ReadGuard aReadLock( m_aLock ); diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx index c5ef58be88ca..bef585ed6ab5 100644 --- a/framework/source/dispatch/dispatchinformationprovider.cxx +++ b/framework/source/dispatch/dispatchinformationprovider.cxx @@ -173,7 +173,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvide if (!xFrame.is()) return css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvider > >(); - CloseDispatcher* pCloser = new CloseDispatcher(xSMGR, xFrame, ::rtl::OUString::createFromAscii("_self")); // explicit "_self" ... not "" ... see implementation of close dispatcher itself! + CloseDispatcher* pCloser = new CloseDispatcher(xSMGR, xFrame, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self"))); // explicit "_self" ... not "" ... see implementation of close dispatcher itself! css::uno::Reference< css::uno::XInterface > xCloser(static_cast< css::frame::XDispatch* >(pCloser), css::uno::UNO_QUERY); css::uno::Reference< css::frame::XDispatchInformationProvider > xCloseDispatch(xCloser , css::uno::UNO_QUERY); diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx index f892495e8c79..8dc54239ad0e 100644 --- a/framework/source/dispatch/interceptionhelper.cxx +++ b/framework/source/dispatch/interceptionhelper.cxx @@ -172,7 +172,7 @@ void SAL_CALL InterceptionHelper::registerDispatchProviderInterceptor(const css: else { aInfo.lURLPattern.realloc(1); - aInfo.lURLPattern[0] = ::rtl::OUString::createFromAscii("*"); + aInfo.lURLPattern[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")); } // SAFE { diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx index e76c11ecf8da..248df065e38d 100644 --- a/framework/source/dispatch/menudispatcher.cxx +++ b/framework/source/dispatch/menudispatcher.cxx @@ -383,7 +383,7 @@ IMPL_LINK( MenuDispatcher, Close_Impl, void*, EMPTYARG ) return 0; css::util::URL aURL; - aURL.Complete = ::rtl::OUString::createFromAscii(".uno:CloseWin"); + aURL.Complete = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseWin")); css::uno::Reference< css::util::XURLTransformer > xTrans ( m_xFactory->createInstance( SERVICENAME_URLTRANSFORMER ), css::uno::UNO_QUERY ); if( xTrans.is() ) diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx index e869b613bd81..695fea4b3d81 100644 --- a/framework/source/dispatch/oxt_handler.cxx +++ b/framework/source/dispatch/oxt_handler.cxx @@ -269,7 +269,7 @@ void SAL_CALL Oxt_Handler::dispatch( const css::util::URL& // I think we can the following ones: // a) look for given extension of url to map our type decision HARD CODED!!! // b) return preferred type every time... it's easy :-) - sTypeName = ::rtl::OUString::createFromAscii("oxt_OpenOffice_Extension"); + sTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("oxt_OpenOffice_Extension")); aDescriptor[::comphelper::MediaDescriptor::PROP_TYPENAME()] <<= sTypeName; aDescriptor >> lDescriptor; } diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx index 1df848ad358f..09efdb3e8ae6 100644 --- a/framework/source/dispatch/windowcommanddispatch.cxx +++ b/framework/source/dispatch/windowcommanddispatch.cxx @@ -65,8 +65,8 @@ namespace css = ::com::sun::star; //_______________________________________________ // declarations -const ::rtl::OUString WindowCommandDispatch::COMMAND_PREFERENCES = ::rtl::OUString::createFromAscii(".uno:OptionsTreeDialog"); -const ::rtl::OUString WindowCommandDispatch::COMMAND_ABOUTBOX = ::rtl::OUString::createFromAscii(".uno:About"); +const ::rtl::OUString WindowCommandDispatch::COMMAND_PREFERENCES(RTL_CONSTASCII_USTRINGPARAM(".uno:OptionsTreeDialog")); +const ::rtl::OUString WindowCommandDispatch::COMMAND_ABOUTBOX(RTL_CONSTASCII_USTRINGPARAM(".uno:About")); //----------------------------------------------- WindowCommandDispatch::WindowCommandDispatch(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , diff --git a/framework/source/helper/actiontriggerhelper.cxx b/framework/source/helper/actiontriggerhelper.cxx index 3506e0590af9..a5e0a1438a1e 100644 --- a/framework/source/helper/actiontriggerhelper.cxx +++ b/framework/source/helper/actiontriggerhelper.cxx @@ -115,9 +115,6 @@ void InsertSubMenuItems( Menu* pSubMenu, USHORT& nItemId, Reference< XIndexConta if ( xIndexAccess.is() ) { AddonsOptions aAddonOptions; - const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - sal_Bool bHiContrast = rSettings.GetHighContrastMode(); - OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); for ( sal_Int32 i = 0; i < xIndexAccess->getCount(); i++ ) @@ -221,7 +218,7 @@ void InsertSubMenuItems( Menu* pSubMenu, USHORT& nItemId, Reference< XIndexConta else { // Support add-on images for context menu interceptors - Image aImage = aAddonOptions.GetImageFromURL( aCommandURL, sal_False, bHiContrast, sal_True ); + Image aImage = aAddonOptions.GetImageFromURL( aCommandURL, sal_False, sal_True ); if ( !!aImage ) pSubMenu->SetItemImage( nNewItemId, aImage ); } diff --git a/framework/source/helper/imageproducer.cxx b/framework/source/helper/imageproducer.cxx index 2630fab87373..e6435d822e06 100644 --- a/framework/source/helper/imageproducer.cxx +++ b/framework/source/helper/imageproducer.cxx @@ -45,10 +45,14 @@ 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 +) { if ( _pGetImageFunc ) - return _pGetImageFunc( rFrame, aURL, bBig, bHiContrast ); + return _pGetImageFunc( rFrame, aURL, bBig ); else return Image(); } diff --git a/framework/source/helper/mischelper.cxx b/framework/source/helper/mischelper.cxx index 19f8b8ee272c..0f021a453cbb 100644 --- a/framework/source/helper/mischelper.cxx +++ b/framework/source/helper/mischelper.cxx @@ -65,7 +65,7 @@ uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGues { m_xLanguageGuesser = uno::Reference< linguistic2::XLanguageGuessing >( m_xServiceManager->createInstance( - rtl::OUString::createFromAscii( "com.sun.star.linguistic2.LanguageGuessing" ) ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.linguistic2.LanguageGuessing")) ), uno::UNO_QUERY ); } catch (uno::Exception &r) diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx index bd854e6397ce..bcd61affb6ea 100644 --- a/framework/source/helper/oframes.cxx +++ b/framework/source/helper/oframes.cxx @@ -302,7 +302,7 @@ Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsExce sal_uInt32 nCount = m_pFrameContainer->getCount(); if ( nIndex < 0 || ( sal::static_int_cast< sal_uInt32 >( nIndex ) >= nCount )) - throw IndexOutOfBoundsException( OUString::createFromAscii( "OFrames::getByIndex - Index out of bounds" ), + throw IndexOutOfBoundsException( OUString(RTL_CONSTASCII_USTRINGPARAM("OFrames::getByIndex - Index out of bounds")), (OWeakObject *)this ); // Set default return value. diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx index de582de5a145..e285a8510a6d 100644 --- a/framework/source/helper/persistentwindowstate.cxx +++ b/framework/source/helper/persistentwindowstate.cxx @@ -228,9 +228,9 @@ void SAL_CALL PersistentWindowState::disposing(const css::lang::EventObject&) sRelPathBuf.append (sModuleName ); sRelPathBuf.appendAscii("\"]" ); - ::rtl::OUString sPackage = ::rtl::OUString::createFromAscii("org.openoffice.Setup/"); + ::rtl::OUString sPackage(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/")); ::rtl::OUString sRelPath = sRelPathBuf.makeStringAndClear(); - ::rtl::OUString sKey = ::rtl::OUString::createFromAscii("ooSetupFactoryWindowAttributes"); + ::rtl::OUString sKey(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryWindowAttributes")); try { @@ -258,9 +258,9 @@ void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Refere sRelPathBuf.append (sModuleName ); sRelPathBuf.appendAscii("\"]" ); - ::rtl::OUString sPackage = ::rtl::OUString::createFromAscii("org.openoffice.Setup/"); + ::rtl::OUString sPackage(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/")); ::rtl::OUString sRelPath = sRelPathBuf.makeStringAndClear(); - ::rtl::OUString sKey = ::rtl::OUString::createFromAscii("ooSetupFactoryWindowAttributes"); + ::rtl::OUString sKey(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryWindowAttributes")); try { diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx index 2e595386f8a3..0180d9cee95a 100644 --- a/framework/source/helper/statusindicatorfactory.cxx +++ b/framework/source/helper/statusindicatorfactory.cxx @@ -74,7 +74,7 @@ namespace framework{ // definitions sal_Int32 StatusIndicatorFactory::m_nInReschedule = 0; /// static counter for rescheduling -static ::rtl::OUString PROGRESS_RESOURCE = ::rtl::OUString::createFromAscii("private:resource/progressbar/progressbar"); +static ::rtl::OUString PROGRESS_RESOURCE(RTL_CONSTASCII_USTRINGPARAM("private:resource/progressbar/progressbar")); //----------------------------------------------- DEFINE_XINTERFACE_5(StatusIndicatorFactory , @@ -435,9 +435,9 @@ void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed() bool bForceFrontAndFocus(false); ::comphelper::ConfigurationHelper::readDirectKey( xSMGR, - ::rtl::OUString::createFromAscii("org.openoffice.Office.Common/View"), - ::rtl::OUString::createFromAscii("NewDocumentHandling"), - ::rtl::OUString::createFromAscii("ForceFocusAndToFront"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/View")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NewDocumentHandling")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ForceFocusAndToFront")), ::comphelper::ConfigurationHelper::E_READONLY) >>= bForceFrontAndFocus; pWindow->Show(sal_True, bForceFrontAndFocus ? SHOW_FOREGROUNDTASK : 0 ); diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx index d3b9d7fea9d5..6cb4ed5adcc2 100644 --- a/framework/source/helper/titlebarupdate.cxx +++ b/framework/source/helper/titlebarupdate.cxx @@ -235,26 +235,26 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr aModuleId.equalsAscii( "com.sun.star.text.GlobalDocument" ) || aModuleId.equalsAscii( "com.sun.star.text.WebDocument" ) || aModuleId.equalsAscii( "com.sun.star.xforms.XMLFormDocument" ) ) - sDesktopName = ::rtl::OUString::createFromAscii("writer"); + sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("writer")); else if ( aModuleId.equalsAscii( "com.sun.star.sheet.SpreadsheetDocument" ) ) - sDesktopName = ::rtl::OUString::createFromAscii("calc"); + sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("calc")); else if ( aModuleId.equalsAscii( "com.sun.star.presentation.PresentationDocument" ) ) - sDesktopName = ::rtl::OUString::createFromAscii("impress"); + sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("impress")); else if ( aModuleId.equalsAscii( "com.sun.star.drawing.DrawingDocument" ) ) - sDesktopName = ::rtl::OUString::createFromAscii("draw"); + sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("draw")); else if ( aModuleId.equalsAscii( "com.sun.star.formula.FormulaProperties" ) ) - sDesktopName = ::rtl::OUString::createFromAscii("math"); + sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("math")); else if ( aModuleId.equalsAscii( "com.sun.star.sdb.DatabaseDocument" ) || aModuleId.equalsAscii( "com.sun.star.sdb.OfficeDatabaseDocument" ) || aModuleId.equalsAscii( "com.sun.star.sdb.RelationDesign" ) || aModuleId.equalsAscii( "com.sun.star.sdb.QueryDesign" ) || aModuleId.equalsAscii( "com.sun.star.sdb.TableDesign" ) || aModuleId.equalsAscii( "com.sun.star.sdb.DataSourceBrowser" ) ) - sDesktopName = ::rtl::OUString::createFromAscii("base"); + sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("base")); else if ( aModuleId.equalsAscii( "com.sun.star.frame.StartModule" ) ) - sDesktopName = ::rtl::OUString::createFromAscii("startcenter"); + sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("startcenter")); else - sDesktopName = ::rtl::OUString::createFromAscii("startcenter"); + sDesktopName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("startcenter")); sApplicationID = aProductName.toAsciiLowerCase(); sApplicationID += ::rtl::OUString(sal_Unicode('-')); sApplicationID += sDesktopName; diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx index 1578b3d45454..26baf432f2fe 100644 --- a/framework/source/helper/vclstatusindicator.cxx +++ b/framework/source/helper/vclstatusindicator.cxx @@ -70,7 +70,7 @@ VCLStatusIndicator::VCLStatusIndicator(const css::uno::Reference< css::lang::XMu { if (!m_xParentWindow.is()) throw css::uno::RuntimeException( - ::rtl::OUString::createFromAscii("Cant work without a parent window!"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cant work without a parent window!")), static_cast< css::task::XStatusIndicator* >(this)); } diff --git a/framework/source/inc/pattern/configuration.hxx b/framework/source/inc/pattern/configuration.hxx index 580c20195cd1..f5c6a296863b 100644 --- a/framework/source/inc/pattern/configuration.hxx +++ b/framework/source/inc/pattern/configuration.hxx @@ -119,7 +119,7 @@ class ConfigurationHelper const ::rtl::OUString& sRelPath , sal_Int32 nOpenFlags) { - static ::rtl::OUString PATH_SEPERATOR = ::rtl::OUString::createFromAscii("/"); + static ::rtl::OUString PATH_SEPERATOR(RTL_CONSTASCII_USTRINGPARAM("/")); css::uno::Reference< css::uno::XInterface > xCFG; @@ -143,13 +143,13 @@ class ConfigurationHelper css::uno::Sequence< css::uno::Any > lParams(c); css::beans::PropertyValue aParam; - aParam.Name = ::rtl::OUString::createFromAscii("nodepath"); + aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")); aParam.Value <<= sPath.makeStringAndClear(); lParams[0] <<= aParam; if (bAllLocales) { - aParam.Name = ::rtl::OUString::createFromAscii("*"); + aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")); aParam.Value <<= sal_True; lParams[1] <<= aParam; } diff --git a/framework/source/interaction/preventduplicateinteraction.cxx b/framework/source/interaction/preventduplicateinteraction.cxx index ba3169875a3c..635e6449e310 100644 --- a/framework/source/interaction/preventduplicateinteraction.cxx +++ b/framework/source/interaction/preventduplicateinteraction.cxx @@ -57,7 +57,7 @@ namespace css = ::com::sun::star; // exported const //_________________________________________________________________________________________________________________ -#define IMPLEMENTATIONNAME_UIINTERACTIONHANDLER ::rtl::OUString::createFromAscii("com.sun.star.comp.uui.UUIInteractionHandler") +#define IMPLEMENTATIONNAME_UIINTERACTIONHANDLER ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.uui.UUIInteractionHandler")) //_________________________________________________________________________________________________________________ // exported definitions diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx index 3bfa06f46acc..ec84096eda94 100644 --- a/framework/source/jobs/helponstartup.cxx +++ b/framework/source/jobs/helponstartup.cxx @@ -60,26 +60,26 @@ namespace framework{ // definitions // path to module config -static ::rtl::OUString CFG_PACKAGE_MODULES = ::rtl::OUString::createFromAscii("/org.openoffice.Setup/Office/Factories"); -static ::rtl::OUString CFG_PACKAGE_SETUP = ::rtl::OUString::createFromAscii("/org.openoffice.Setup" ); -static ::rtl::OUString CFG_PACKAGE_COMMON = ::rtl::OUString::createFromAscii("/org.openoffice.Office.Common" ); -static ::rtl::OUString CFG_PATH_L10N = ::rtl::OUString::createFromAscii("L10N" ); -static ::rtl::OUString CFG_PATH_HELP = ::rtl::OUString::createFromAscii("Help" ); -static ::rtl::OUString CFG_KEY_LOCALE = ::rtl::OUString::createFromAscii("ooLocale" ); -static ::rtl::OUString CFG_KEY_HELPSYSTEM = ::rtl::OUString::createFromAscii("System" ); +static ::rtl::OUString CFG_PACKAGE_MODULES (RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Office/Factories")); +static ::rtl::OUString CFG_PACKAGE_SETUP (RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup")); +static ::rtl::OUString CFG_PACKAGE_COMMON (RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Common")); +static ::rtl::OUString CFG_PATH_L10N (RTL_CONSTASCII_USTRINGPARAM("L10N")); +static ::rtl::OUString CFG_PATH_HELP (RTL_CONSTASCII_USTRINGPARAM("Help")); +static ::rtl::OUString CFG_KEY_LOCALE (RTL_CONSTASCII_USTRINGPARAM("ooLocale")); +static ::rtl::OUString CFG_KEY_HELPSYSTEM (RTL_CONSTASCII_USTRINGPARAM("System")); // props of job environment -static ::rtl::OUString PROP_ENVIRONMENT = ::rtl::OUString::createFromAscii("Environment" ); -static ::rtl::OUString PROP_JOBCONFIG = ::rtl::OUString::createFromAscii("JobConfig" ); -static ::rtl::OUString PROP_ENVTYPE = ::rtl::OUString::createFromAscii("EnvType" ); -static ::rtl::OUString PROP_MODEL = ::rtl::OUString::createFromAscii("Model" ); +static ::rtl::OUString PROP_ENVIRONMENT (RTL_CONSTASCII_USTRINGPARAM("Environment")); +static ::rtl::OUString PROP_JOBCONFIG (RTL_CONSTASCII_USTRINGPARAM("JobConfig")); +static ::rtl::OUString PROP_ENVTYPE (RTL_CONSTASCII_USTRINGPARAM("EnvType")); +static ::rtl::OUString PROP_MODEL (RTL_CONSTASCII_USTRINGPARAM("Model")); // props of module config -static ::rtl::OUString PROP_HELP_BASEURL = ::rtl::OUString::createFromAscii("ooSetupFactoryHelpBaseURL" ); -static ::rtl::OUString PROP_AUTOMATIC_HELP = ::rtl::OUString::createFromAscii("ooSetupFactoryHelpOnOpen" ); +static ::rtl::OUString PROP_HELP_BASEURL (RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryHelpBaseURL")); +static ::rtl::OUString PROP_AUTOMATIC_HELP (RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryHelpOnOpen")); // special value of job environment -static ::rtl::OUString ENVTYPE_DOCUMENTEVENT = ::rtl::OUString::createFromAscii("DOCUMENTEVENT" ); +static ::rtl::OUString ENVTYPE_DOCUMENTEVENT (RTL_CONSTASCII_USTRINGPARAM("DOCUMENTEVENT")); //----------------------------------------------- diff --git a/framework/source/jobs/jobconst.cxx b/framework/source/jobs/jobconst.cxx index 4a4fb39227da..9d3403db5cfb 100644 --- a/framework/source/jobs/jobconst.cxx +++ b/framework/source/jobs/jobconst.cxx @@ -56,19 +56,19 @@ namespace framework{ const ::rtl::OUString JobConst::ANSWER_DEACTIVATE_JOB() { - static const ::rtl::OUString PROP = ::rtl::OUString::createFromAscii("Deactivate"); + static const ::rtl::OUString PROP(RTL_CONSTASCII_USTRINGPARAM("Deactivate")); return PROP; } const ::rtl::OUString JobConst::ANSWER_SAVE_ARGUMENTS() { - static const ::rtl::OUString PROP = ::rtl::OUString::createFromAscii("SaveArguments"); + static const ::rtl::OUString PROP(RTL_CONSTASCII_USTRINGPARAM("SaveArguments")); return PROP; } const ::rtl::OUString JobConst::ANSWER_SEND_DISPATCHRESULT() { - static const ::rtl::OUString PROP = ::rtl::OUString::createFromAscii("SendDispatchResult"); + static const ::rtl::OUString PROP(RTL_CONSTASCII_USTRINGPARAM("SendDispatchResult")); return PROP; } diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx index f3017923ab9c..2d1b69198d66 100644 --- a/framework/source/jobs/jobdata.cxx +++ b/framework/source/jobs/jobdata.cxx @@ -181,8 +181,7 @@ void JobData::setAlias( const ::rtl::OUString& sAlias ) // try to open the configuration set of this job directly and get a property access to it // We open it readonly here - ::rtl::OUString sKey; - sKey = ::rtl::OUString::createFromAscii(JOBCFG_ROOT); + ::rtl::OUString sKey(::rtl::OUString::createFromAscii(JOBCFG_ROOT)); sKey += ::utl::wrapConfigurationElementName(m_sAlias); ConfigAccess aConfig(m_xSMGR, sKey); @@ -312,8 +311,7 @@ void JobData::setJobConfig( const css::uno::Sequence< css::beans::NamedValue >& // It doesn't matter if this config object was already opened before. // It doesn nothing here then ... or it change the mode automaticly, if // it was opened using another one before. - ::rtl::OUString sKey; - sKey = ::rtl::OUString::createFromAscii(JOBCFG_ROOT); + ::rtl::OUString sKey(::rtl::OUString::createFromAscii(JOBCFG_ROOT)); sKey += ::utl::wrapConfigurationElementName(m_sAlias); ConfigAccess aConfig(m_xSMGR, sKey); @@ -422,15 +420,15 @@ JobData::EEnvironment JobData::getEnvironment() const switch(m_eEnvironment) { case E_EXECUTION : - sDescriptor = ::rtl::OUString::createFromAscii("EXECUTOR"); + sDescriptor = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EXECUTOR")); break; case E_DISPATCH : - sDescriptor = ::rtl::OUString::createFromAscii("DISPATCH"); + sDescriptor = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DISPATCH")); break; case E_DOCUMENTEVENT : - sDescriptor = ::rtl::OUString::createFromAscii("DOCUMENTEVENT"); + sDescriptor = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DOCUMENTEVENT")); break; default: break; @@ -576,7 +574,7 @@ sal_Bool isEnabled( const ::rtl::OUString& sAdminTime , we have to encode all '?' signs. Otherwhise e.g. "??-" will be translated to "~" ... */ - static ::rtl::OUString PATTERN_ISO8601 = ::rtl::OUString::createFromAscii("\?\?\?\?-\?\?-\?\?*\0"); + static ::rtl::OUString PATTERN_ISO8601(RTL_CONSTASCII_USTRINGPARAM("\?\?\?\?-\?\?-\?\?*\0")); WildCard aISOPattern(PATTERN_ISO8601); sal_Bool bValidAdmin = aISOPattern.Matches(sAdminTime); diff --git a/framework/source/jobs/shelljob.cxx b/framework/source/jobs/shelljob.cxx index 08280950ae99..7cc29e1b686e 100644 --- a/framework/source/jobs/shelljob.cxx +++ b/framework/source/jobs/shelljob.cxx @@ -62,19 +62,19 @@ namespace framework{ // definitions /** adress job configuration inside argument set provided on method execute(). */ -static const ::rtl::OUString PROP_JOBCONFIG = ::rtl::OUString::createFromAscii("JobConfig"); +static const ::rtl::OUString PROP_JOBCONFIG(RTL_CONSTASCII_USTRINGPARAM("JobConfig")); /** adress job configuration property "Command". */ -static const ::rtl::OUString PROP_COMMAND = ::rtl::OUString::createFromAscii("Command"); +static const ::rtl::OUString PROP_COMMAND(RTL_CONSTASCII_USTRINGPARAM("Command")); /** adress job configuration property "Arguments". */ -static const ::rtl::OUString PROP_ARGUMENTS = ::rtl::OUString::createFromAscii("Arguments"); +static const ::rtl::OUString PROP_ARGUMENTS(RTL_CONSTASCII_USTRINGPARAM("Arguments")); /** adress job configuration property "DeactivateJobIfDone". */ -static const ::rtl::OUString PROP_DEACTIVATEJOBIFDONE = ::rtl::OUString::createFromAscii("DeactivateJobIfDone"); +static const ::rtl::OUString PROP_DEACTIVATEJOBIFDONE(RTL_CONSTASCII_USTRINGPARAM("DeactivateJobIfDone")); /** adress job configuration property "CheckExitCode". */ -static const ::rtl::OUString PROP_CHECKEXITCODE = ::rtl::OUString::createFromAscii("CheckExitCode"); +static const ::rtl::OUString PROP_CHECKEXITCODE(RTL_CONSTASCII_USTRINGPARAM("CheckExitCode")); //----------------------------------------------- diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 73fa53b6a3d6..64646e35aabc 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -292,12 +292,11 @@ static sal_Bool implts_isFrameOrWindowTop( const css::uno::Reference< css::frame css::uno::Reference< css::awt::XTopWindow > xWindowCheck(xFrame->getContainerWindow(), css::uno::UNO_QUERY); // dont use _THROW here ... its a check only if (xWindowCheck.is()) { - // --> PB 2007-06-18 #i76867# top and system window is required. + // Top and system window is required (#i76867#) SolarMutexGuard aGuard; css::uno::Reference< css::awt::XWindow > xWindow( xWindowCheck, UNO_QUERY ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); return ( pWindow && pWindow->IsSystemWindow() ); - // <-- } return sal_False; @@ -334,7 +333,7 @@ static void impl_setDockingWindowVisibility( const css::uno::Reference< css::lan xDispatcher->executeDispatch( xProvider, aDockWinCommand, - ::rtl::OUString::createFromAscii("_self"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")), 0, aArgs); } @@ -765,7 +764,7 @@ void LayoutManager::implts_destroyElements() aWriteLock.unlock(); UIElementVector::iterator pIter; - for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); pIter++ ) + for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); ++pIter ) { Reference< XComponent > xComponent( pIter->m_xUIElement, UNO_QUERY ); if ( xComponent.is() ) @@ -1112,7 +1111,7 @@ void LayoutManager::implts_toggleFloatingUIElementsVisibility( sal_Bool bActive UIElementVector::iterator pIter; ReadGuard aReadLock( m_aLock ); - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_xUIElement.is() ) { @@ -1184,7 +1183,7 @@ sal_Bool LayoutManager::implts_findElement( const rtl::OUString& aName, rtl::OUS UIElementVector::const_iterator pIter; ReadGuard aReadLock( m_aLock ); - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_aName == aName ) { @@ -1203,7 +1202,7 @@ sal_Bool LayoutManager::implts_findElement( const Reference< XInterface >& xUIEl UIElementVector::const_iterator pIter; ReadGuard aReadLock( m_aLock ); - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_xUIElement.is() ) { @@ -1224,7 +1223,7 @@ sal_Bool LayoutManager::implts_findElement( const rtl::OUString& aName, UIElemen UIElementVector::const_iterator pIter; ReadGuard aReadLock( m_aLock ); - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_aName == aName ) { @@ -1243,7 +1242,7 @@ LayoutManager::UIElement& LayoutManager::impl_findElement( const rtl::OUString& UIElementVector::iterator pIter; ReadGuard aReadLock( m_aLock ); - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_aName == aName ) return *pIter; @@ -1331,7 +1330,7 @@ void LayoutManager::implts_refreshContextToolbarsVisibility() UIElementVisibility aUIElementVisible; UIElementVector::iterator pIter; - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_aType.equalsAsciiL( "toolbar", 7 )) { @@ -1768,7 +1767,7 @@ void LayoutManager::implts_setElementData( UIElement& rElement, const Reference< // Try to find a cascaded position for the new floating window UIElementVector::const_iterator pIter; - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_xUIElement.is() ) { @@ -1974,7 +1973,7 @@ void LayoutManager::implts_sortUIElements() // We have to reset our temporary flags. UIElementVector::iterator pIter; - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { // why check, just set it to false //if ( pIter->m_bUserActive ) @@ -2002,7 +2001,7 @@ void LayoutManager::implts_getDockingAreaElementInfos( DockingArea eDockingArea, aWindowVector.reserve(m_aUIElements.size()); xDockAreaWindow = m_xDockAreaWindows[eDockingArea]; UIElementVector::iterator pIter; - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_aDockedData.m_nDockedArea == eDockingArea && pIter->m_bVisible && !pIter->m_bFloating ) { @@ -2188,7 +2187,7 @@ void LayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( DockingArea ReadGuard aReadLock( m_aLock ); UIElementVector::iterator pIter; UIElementVector::iterator pEnd = m_aUIElements.end(); - for ( pIter = m_aUIElements.begin(); pIter != pEnd; pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != pEnd; ++pIter ) { if ( pIter->m_aDockedData.m_nDockedArea == eDockingArea ) { @@ -2939,7 +2938,7 @@ void LayoutManager::implts_renumberRowColumnData( WriteGuard aWriteLock( m_aLock ); UIElementVector::iterator pIter; - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if (( pIter->m_aDockedData.m_nDockedArea == sal_Int16( eDockingArea )) && ( pIter->m_aName != rUIElement.m_aName )) @@ -3086,7 +3085,7 @@ void LayoutManager::implts_setVisibleState( sal_Bool bShow ) /* SAFE AREA ----------------------------------------------------------------------------------------------- */ WriteGuard aWriteLock( m_aLock ); UIElementVector::iterator pIter; - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) pIter->m_bMasterHide = !bShow; m_aStatusBarElement.m_bMasterHide = !bShow; aWriteLock.unlock(); @@ -3116,7 +3115,7 @@ void LayoutManager::implts_updateUIElementsVisibleState( sal_Bool bSetVisible ) ReadGuard aReadLock( m_aLock ); aWinVector.reserve(m_aUIElements.size()); UIElementVector::iterator pIter; - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_xUIElement.is() ) { @@ -3245,7 +3244,7 @@ void LayoutManager::implts_setCurrentUIVisibility( sal_Bool bShow ) /* SAFE AREA ----------------------------------------------------------------------------------------------- */ WriteGuard aWriteLock( m_aLock ); UIElementVector::iterator pIter; - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( !bShow && pIter->m_bVisible && pIter->m_xUIElement.is() ) pIter->m_bMasterHide = true; @@ -3931,7 +3930,7 @@ void LayoutManager::implts_reparentChildWindows() if ( pContainerWindow ) { UIElementVector::iterator pIter; - for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); pIter++ ) + for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); ++pIter ) { Reference< XUIElement > xUIElement( pIter->m_xUIElement ); if ( xUIElement.is() ) @@ -4021,7 +4020,7 @@ IMPL_LINK( LayoutManager, WindowEventListener, VclSimpleEvent*, pEvent ) std::vector< css::uno::Reference< css::ui::XUIFunctionListener > > aListenerArray; UIElementVector::iterator pIter; - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_aType.equalsAscii( "toolbar" ) && pIter->m_xUIElement.is() ) @@ -4309,7 +4308,7 @@ throw (RuntimeException) { UIElementVector::iterator pIter; - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_aName == aName ) { @@ -4461,7 +4460,7 @@ throw (::com::sun::star::uno::RuntimeException) bool bFound( false ); bool bShowElement( false ); - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_aName == ResourceURL ) { @@ -4588,7 +4587,7 @@ throw (::com::sun::star::uno::RuntimeException) sal_Int32 nIndex = 0; UIElementVector::const_iterator pIter; - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_xUIElement.is() ) aSeq[nIndex++] = pIter->m_xUIElement; @@ -4656,7 +4655,7 @@ throw (RuntimeException) UIElementVector::iterator pIter; WriteGuard aWriteLock( m_aLock ); - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_aName == aName && pIter->m_xUIElement.is() ) { @@ -4789,7 +4788,7 @@ throw (RuntimeException) UIElementVector::iterator pIter; WriteGuard aWriteLock( m_aLock ); - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_aName == aName && pIter->m_xUIElement.is() ) { @@ -4944,7 +4943,7 @@ throw (RuntimeException) { ReadGuard aReadLock( m_aLock ); UIElementVector::iterator pIter; - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_aType.equalsAscii( "toolbar" ) && pIter->m_xUIElement.is() && @@ -5266,7 +5265,7 @@ throw (RuntimeException) UIElementVector::const_iterator pIter; ReadGuard aReadLock( m_aLock ); - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_aName == aName && pIter->m_xUIElement.is() ) { @@ -5298,7 +5297,7 @@ throw (RuntimeException) UIElementVector::const_iterator pIter; ReadGuard aReadLock( m_aLock ); - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_aName == aName && pIter->m_xUIElement.is() ) { @@ -5316,7 +5315,7 @@ throw (RuntimeException) UIElementVector::const_iterator pIter; ReadGuard aReadLock( m_aLock ); - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_aName == aName && pIter->m_xUIElement.is() ) { @@ -5334,7 +5333,7 @@ throw (::com::sun::star::uno::RuntimeException) UIElementVector::const_iterator pIter; ReadGuard aReadLock( m_aLock ); - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if (( pIter->m_aName == ResourceURL ) && ( pIter->m_xUIElement.is() )) { @@ -5943,7 +5942,7 @@ css::awt::Rectangle LayoutManager::implts_calcDockingAreaSizes() aRowColumnSizes[nCurrDockingArea].clear(); aRowColumnSizes[nCurrDockingArea].push_back( 0 ); - for ( pConstIter = aWindowVector.begin(); pConstIter != aWindowVector.end(); pConstIter++ ) + for ( pConstIter = aWindowVector.begin(); pConstIter != aWindowVector.end(); ++pConstIter ) { Reference< XUIElement > xUIElement( pConstIter->m_xUIElement, UNO_QUERY ); if ( xUIElement.is() ) @@ -6228,8 +6227,8 @@ IMPL_LINK( LayoutManager, MenuBarClose, MenuBar *, EMPTYARG ) xDispatcher->executeDispatch( xProvider, - ::rtl::OUString::createFromAscii(".uno:CloseWin"), - ::rtl::OUString::createFromAscii("_self"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseWin")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")), 0, css::uno::Sequence< css::beans::PropertyValue >()); @@ -6258,7 +6257,7 @@ IMPL_LINK( LayoutManager, OptionsChanged, void*, EMPTYARG ) aReadLock.lock(); { UIElementVector::iterator pIter; - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_xUIElement.is() ) aToolBarVector.push_back( Reference< XUpdatable >( pIter->m_xUIElement, UNO_QUERY )); @@ -6269,7 +6268,7 @@ IMPL_LINK( LayoutManager, OptionsChanged, void*, EMPTYARG ) lock(); { std::vector< Reference< XUpdatable > >::iterator pIter; - for ( pIter = aToolBarVector.begin(); pIter != aToolBarVector.end(); pIter++ ) + for ( pIter = aToolBarVector.begin(); pIter != aToolBarVector.end(); ++pIter ) { if ( (*pIter).is() ) (*pIter)->update(); @@ -6423,7 +6422,6 @@ throw (::com::sun::star::uno::RuntimeException) ::Rectangle aHotZoneRightDockRect( implts_calcHotZoneRect( aRightDockRect, nMagneticZone )); Window* pContainerWindow( VCLUnoHelper::GetWindow( xContainerWindow ) ); - Window* pDockingAreaWindow( 0 ); ::Point aMousePos( pContainerWindow->ScreenToOutputPixel( ::Point( e.MousePos.X, e.MousePos.Y ))); if ( aHotZoneTopDockRect.IsInside( aMousePos )) @@ -6457,25 +6455,25 @@ throw (::com::sun::star::uno::RuntimeException) { aUIDockingElement.m_aDockedData.m_nDockedArea = DockingArea_DOCKINGAREA_TOP; aUIDockingElement.m_bFloating = sal_False; - pDockingAreaWindow = VCLUnoHelper::GetWindow( xTopDockingWindow ); + VCLUnoHelper::GetWindow( xTopDockingWindow ); } else if ( eDockingArea == DockingArea_DOCKINGAREA_BOTTOM ) { aUIDockingElement.m_aDockedData.m_nDockedArea = DockingArea_DOCKINGAREA_BOTTOM; aUIDockingElement.m_bFloating = sal_False; - pDockingAreaWindow = VCLUnoHelper::GetWindow( xBottomDockingWindow ); + VCLUnoHelper::GetWindow( xBottomDockingWindow ); } else if ( eDockingArea == DockingArea_DOCKINGAREA_LEFT ) { aUIDockingElement.m_aDockedData.m_nDockedArea = DockingArea_DOCKINGAREA_LEFT; aUIDockingElement.m_bFloating = sal_False; - pDockingAreaWindow = VCLUnoHelper::GetWindow( xLeftDockingWindow ); + VCLUnoHelper::GetWindow( xLeftDockingWindow ); } else if ( eDockingArea == DockingArea_DOCKINGAREA_RIGHT ) { aUIDockingElement.m_aDockedData.m_nDockedArea = DockingArea_DOCKINGAREA_RIGHT; aUIDockingElement.m_bFloating = sal_False; - pDockingAreaWindow = VCLUnoHelper::GetWindow( xRightDockingWindow ); + VCLUnoHelper::GetWindow( xRightDockingWindow ); } ::Point aOutputPos = pContainerWindow->ScreenToOutputPixel( aTrackingRect.TopLeft() ); diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 39314fe9d9af..8c0717281d7f 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -206,13 +206,13 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const { case LoadEnvException::ID_INVALID_MEDIADESCRIPTOR: throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("Optional list of arguments seem to be corrupted."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Optional list of arguments seem to be corrupted.")), xLoader, 4); case LoadEnvException::ID_UNSUPPORTED_CONTENT: throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("URL seems to be an unsupported one."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL seems to be an unsupported one.")), xLoader, 1); @@ -818,8 +818,8 @@ LoadEnv::EContentType LoadEnv::classifyContent(const ::rtl::OUString& void LoadEnv::impl_detectTypeAndFilter() throw(LoadEnvException, css::uno::RuntimeException) { - static ::rtl::OUString TYPEPROP_PREFERREDFILTER = ::rtl::OUString::createFromAscii("PreferredFilter"); - static ::rtl::OUString FILTERPROP_FLAGS = ::rtl::OUString::createFromAscii("Flags" ); + static ::rtl::OUString TYPEPROP_PREFERREDFILTER(RTL_CONSTASCII_USTRINGPARAM("PreferredFilter")); + static ::rtl::OUString FILTERPROP_FLAGS (RTL_CONSTASCII_USTRINGPARAM("Flags")); static sal_Int32 FILTERFLAG_TEMPLATEPATH = 16; // SAFE -> @@ -1003,9 +1003,9 @@ sal_Bool LoadEnv::impl_furtherDocsAllowed() { css::uno::Any aVal = ::comphelper::ConfigurationHelper::readDirectKey( xSMGR, - ::rtl::OUString::createFromAscii("org.openoffice.Office.Common/"), - ::rtl::OUString::createFromAscii("Misc"), - ::rtl::OUString::createFromAscii("MaxOpenDocuments"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Misc")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MaxOpenDocuments")), ::comphelper::ConfigurationHelper::E_READONLY); // NIL means: count of allowed documents = infinite ! @@ -1304,7 +1304,7 @@ void LoadEnv::impl_jumpToMark(const css::uno::Reference< css::frame::XFrame >& x // <- SAFE css::util::URL aCmd; - aCmd.Complete = ::rtl::OUString::createFromAscii(".uno:JumpToMark"); + aCmd.Complete = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:JumpToMark")); css::uno::Reference< css::util::XURLTransformer > xParser(xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), css::uno::UNO_QUERY_THROW); xParser->parseStrict(aCmd); @@ -1314,7 +1314,7 @@ void LoadEnv::impl_jumpToMark(const css::uno::Reference< css::frame::XFrame >& x return; ::comphelper::SequenceAsHashMap lArgs; - lArgs[::rtl::OUString::createFromAscii("Bookmark")] <<= aURL.Mark; + lArgs[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Bookmark"))] <<= aURL.Mark; xDispatcher->dispatch(aCmd, lArgs.getAsConstPropertyValueList()); } @@ -1757,9 +1757,9 @@ void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::X bool bForceFrontAndFocus(false); css::uno::Any a = ::comphelper::ConfigurationHelper::readDirectKey( xSMGR, - ::rtl::OUString::createFromAscii("org.openoffice.Office.Common/View"), - ::rtl::OUString::createFromAscii("NewDocumentHandling"), - ::rtl::OUString::createFromAscii("ForceFocusAndToFront"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/View")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NewDocumentHandling")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ForceFocusAndToFront")), ::comphelper::ConfigurationHelper::E_READONLY); a >>= bForceFrontAndFocus; @@ -1802,7 +1802,7 @@ void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::X -----------------------------------------------*/ void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow) { - static ::rtl::OUString PACKAGE_SETUP_MODULES = ::rtl::OUString::createFromAscii("/org.openoffice.Setup/Office/Factories"); + static ::rtl::OUString PACKAGE_SETUP_MODULES(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Office/Factories")); // no window -> action not possible if (!xWindow.is()) diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx index 2c36f88743bb..f7cce11699bb 100644 --- a/framework/source/recording/dispatchrecorder.cxx +++ b/framework/source/recording/dispatchrecorder.cxx @@ -132,7 +132,7 @@ DispatchRecorder::DispatchRecorder( const css::uno::Reference< css::lang::XMulti : ThreadHelpBase ( &Application::GetSolarMutex() ) , ::cppu::OWeakObject( ) , m_xSMGR ( xSMGR ) - , m_xConverter( m_xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.script.Converter")), css::uno::UNO_QUERY ) + , m_xConverter( m_xSMGR->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter"))), css::uno::UNO_QUERY ) { } @@ -202,7 +202,7 @@ void SAL_CALL DispatchRecorder::endRecording() throw( css::uno::RuntimeException aScriptBuffer.appendAscii("dispatcher = createUnoService(\"com.sun.star.frame.DispatchHelper\")\n\n"); std::vector< com::sun::star::frame::DispatchStatement>::iterator p; - for ( p = m_aStatements.begin(); p != m_aStatements.end(); p++ ) + for ( p = m_aStatements.begin(); p != m_aStatements.end(); ++p ) implts_recordMacro( p->aCommand, p->aArgs, p->bIsComment, aScriptBuffer ); ::rtl::OUString sScript = aScriptBuffer.makeStringAndClear(); return sScript; @@ -345,7 +345,7 @@ void SAL_CALL DispatchRecorder::implts_recordMacro( const ::rtl::OUString& aURL, ::rtl::OUStringBuffer aArgumentBuffer(1000); ::rtl::OUString sArrayName; // this value is used to name the arrays of aArgumentBuffer - sArrayName = ::rtl::OUString::createFromAscii("args"); + sArrayName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("args")); sArrayName += ::rtl::OUString::valueOf((sal_Int32)m_nRecordingID); aScriptBuffer.appendAscii("rem ----------------------------------------------------------------------\n"); diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx index f7d65fa26498..e7e7dc7a8fec 100644 --- a/framework/source/services/backingcomp.cxx +++ b/framework/source/services/backingcomp.cxx @@ -462,17 +462,17 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f // check some required states if (m_xFrame.is()) throw css::uno::RuntimeException( - ::rtl::OUString::createFromAscii("already attached"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("already attached")), static_cast< ::cppu::OWeakObject* >(this)); if (!xFrame.is()) throw css::uno::RuntimeException( - ::rtl::OUString::createFromAscii("invalid frame reference"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("invalid frame reference")), static_cast< ::cppu::OWeakObject* >(this)); if (!m_xWindow.is()) throw css::uno::RuntimeException( - ::rtl::OUString::createFromAscii("instance seams to be not or wrong initialized"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("instance seams to be not or wrong initialized")), static_cast< ::cppu::OWeakObject* >(this)); // safe the frame reference @@ -661,7 +661,7 @@ void SAL_CALL BackingComp::disposing( /*IN*/ const css::lang::EventObject& aEven if (!aEvent.Source.is() || aEvent.Source!=m_xWindow || !m_xWindow.is()) throw css::uno::RuntimeException( - ::rtl::OUString::createFromAscii("unexpected source or called twice"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unexpected source or called twice")), static_cast< ::cppu::OWeakObject* >(this)); m_xWindow = css::uno::Reference< css::awt::XWindow >(); @@ -755,7 +755,7 @@ void SAL_CALL BackingComp::addEventListener( /*IN*/ const css::uno::Reference< c throw(css::uno::RuntimeException) { throw css::uno::RuntimeException( - ::rtl::OUString::createFromAscii("not supported"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not supported")), static_cast< ::cppu::OWeakObject* >(this)); } @@ -802,7 +802,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno if (m_xWindow.is()) throw css::uno::Exception( - ::rtl::OUString::createFromAscii("already initialized"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("already initialized")), static_cast< ::cppu::OWeakObject* >(this)); css::uno::Reference< css::awt::XWindow > xParentWindow; @@ -813,7 +813,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno ) { throw css::uno::Exception( - ::rtl::OUString::createFromAscii("wrong or corrupt argument list"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wrong or corrupt argument list")), static_cast< ::cppu::OWeakObject* >(this)); } @@ -824,7 +824,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno if (!m_xWindow.is()) throw css::uno::RuntimeException( - ::rtl::OUString::createFromAscii("couldn't create component window"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("couldn't create component window")), static_cast< ::cppu::OWeakObject* >(this)); // start listening for window disposing diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx index a7d7741bbc04..0398aaef8901 100644 --- a/framework/source/services/backingwindow.cxx +++ b/framework/source/services/backingwindow.cxx @@ -410,7 +410,7 @@ void BackingWindow::initBackground() Color aTextBGColor( bDark ? COL_BLACK : COL_WHITE ); // select image set - ImageContainerRes aRes( FwkResId( bDark ? RES_BACKING_IMAGES_HC : RES_BACKING_IMAGES ) ); + ImageContainerRes aRes( FwkResId( RES_BACKING_IMAGES ) ); // scale middle segment Size aMiddleSize; @@ -673,7 +673,7 @@ void BackingWindow::layoutButton( const String& i_rStr ) { - rtl::OUString aURL( rtl::OUString::createFromAscii( i_pURL ? i_pURL : "" ) ); + rtl::OUString aURL( i_pURL ? rtl::OUString::createFromAscii( i_pURL ) : rtl::OUString() ); // setup button i_rBtn.SetPaintTransparent( TRUE ); i_rBtn.SetClickHdl( LINK( this, BackingWindow, ClickHdl ) ); @@ -993,8 +993,8 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton ) Sequence< com::sun::star::beans::PropertyValue > aArgs(1); PropertyValue* pArg = aArgs.getArray(); - pArg[0].Name = rtl::OUString::createFromAscii("Referer"); - pArg[0].Value <<= rtl::OUString::createFromAscii("private:user"); + pArg[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer")); + pArg[0].Value <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:user")); dispatchURL( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(OPEN_URL) ), rtl::OUString(), xFrame, aArgs ); } @@ -1004,8 +1004,8 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton ) Sequence< com::sun::star::beans::PropertyValue > aArgs(1); PropertyValue* pArg = aArgs.getArray(); - pArg[0].Name = rtl::OUString::createFromAscii("Referer"); - pArg[0].Value <<= rtl::OUString::createFromAscii("private:user"); + pArg[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer")); + pArg[0].Value <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:user")); dispatchURL( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(TEMPLATE_URL) ), rtl::OUString(), xFrame, aArgs ); } @@ -1084,7 +1084,7 @@ void BackingWindow::dispatchURL( const rtl::OUString& i_rURL, aDispatchURL.Complete = i_rURL; Reference < com::sun::star::util::XURLTransformer > xURLTransformer( - comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer") ), + comphelper::getProcessServiceFactory()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer")) ), com::sun::star::uno::UNO_QUERY ); if ( xURLTransformer.is() ) { diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 1c862faf36bf..216c7a94624c 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -83,6 +83,7 @@ //_________________________________________________________________________________________________________________ // includes of other projects //_________________________________________________________________________________________________________________ +#include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/factory.hxx> @@ -264,6 +265,7 @@ Desktop::Desktop( const css::uno::Reference< css::lang::XMultiServiceFactory >& , m_xSWThreadManager ( ) , m_xSfxTerminator ( ) , m_xTitleNumberGenerator ( ) + , m_bTerminating(false) { // Safe impossible cases // We don't accept all incoming parameter. @@ -291,6 +293,39 @@ Desktop::~Desktop() sal_Bool SAL_CALL Desktop::terminate() throw( css::uno::RuntimeException ) { + bool bTerminating(false); + { + WriteGuard aGuard(m_aLock); + bTerminating = m_bTerminating; + m_bTerminating = true; + } + if (bTerminating) + return false; + + css::uno::Any aException; + sal_Bool bTerminate(false); + try + { + bTerminate = impl_terminate(); + } + catch (const css::uno::RuntimeException& rEx) + { + aException <<= rEx; + } + + { + WriteGuard aGuard(m_aLock); + m_bTerminating = false; + } + + if (aException.hasValue()) + cppu::throwException(aException); + + return bTerminate; +} + +sal_Bool Desktop::impl_terminate() +{ TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); SYNCHRONIZED_START diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx index e41b91d1302d..629ebe735035 100644 --- a/framework/source/services/dispatchhelper.cxx +++ b/framework/source/services/dispatchhelper.cxx @@ -148,7 +148,7 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch( css::uno::Sequence< css::beans::PropertyValue > aArguments( lArguments ); sal_Int32 nLength = lArguments.getLength(); aArguments.realloc( nLength + 1 ); - aArguments[ nLength ].Name = ::rtl::OUString::createFromAscii("SynchronMode"); + aArguments[ nLength ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SynchronMode")); aArguments[ nLength ].Value <<= (sal_Bool) sal_True; css::uno::Any aResult; diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 7113181372bd..67adb5242c0c 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -557,7 +557,7 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >& /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ if (!xWindow.is()) throw css::uno::RuntimeException( - ::rtl::OUString::createFromAscii("Frame::initialize() called without a valid container window reference."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Frame::initialize() called without a valid container window reference.")), static_cast< css::frame::XFrame* >(this)); /* SAFE AREA ----------------------------------------------------------------------------------------------- */ @@ -565,7 +565,7 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >& if ( m_xContainerWindow.is() ) throw css::uno::RuntimeException( - ::rtl::OUString::createFromAscii("Frame::initialized() is called more then once, which isnt usefull nor allowed."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Frame::initialized() is called more then once, which isnt usefull nor allowed.")), static_cast< css::frame::XFrame* >(this)); // Look for rejected calls first! @@ -2614,7 +2614,7 @@ void SAL_CALL Frame::impl_setPropertyValue(const ::rtl::OUString& /*sProperty*/, const css::uno::Any& aValue ) { - static ::rtl::OUString MATERIALPROP_TITLE = ::rtl::OUString::createFromAscii("title"); + static ::rtl::OUString MATERIALPROP_TITLE(RTL_CONSTASCII_USTRINGPARAM("title")); /* There is no need to lock any mutex here. Because we share the solar mutex with our base class. And we said to our base class: "dont release it on calling us" .-) diff --git a/framework/source/services/fwk_services.src b/framework/source/services/fwk_services.src index bdbe81bc7fb3..d2368f9eacdc 100644 --- a/framework/source/services/fwk_services.src +++ b/framework/source/services/fwk_services.src @@ -123,78 +123,6 @@ Resource RES_BACKING_IMAGES }; }; -Resource RES_BACKING_IMAGES_HC -{ - Bitmap BMP_BACKING_BACKGROUND_LEFT - { - File = "backing_hc.png"; - }; - Bitmap BMP_BACKING_BACKGROUND_MIDDLE - { - File = "backing_space_hc.png"; - }; - Bitmap BMP_BACKING_BACKGROUND_RIGHT - { - File = "backing_right_hc.png"; - }; - Bitmap BMP_BACKING_BACKGROUND_RTL_LEFT - { - File = "backing_rtl_left_hc.png"; - }; - Bitmap BMP_BACKING_BACKGROUND_RTL_RIGHT - { - File = "backing_rtl_right_hc.png"; - }; - Bitmap BMP_BACKING_EXT - { - File = "extension_hc.png"; - }; - Bitmap BMP_BACKING_REG - { - File = "register_hc.png"; - }; - Bitmap BMP_BACKING_INFO - { - File = "info_hc.png"; - }; - Bitmap BMP_BACKING_TPLREP - { - File = "template_hc.png"; - }; - Bitmap BMP_BACKING_WRITER - { - File = "odt_32_hc.png"; - }; - Bitmap BMP_BACKING_CALC - { - File = "ods_32_hc.png"; - }; - Bitmap BMP_BACKING_IMPRESS - { - File = "odp_32_hc.png"; - }; - Bitmap BMP_BACKING_DRAW - { - File = "odg_32_hc.png"; - }; - Bitmap BMP_BACKING_DATABASE - { - File = "odb_32_hc.png"; - }; - Bitmap BMP_BACKING_FORMULA - { - File = "odf_32_hc.png"; - }; - Bitmap BMP_BACKING_OPENFILE - { - File = "folder_32_hc.png"; - }; - Bitmap BMP_BACKING_OPENTEMPLATE - { - File = "templates_32_hc.png"; - }; -}; - Window WIN_TABWINDOW { OutputSize = TRUE ; diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx index 7f7c2980eced..a4fba2983e8d 100644 --- a/framework/source/services/license.cxx +++ b/framework/source/services/license.cxx @@ -211,10 +211,10 @@ static sal_Bool _parseDateTime(const ::rtl::OUString& aString, DateTime& aDateTi sal_Int32 nDateLength = 10; sal_Int32 nTimeLength = 8; - ::rtl::OUString aDateTimeSep = ::rtl::OUString::createFromAscii("T"); - ::rtl::OUString aDateSep = ::rtl::OUString::createFromAscii("-"); - ::rtl::OUString aTimeSep = ::rtl::OUString::createFromAscii(":"); - ::rtl::OUString aUTCString = ::rtl::OUString::createFromAscii("Z"); + ::rtl::OUString aDateTimeSep(RTL_CONSTASCII_USTRINGPARAM("T")); + ::rtl::OUString aDateSep(RTL_CONSTASCII_USTRINGPARAM("-")); + ::rtl::OUString aTimeSep(RTL_CONSTASCII_USTRINGPARAM(":")); + ::rtl::OUString aUTCString(RTL_CONSTASCII_USTRINGPARAM("Z")); ::rtl::OUString aDateString = aDateTimeString.copy(0, nDateLength); ::rtl::OUString aTimeString = aDateTimeString.copy(nDateLength+1, nTimeLength); @@ -276,11 +276,11 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na aLangString = aLocale.Language; if ( aLocale.Country.getLength() != 0 ) { - aLangString += ::rtl::OUString::createFromAscii("-"); + aLangString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-")); aLangString += aLocale.Country; if ( aLocale.Variant.getLength() != 0 ) { - aLangString += ::rtl::OUString::createFromAscii("-"); + aLangString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-")); aLangString += aLocale.Variant; } } @@ -288,21 +288,21 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na ::rtl::OUString aLicensePath = aBaseInstallPath + ::rtl::OUString::createFromAscii(szLicensePath) + ::rtl::OUString::createFromAscii(szWNTLicenseName) - + ::rtl::OUString::createFromAscii("_") + + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_")) + aLangString + ::rtl::OUString::createFromAscii(szWNTLicenseExt); #else ::rtl::OUString aLicensePath = aBaseInstallPath + ::rtl::OUString::createFromAscii(szLicensePath) + ::rtl::OUString::createFromAscii(szUNXLicenseName) - + ::rtl::OUString::createFromAscii("_") + + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_")) + aLangString + ::rtl::OUString::createFromAscii(szUNXLicenseExt); #endif // check if we need to show the license at all // open org.openoffice.Setup/Office/ooLicenseAcceptDate ::rtl::OUString sConfigSrvc = SERVICENAME_CFGPROVIDER; - ::rtl::OUString sAccessSrvc = ::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess"); + ::rtl::OUString sAccessSrvc(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationUpdateAccess")); ::rtl::OUString sReadSrvc = SERVICENAME_CFGREADACCESS; // get configuration provider @@ -310,15 +310,15 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na m_xFactory->createInstance(sConfigSrvc), UNO_QUERY_THROW); Sequence< Any > theArgs(1); NamedValue v; - v.Name = ::rtl::OUString::createFromAscii("NodePath"); - v.Value <<= ::rtl::OUString::createFromAscii("org.openoffice.Setup/Office"); + v.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NodePath")); + v.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/Office")); theArgs[0] <<= v; Reference< XPropertySet > pset = Reference< XPropertySet >( theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs), UNO_QUERY_THROW); // if we find a date there, compare it to baseinstall license date ::rtl::OUString aAcceptDate; - if (pset->getPropertyValue(::rtl::OUString::createFromAscii("ooLicenseAcceptDate")) >>= aAcceptDate) + if (pset->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooLicenseAcceptDate"))) >>= aAcceptDate) { // get LicenseFileDate from base install ::rtl::OUString aLicenseURL = aLicensePath; @@ -356,7 +356,7 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na // write org.openoffice.Setup/ooLicenseAcceptDate aAcceptDate = _getCurrentDateString(); - pset->setPropertyValue(::rtl::OUString::createFromAscii("ooLicenseAcceptDate"), makeAny(aAcceptDate)); + pset->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooLicenseAcceptDate")), makeAny(aAcceptDate)); Reference< XChangesBatch >(pset, UNO_QUERY_THROW)->commitChanges(); // enable quickstarter @@ -367,7 +367,7 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na aSeq[1] <<= bAutostart; Reference < XInitialization > xQuickstart( ::comphelper::getProcessServiceFactory()->createInstance( - ::rtl::OUString::createFromAscii( "com.sun.star.office.Quickstart" )),UNO_QUERY ); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.office.Quickstart"))),UNO_QUERY ); if ( xQuickstart.is() ) xQuickstart->initialize( aSeq ); diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx index 86c6c030ffc3..d394b305bad3 100644 --- a/framework/source/services/modulemanager.cxx +++ b/framework/source/services/modulemanager.cxx @@ -56,8 +56,8 @@ namespace framework { -static const ::rtl::OUString CFGPATH_FACTORIES = ::rtl::OUString::createFromAscii("/org.openoffice.Setup/Office/Factories"); -static const ::rtl::OUString MODULEPROP_IDENTIFIER = ::rtl::OUString::createFromAscii("ooSetupFactoryModuleIdentifier" ); +static const ::rtl::OUString CFGPATH_FACTORIES (RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Office/Factories")); +static const ::rtl::OUString MODULEPROP_IDENTIFIER(RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryModuleIdentifier")); /*----------------------------------------------- 04.12.2003 09:32 @@ -146,7 +146,7 @@ ModuleManager::~ModuleManager() ) { throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("Given module is not a frame nor a window, controller or model."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Given module is not a frame nor a window, controller or model.")), static_cast< ::cppu::OWeakObject* >(this), 1); } @@ -176,7 +176,7 @@ ModuleManager::~ModuleManager() if (sModule.getLength() < 1) throw css::frame::UnknownModuleException( - ::rtl::OUString::createFromAscii("Cant find suitable module for the given component."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cant find suitable module for the given component.")), static_cast< ::cppu::OWeakObject* >(this)); return sModule; @@ -196,7 +196,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName , if (lProps.empty() ) { throw css::lang::IllegalArgumentException( - ::rtl::OUString::createFromAscii("No properties given to replace part of module."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No properties given to replace part of module.")), static_cast< css::container::XNameAccess* >(this), 2); } @@ -223,7 +223,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName , if (!xModule.is()) { throw css::uno::RuntimeException( - ::rtl::OUString::createFromAscii("Was not able to get write access to the requested module entry inside configuration."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Was not able to get write access to the requested module entry inside configuration.")), static_cast< css::container::XNameAccess* >(this)); } @@ -258,7 +258,7 @@ css::uno::Any SAL_CALL ModuleManager::getByName(const ::rtl::OUString& sName) if (!xModule.is()) { throw css::uno::RuntimeException( - ::rtl::OUString::createFromAscii("Was not able to get write access to the requested module entry inside configuration."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Was not able to get write access to the requested module entry inside configuration.")), static_cast< css::container::XNameAccess* >(this)); } diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx index ccf17e45a630..181cda0b0df4 100644 --- a/framework/source/services/sessionlistener.cxx +++ b/framework/source/services/sessionlistener.cxx @@ -164,7 +164,7 @@ void SessionListener::StoreSession( sal_Bool bAsync ) css::uno::Reference< XDispatch > xDispatch(m_xSMGR->createInstance(SERVICENAME_AUTORECOVERY), UNO_QUERY_THROW); css::uno::Reference< XURLTransformer > xURLTransformer(m_xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), UNO_QUERY_THROW); URL aURL; - aURL.Complete = OUString::createFromAscii("vnd.sun.star.autorecovery:/doSessionSave"); + aURL.Complete = OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.autorecovery:/doSessionSave")); xURLTransformer->parseStrict(aURL); // in case of asynchronous call the notification will trigger saveDone() @@ -172,7 +172,7 @@ void SessionListener::StoreSession( sal_Bool bAsync ) xDispatch->addStatusListener(this, aURL); Sequence< PropertyValue > args(1); - args[0] = PropertyValue(OUString::createFromAscii("DispatchAsynchron"),-1,makeAny(bAsync),PropertyState_DIRECT_VALUE); + args[0] = PropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("DispatchAsynchron")),-1,makeAny(bAsync),PropertyState_DIRECT_VALUE); xDispatch->dispatch(aURL, args); } catch (com::sun::star::uno::Exception& e) { OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8); @@ -196,11 +196,11 @@ void SessionListener::QuitSessionQuietly() css::uno::Reference< XDispatch > xDispatch(m_xSMGR->createInstance(SERVICENAME_AUTORECOVERY), UNO_QUERY_THROW); css::uno::Reference< XURLTransformer > xURLTransformer(m_xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), UNO_QUERY_THROW); URL aURL; - aURL.Complete = OUString::createFromAscii("vnd.sun.star.autorecovery:/doSessionQuietQuit"); + aURL.Complete = OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.autorecovery:/doSessionQuietQuit")); xURLTransformer->parseStrict(aURL); Sequence< PropertyValue > args(1); - args[0] = PropertyValue(OUString::createFromAscii("DispatchAsynchron"),-1,makeAny(sal_False),PropertyState_DIRECT_VALUE); + args[0] = PropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("DispatchAsynchron")),-1,makeAny(sal_False),PropertyState_DIRECT_VALUE); xDispatch->dispatch(aURL, args); } catch (com::sun::star::uno::Exception& e) { OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8); @@ -216,7 +216,7 @@ void SAL_CALL SessionListener::initialize(const Sequence< Any >& args) throw (RuntimeException) { - OUString aSMgr = OUString::createFromAscii("com.sun.star.frame.SessionManagerClient"); + OUString aSMgr(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.SessionManagerClient")); if (args.getLength() > 0) { NamedValue v; @@ -273,7 +273,7 @@ sal_Bool SAL_CALL SessionListener::doRestore() css::uno::Reference< XDispatch > xDispatch(m_xSMGR->createInstance(SERVICENAME_AUTORECOVERY), UNO_QUERY_THROW); URL aURL; - aURL.Complete = OUString::createFromAscii("vnd.sun.star.autorecovery:/doSessionRestore"); + aURL.Complete = OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.autorecovery:/doSessionRestore")); css::uno::Reference< XURLTransformer > xURLTransformer(m_xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), UNO_QUERY_THROW); xURLTransformer->parseStrict(aURL); Sequence< PropertyValue > args; diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 446e3aa9015f..29746ee42ce6 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -101,10 +101,9 @@ #define REPLACELENGTH_LANGID 9 #define REPLACELENGTH_VLANG 8 #define REPLACELENGTH_WORKDIRURL 13 -// --> PB 2004-10-27 #i32656# - new variable of hierachy service +// New variable of hierachy service (#i32656#) #define REPLACELENGTH_BASEINSTURL 14 #define REPLACELENGTH_USERDATAURL 14 -// <-- // Name of the pre defined path variables #define VARIABLE_INST "$(inst)" @@ -124,10 +123,9 @@ #define VARIABLE_PROGURL "$(progurl)" #define VARIABLE_USERURL "$(userurl)" #define VARIABLE_WORKDIRURL "$(workdirurl)" -// --> PB 2004-10-27 #i32656# - new variable of hierachy service +// New variable of hierachy service (#i32656#) #define VARIABLE_BASEINSTURL "$(baseinsturl)" #define VARIABLE_USERDATAURL "$(userdataurl)" -// <-- using namespace com::sun::star::uno; using namespace com::sun::star::beans; @@ -214,10 +212,9 @@ static FixedVariable aFixedVarTable[] = { VARIABLE_PROGURL, PREDEFVAR_PROGURL, REPLACELENGTH_PROGURL }, { VARIABLE_USERURL, PREDEFVAR_USERURL, REPLACELENGTH_USERURL }, { VARIABLE_WORKDIRURL, PREDEFVAR_WORKDIRURL, REPLACELENGTH_WORKDIRURL }, // Special variable (transient) and don't use for resubstitution! - // --> PB 2004-10-27 #i32656# - new variable of hierachy service + // New variable of hierachy service (#i32656#) { VARIABLE_BASEINSTURL, PREDEFVAR_BASEINSTURL, REPLACELENGTH_BASEINSTURL }, { VARIABLE_USERDATAURL, PREDEFVAR_USERDATAURL, REPLACELENGTH_USERDATAURL }, - // <-- { "$(brandbaseurl)", PREDEFVAR_BRANDBASEURL, RTL_CONSTASCII_LENGTH("$(brandbaseurl)") } }; @@ -1198,16 +1195,14 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable // Set $(inst), $(instpath), $(insturl) aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTURL ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTPATH ]; aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INST ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTPATH ]; - // --> PB 2004-10-27 #i32656# - new variable of hierachy service + // New variable of hierachy service (#i32656#) aPreDefPathVariables.m_FixedVar[ PREDEFVAR_BASEINSTURL ]= aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTPATH ]; - // <-- // Set $(user), $(userpath), $(userurl) aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERURL ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERPATH ]; aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USER ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERPATH ]; - // --> PB 2004-11-11 #i32656# - new variable of hierachy service + // New variable of hierachy service (#i32656#) aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERDATAURL ]= aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERPATH ]; - // <-- // Detect the program directory // Set $(prog), $(progpath), $(progurl) diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx index 5a0c45fc9a48..641328f69be3 100644 --- a/framework/source/services/tabwindowservice.cxx +++ b/framework/source/services/tabwindowservice.cxx @@ -441,7 +441,7 @@ void TabWindowService::impl_checkTabIndex (::sal_Int32 nID) ) { throw css::lang::IndexOutOfBoundsException( - ::rtl::OUString::createFromAscii("Tab index out of bounds."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tab index out of bounds.")), css::uno::Reference< css::uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY )); } } @@ -455,7 +455,7 @@ TTabPageInfoHash::iterator TabWindowService::impl_getTabPageInfo(::sal_Int32 nID TTabPageInfoHash::iterator pIt = m_lTabPageInfos.find(nID); if (pIt == m_lTabPageInfos.end ()) throw css::lang::IndexOutOfBoundsException( - ::rtl::OUString::createFromAscii("Tab index out of bounds."), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tab index out of bounds.")), css::uno::Reference< css::uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY )); return pIt; } diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx index 16c5dae13072..01e52f0f30cd 100644 --- a/framework/source/services/urltransformer.cxx +++ b/framework/source/services/urltransformer.cxx @@ -350,7 +350,7 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException if ( !bWithPassword && aTestURL.Password.getLength() > 0 ) { // Exchange password text with other placeholder string - aTestURL.Password = ::rtl::OUString::createFromAscii( "<******>" ); + aTestURL.Password = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<******>")); assemble( aTestURL ); } diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index 51112cc6764e..24330148eb32 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -88,8 +88,7 @@ using namespace ::cppu; // Image sizes for our toolbars/menus const sal_Int32 IMAGE_SIZE_NORMAL = 16; const sal_Int32 IMAGE_SIZE_LARGE = 26; -const sal_Int16 MAX_IMAGETYPE_VALUE = ::com::sun::star::ui::ImageType::COLOR_HIGHCONTRAST| - ::com::sun::star::ui::ImageType::SIZE_LARGE; +const sal_Int16 MAX_IMAGETYPE_VALUE = ::com::sun::star::ui::ImageType::SIZE_LARGE; static const char IMAGE_FOLDER[] = "images"; static const char BITMAPS_FOLDER[] = "Bitmaps"; @@ -98,17 +97,13 @@ static const char IMAGE_EXTENSION[] = ".png"; static const char* IMAGELIST_XML_FILE[] = { "sc_imagelist.xml", - "lc_imagelist.xml", - "sch_imagelist.xml", - "lch_imagelist.xml" + "lc_imagelist.xml" }; static const char* BITMAP_FILE_NAMES[] = { "sc_userimages.png", - "lc_userimages.png", - "sch_userimages.png", - "lch_userimages.png" + "lc_userimages.png" }; namespace framework @@ -119,9 +114,7 @@ namespace framework static const char* ImageType_Prefixes[ImageType_COUNT] = { "res/commandimagelist/sc_", - "res/commandimagelist/lc_", - "res/commandimagelist/sch_", - "res/commandimagelist/lch_" + "res/commandimagelist/lc_" }; typedef GraphicNameAccess CmdToXGraphicNameAccess; @@ -427,8 +420,7 @@ static sal_Bool implts_checkAndScaleGraphic( uno::Reference< XGraphic >& rOutGra Size aSize = aImage.GetSizePixel(); bool bMustScale( false ); - if (( nImageType == ImageType_Color_Large ) || - ( nImageType == ImageType_HC_Large )) + if ( nImageType == ImageType_Color_Large ) bMustScale = ( aSize != aLargeSize ); else bMustScale = ( aSize != aNormSize ); @@ -450,8 +442,6 @@ static sal_Int16 implts_convertImageTypeToIndex( sal_Int16 nImageType ) sal_Int16 nIndex( 0 ); if ( nImageType & ::com::sun::star::ui::ImageType::SIZE_LARGE ) nIndex += 1; - if ( nImageType & ::com::sun::star::ui::ImageType::COLOR_HIGHCONTRAST ) - nIndex += 2; return nIndex; } @@ -473,11 +463,11 @@ void ImageManagerImpl::implts_initialize() try { - m_xUserImageStorage = m_xUserConfigStorage->openStorageElement( OUString::createFromAscii( IMAGE_FOLDER ), + m_xUserImageStorage = m_xUserConfigStorage->openStorageElement( OUString(RTL_CONSTASCII_USTRINGPARAM( IMAGE_FOLDER )), nModes ); if ( m_xUserImageStorage.is() ) { - m_xUserBitmapsStorage = m_xUserImageStorage->openStorageElement( OUString::createFromAscii( BITMAPS_FOLDER ), + m_xUserBitmapsStorage = m_xUserImageStorage->openStorageElement( OUString(RTL_CONSTASCII_USTRINGPARAM( BITMAPS_FOLDER )), nModes ); } } @@ -1367,11 +1357,11 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException { long nModes = ElementModes::READWRITE; - uno::Reference< XStorage > xUserImageStorage = Storage->openStorageElement( OUString::createFromAscii( IMAGE_FOLDER ), + uno::Reference< XStorage > xUserImageStorage = Storage->openStorageElement( OUString(RTL_CONSTASCII_USTRINGPARAM( IMAGE_FOLDER )), nModes ); if ( xUserImageStorage.is() ) { - uno::Reference< XStorage > xUserBitmapsStorage = xUserImageStorage->openStorageElement( OUString::createFromAscii( BITMAPS_FOLDER ), + uno::Reference< XStorage > xUserBitmapsStorage = xUserImageStorage->openStorageElement( OUString(RTL_CONSTASCII_USTRINGPARAM( BITMAPS_FOLDER )), nModes ); for ( sal_Int32 i = 0; i < ImageType_COUNT; i++ ) { diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx index 823afbcb764f..e030cb380938 100644 --- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx +++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx @@ -169,7 +169,7 @@ RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "Modul m_xDefaultCfgRootStorage = Reference< XStorage >( xStorageFactory->createInstanceWithArguments( aArgs ), UNO_QUERY_THROW ); Reference < XOutputStream > xTempOut( m_xServiceManager->createInstance ( - ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile")) ), UNO_QUERY ); Reference< XPackageStructureCreator > xPackageStructCreator( m_xServiceManager->createInstance( diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index fb8418dbb04e..70441c252e40 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -828,8 +828,8 @@ void SAL_CALL ModuleUIConfigurationManager::initialize( const Sequence< Any >& a if ( !m_bInitialized ) { ::comphelper::SequenceAsHashMap lArgs(aArguments); - m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("ModuleIdentifier"), ::rtl::OUString()); - m_aModuleShortName = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("ModuleShortName"), ::rtl::OUString()); + m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleIdentifier")), ::rtl::OUString()); + m_aModuleShortName = lArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleShortName")), ::rtl::OUString()); for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ ) { @@ -1390,7 +1390,7 @@ Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getShortCutManage Reference< XInitialization > xInit (xManager, UNO_QUERY_THROW); PropertyValue aProp; - aProp.Name = ::rtl::OUString::createFromAscii("ModuleIdentifier"); + aProp.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleIdentifier")); aProp.Value <<= aModule; Sequence< Any > lArgs(1); diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index 6a839fa55ebb..b5081693fa7d 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -452,7 +452,7 @@ UICategoryDescription::UICategoryDescription( const Reference< XMultiServiceFact // insert generic categories mappings m_aModuleToCommandFileMap.insert( ModuleToCommandFileMap::value_type( - rtl::OUString::createFromAscii( GENERIC_MODULE_NAME ), aGenericCategories )); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( GENERIC_MODULE_NAME )), aGenericCategories )); UICommandsHashMap::iterator pCatIter = m_aUICommandsHashMap.find( aGenericCategories ); if ( pCatIter != m_aUICommandsHashMap.end() ) diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index 01b5511f19cb..e784f560c6b5 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -1107,7 +1107,7 @@ Reference< XInterface > SAL_CALL UIConfigurationManager::getShortCutManager() th Reference< XInitialization > xInit (xAccConfig, UNO_QUERY_THROW); PropertyValue aProp; - aProp.Name = ::rtl::OUString::createFromAscii("DocumentRoot"); + aProp.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentRoot")); aProp.Value <<= xDocumentRoot; Sequence< Any > lArgs(1); diff --git a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx index 54bd1422f209..cb221f0bcfab 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx @@ -803,8 +803,8 @@ void UIConfigurationManagerImpl::initialize( const Sequence< Any >& aArguments ) if ( !m_bInitialized ) { ::comphelper::SequenceAsHashMap lArgs(aArguments); - m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("ModuleIdentifier"), ::rtl::OUString()); - m_aModuleShortName = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("ModuleShortName"), ::rtl::OUString()); + m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleIdentifier")), ::rtl::OUString()); + m_aModuleShortName = lArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleShortName")), ::rtl::OUString()); for ( int i = 1; i < ::com::sun::star::ui::UIElementType::COUNT; i++ ) { @@ -1386,7 +1386,7 @@ Reference< XInterface > UIConfigurationManagerImpl::getShortCutManager() throw ( } // if ( m_bUseDefault ) else { - aProp.Name = ::rtl::OUString::createFromAscii("DocumentRoot"); + aProp.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentRoot")); aProp.Value <<= xDocumentRoot; } lArgs[0] <<= aProp; diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx index cc23cb2475b5..0adf1f1c8417 100644 --- a/framework/source/uiconfiguration/windowstateconfiguration.cxx +++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx @@ -1224,7 +1224,7 @@ void ConfigurationAccess_WindowState::impl_putPropertiesFromStruct( const Window sal_Int32 i( 0 ); sal_Int32 nCount( m_aPropArray.size() ); Sequence< PropertyValue > aPropSeq; - ::rtl::OUString aDelim( ::rtl::OUString::createFromAscii( "," )); + ::rtl::OUString aDelim( RTL_CONSTASCII_USTRINGPARAM(",") ); for ( i = 0; i < nCount; i++ ) { @@ -1374,7 +1374,14 @@ WindowStateConfiguration::WindowStateConfiguration( const Reference< XMultiServi UNO_QUERY ); Reference< XNameAccess > xEmptyNameAccess; Reference< XNameAccess > xNameAccess( m_xModuleManager, UNO_QUERY_THROW ); - Sequence< rtl::OUString > aElementNames = xNameAccess->getElementNames(); + Sequence< rtl::OUString > aElementNames; + try + { + aElementNames = xNameAccess->getElementNames(); + } + catch (::com::sun::star::uno::RuntimeException &) + { + } Sequence< PropertyValue > aSeq; ::rtl::OUString aModuleIdentifier; diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index 73514daf6ad0..6841066ab47a 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -142,25 +142,25 @@ 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 bHiContrast ) + BOOL bBigImage +) { Image aImage; if ( aImageId.getLength() > 0 ) { - aImage = framework::AddonsOptions().GetImageFromURL( aImageId, bBigImage, bHiContrast ); + aImage = framework::AddonsOptions().GetImageFromURL( aImageId, bBigImage ); if ( !!aImage ) return aImage; else - aImage = GetImageFromURL( rFrame, aImageId, bBigImage, bHiContrast ); + aImage = GetImageFromURL( rFrame, aImageId, bBigImage ); if ( !!aImage ) return aImage; } - aImage = framework::AddonsOptions().GetImageFromURL( aURL, bBigImage, bHiContrast ); + aImage = framework::AddonsOptions().GetImageFromURL( aURL, bBigImage ); if ( !aImage ) - aImage = GetImageFromURL( rFrame, aImageId, bBigImage, bHiContrast ); + aImage = GetImageFromURL( rFrame, aImageId, bBigImage ); return aImage; } @@ -215,11 +215,10 @@ void AddonsToolBarManager::RefreshImages() if ( pRuntimeItemData ) aImageId = pRuntimeItemData->aImageId; - m_pToolBar->SetItemImage( nId, RetrieveImage( m_xFrame, - aImageId, - aCommandURL, - bBigImages, - m_bIsHiContrast )); + m_pToolBar->SetItemImage( + nId, + RetrieveImage( m_xFrame, aImageId, aCommandURL, bBigImages ) + ); } } } @@ -298,7 +297,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue m_pToolBar->InsertItem( nId, aTitle ); - Image aImage = RetrieveImage( m_xFrame, aImageId, aURL, !m_bSmallSymbols, m_bIsHiContrast ); + Image aImage = RetrieveImage( m_xFrame, aImageId, aURL, !m_bSmallSymbols ); if ( !!aImage ) m_pToolBar->SetItemImage( nId, aImage ); @@ -508,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; @@ -520,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/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx index c57eb210b4fc..05c567251a45 100644 --- a/framework/source/uielement/buttontoolbarcontroller.cxx +++ b/framework/source/uielement/buttontoolbarcontroller.cxx @@ -282,7 +282,7 @@ throw (::com::sun::star::uno::RuntimeException) aArgs[0].Value <<= KeyModifier; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper(::rtl::OUString::createFromAscii("ButtonToolbarController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs); + UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ButtonToolbarController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs); xDispatch->dispatch( aTargetURL, aArgs ); } catch ( DisposedException& ) diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx index 2448f2004f98..f1d6291531da 100644 --- a/framework/source/uielement/complextoolbarcontroller.cxx +++ b/framework/source/uielement/complextoolbarcontroller.cxx @@ -157,7 +157,7 @@ throw ( RuntimeException ) pExecuteInfo->aTargetURL = aTargetURL; pExecuteInfo->aArgs = aArgs; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper(::rtl::OUString::createFromAscii("ComplexToolbarController")).log( + UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ComplexToolbarController"))).log( m_xServiceManager, m_xFrame, aTargetURL, diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 7cf66b62405a..6b2730195458 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -69,7 +69,6 @@ // Function-Id's #define RID_FMSHELL_CONVERSIONMENU (RID_FORMS_START + 4) #define RID_SVXIMGLIST_FMEXPL (RID_FORMS_START + 0) -#define RID_SVXIMGLIST_FMEXPL_HC (RID_FORMS_START + 2) // Forms - Ids, used to address images from image list #define SID_FMSLOTS_START (SID_SVX_START + 592) @@ -220,7 +219,6 @@ ControlMenuController::ControlMenuController( const ::com::sun::star::uno::Refer m_pResPopupMenu( 0 ) { const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - m_bWasHiContrast = rSettings.GetHighContrastMode(); m_bShowMenuImages = rSettings.GetUseImagesInMenus(); } @@ -235,7 +233,7 @@ void ControlMenuController::updateImagesPopupMenu( PopupMenu* pPopupMenu ) rtl::OUString aResName( RTL_CONSTASCII_USTRINGPARAM( "svx" )); ResMgr* pResMgr = ResMgr::CreateResMgr( rtl::OUStringToOString( aResName, RTL_TEXTENCODING_ASCII_US )); - ResId aResId( m_bWasHiContrast ? RID_SVXIMGLIST_FMEXPL_HC : RID_SVXIMGLIST_FMEXPL, *pResMgr ); + ResId aResId( RID_SVXIMGLIST_FMEXPL, *pResMgr ); aResId.SetRT( RSC_IMAGELIST ); if ( pResMgr->IsAvailable( aResId )) @@ -346,7 +344,7 @@ void ControlMenuController::impl_select(const Reference< XDispatch >& /*_xDispat Sequence<PropertyValue> aArgs; Reference< XDispatch > xDispatch = pIter->second; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper(::rtl::OUString::createFromAscii("ControlMenuController")).log(m_xServiceManager, m_xFrame, aURL, aArgs); + UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlMenuController"))).log(m_xServiceManager, m_xFrame, aURL, aArgs); if ( xDispatch.is() ) xDispatch->dispatch( aURL, aArgs ); } @@ -362,14 +360,11 @@ void SAL_CALL ControlMenuController::activate( const css::awt::MenuEvent& ) thro // 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(); sal_Bool bShowMenuImages = rSettings.GetUseImagesInMenus(); - sal_Bool bUpdateImages = (( m_bWasHiContrast != bIsHiContrast ) || ( bShowMenuImages != m_bShowMenuImages )); + sal_Bool bUpdateImages = (bShowMenuImages != m_bShowMenuImages); if ( bUpdateImages ) { - // The mode has changed or the complete menu so we have to retrieve all images again - m_bWasHiContrast = bIsHiContrast; m_bShowMenuImages = bShowMenuImages; VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( m_xPopupMenu ); diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx index 3ef69ce99276..3e9df2b5ae46 100644 --- a/framework/source/uielement/fontmenucontroller.cxx +++ b/framework/source/uielement/fontmenucontroller.cxx @@ -178,7 +178,7 @@ void FontMenuController::impl_select(const Reference< XDispatch >& _xDispatch,co { Sequence<PropertyValue> aArgs; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper(::rtl::OUString::createFromAscii("FontMenuController")).log( + UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FontMenuController"))).log( m_xServiceManager, m_xFrame, aTargetURL, diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx index 955b909891cd..b72dde21e33c 100644 --- a/framework/source/uielement/fontsizemenucontroller.cxx +++ b/framework/source/uielement/fontsizemenucontroller.cxx @@ -316,7 +316,7 @@ void FontSizeMenuController::impl_select(const Reference< XDispatch >& _xDispatc { Sequence<PropertyValue> aArgs; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper(::rtl::OUString::createFromAscii("FontSizeMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs); + UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FontSizeMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs); OSL_ENSURE(_xDispatch.is(),"FontSizeMenuController::impl_select: No dispatch"); if ( _xDispatch.is() ) _xDispatch->dispatch( aTargetURL, aArgs ); diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index 42f1acbb4ac0..18a0a772dd86 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -200,7 +200,7 @@ throw ( RuntimeException ) pExecuteInfo->aTargetURL = aTargetURL; pExecuteInfo->aArgs = aArgs; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper(::rtl::OUString::createFromAscii("GenericToolbarController")).log( m_xServiceManager, m_xFrame, aTargetURL, aArgs); + UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GenericToolbarController"))).log( m_xServiceManager, m_xFrame, aTargetURL, aArgs); Application::PostUserEvent( STATIC_LINK(0, GenericToolbarController , ExecuteHdl_Impl), pExecuteInfo ); } } diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx index fc99b77451c6..705dc9020b32 100644 --- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx @@ -136,9 +136,8 @@ ImageButtonToolbarController::ImageButtonToolbarController( ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand ) { sal_Bool bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() ); - sal_Bool bHiContrast( pToolbar->GetSettings().GetStyleSettings().GetHighContrastMode() ); - Image aImage = AddonsOptions().GetImageFromURL( aCommand, bBigImages, bHiContrast, sal_True ); + Image aImage = AddonsOptions().GetImageFromURL( aCommand, bBigImages, sal_True ); // Height will be controlled by scaling according to button height m_pToolbar->SetItemImage( m_nID, aImage ); diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index ec7f306cce03..c6cd2943a628 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -189,7 +189,7 @@ void LanguageSelectionMenuController::impl_select(const Reference< XDispatch >& { Sequence<PropertyValue> aArgs; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper( OUString::createFromAscii("LanguageSelectionMenuController")).log( m_xServiceManager, m_xFrame, aTargetURL, aArgs ); + UiEventLogHelper( OUString(RTL_CONSTASCII_USTRINGPARAM("LanguageSelectionMenuController"))).log( m_xServiceManager, m_xFrame, aTargetURL, aArgs ); xDispatch->dispatch( aTargetURL, aArgs ); } } diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index a668d4890986..485db0d26489 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -285,55 +285,55 @@ throw (::com::sun::star::uno::RuntimeException) { //set selected language as current language for selection String aSelectedLang = aLangMap[nId]; - aURL.Complete += OUString::createFromAscii(".uno:LanguageStatus?Language:string=Current_"); + aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LanguageStatus?Language:string=Current_")); aURL.Complete += aSelectedLang; } else if (nId == MID_LANG_SEL_NONE) { //set None as current language for selection - aURL.Complete += OUString::createFromAscii(".uno:LanguageStatus?Language:string=Current_LANGUAGE_NONE"); + aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LanguageStatus?Language:string=Current_LANGUAGE_NONE")); } else if (nId == MID_LANG_SEL_RESET) { // reset language attributes for selection - aURL.Complete += OUString::createFromAscii(".uno:LanguageStatus?Language:string=Current_RESET_LANGUAGES"); + aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LanguageStatus?Language:string=Current_RESET_LANGUAGES")); } else if (nId == MID_LANG_SEL_MORE) { //open the dialog "format/character" for current selection - aURL.Complete += OUString::createFromAscii(".uno:FontDialog?Language:string=*"); + aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FontDialog?Language:string=*")); } else if (MID_LANG_PARA_1 <= nId && nId <= MID_LANG_PARA_9) { //set selected language for current paragraph String aSelectedLang = aLangMap[nId]; - aURL.Complete += OUString::createFromAscii(".uno:LanguageStatus?Language:string=Paragraph_"); + aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LanguageStatus?Language:string=Paragraph_")); aURL.Complete += aSelectedLang; } else if (nId == MID_LANG_PARA_NONE) { //set None as language for current paragraph - aURL.Complete += OUString::createFromAscii(".uno:LanguageStatus?Language:string=Paragraph_LANGUAGE_NONE"); + aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LanguageStatus?Language:string=Paragraph_LANGUAGE_NONE")); } else if (nId == MID_LANG_PARA_RESET) { // reset language attributes for paragraph - aURL.Complete += OUString::createFromAscii(".uno:LanguageStatus?Language:string=Paragraph_RESET_LANGUAGES"); + aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LanguageStatus?Language:string=Paragraph_RESET_LANGUAGES")); } else if (nId == MID_LANG_PARA_MORE) { //open the dialog "format/character" for current paragraph - aURL.Complete += OUString::createFromAscii(".uno:FontDialogForParagraph"); + aURL.Complete += OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FontDialogForParagraph")); } - uno::Reference< util::XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( OUString::createFromAscii("com.sun.star.util.URLTransformer" )), uno::UNO_QUERY ); + uno::Reference< util::XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), uno::UNO_QUERY ); xURLTransformer->parseStrict( aURL ); uno::Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch(aURL, OUString(), 0); if( xDispatch.is() ) { uno::Sequence< beans::PropertyValue > aPV; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper( OUString::createFromAscii("ButtonToolbarController")).log(m_xServiceManager, m_xFrame, aURL, aPV); + UiEventLogHelper( OUString(RTL_CONSTASCII_USTRINGPARAM("ButtonToolbarController"))).log(m_xServiceManager, m_xFrame, aURL, aPV); xDispatch->dispatch( aURL, aPV); } } diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index 83ed615f1d80..986260ba4098 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -152,7 +152,7 @@ void MacrosMenuController::impl_select(const Reference< XDispatch >& /*_xDispatc pExecuteInfo->aTargetURL = aTargetURL; //pExecuteInfo->aArgs = aArgs; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper(::rtl::OUString::createFromAscii("MacrosMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, pExecuteInfo->aArgs); + UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MacrosMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, pExecuteInfo->aArgs); // xDispatch->dispatch( aTargetURL, aArgs ); Application::PostUserEvent( STATIC_LINK(0, MacrosMenuController , ExecuteHdl_Impl), pExecuteInfo ); } @@ -188,10 +188,8 @@ void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, USHORT startIt { const String aCmdBase = String::CreateFromAscii( ".uno:ScriptOrganizer?ScriptOrganizer.Language:string=" ); const String ellipsis = String::CreateFromAscii( "..." ); - const ::rtl::OUString providerKey = - ::rtl::OUString::createFromAscii("com.sun.star.script.provider.ScriptProviderFor" ); - const ::rtl::OUString languageProviderName = - ::rtl::OUString::createFromAscii("com.sun.star.script.provider.LanguageScriptProvider" ); + const ::rtl::OUString providerKey(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.provider.ScriptProviderFor")); + const ::rtl::OUString languageProviderName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.provider.LanguageScriptProvider")); USHORT itemId = startItemId; Reference< XContentEnumerationAccess > xEnumAccess = Reference< XContentEnumerationAccess >( m_xServiceManager, UNO_QUERY_THROW ); Reference< XEnumeration > xEnum = xEnumAccess->createContentEnumeration ( languageProviderName ); diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index d6a6c0473656..2effdc8d9026 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -188,13 +188,11 @@ const ::rtl::OUString aSpecialWindowCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno: const ::rtl::OUString UNO_COMMAND( RTL_CONSTASCII_USTRINGPARAM( ".uno:" )); -static sal_Int16 getImageTypeFromBools( sal_Bool bBig, sal_Bool bHighContrast ) +static sal_Int16 getImageTypeFromBools( sal_Bool bBig ) { sal_Int16 n( 0 ); if ( bBig ) n |= ::com::sun::star::ui::ImageType::SIZE_LARGE; - if ( bHighContrast ) - n |= ::com::sun::star::ui::ImageType::COLOR_HIGHCONTRAST; return n; } @@ -458,7 +456,7 @@ throw (RuntimeException) return; sal_Int16 nImageType = sal_Int16(); - sal_Int16 nCurrentImageType = getImageTypeFromBools( sal_False, m_bWasHiContrast ); + sal_Int16 nCurrentImageType = getImageTypeFromBools( sal_False ); if (( Event.aInfo >>= nImageType ) && ( nImageType == nCurrentImageType )) RequestImages(); @@ -869,20 +867,16 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu ) MenuManager::UpdateSpecialWindowMenu( pMenu,getServiceFactory(),m_aLock ); // Check if some modes have changed so we have to update our menu images - sal_Bool bIsHiContrast = rSettings.GetHighContrastMode(); sal_Int16 nSymbolsStyle = SvtMiscOptions().GetCurrentSymbolsStyle(); if ( m_bRetrieveImages || - m_bWasHiContrast != bIsHiContrast || bShowMenuImages != m_bShowMenuImages || nSymbolsStyle != m_nSymbolsStyle ) { - // The mode changed so we have to replace all images - m_bWasHiContrast = bIsHiContrast; m_bShowMenuImages = bShowMenuImages; m_bRetrieveImages = sal_False; m_nSymbolsStyle = nSymbolsStyle; - MenuManager::FillMenuImages(m_xFrame,pMenu,bIsHiContrast,bShowMenuImages); + MenuManager::FillMenuImages( m_xFrame, pMenu, bShowMenuImages ); } // Try to map commands to labels @@ -1145,7 +1139,7 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu ) { const sal_uInt32 nRef = Application::ReleaseSolarMutex(); if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper(::rtl::OUString::createFromAscii("MenuBarManager")).log(getServiceFactory(), m_xFrame, aTargetURL, aArgs); + UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MenuBarManager"))).log(getServiceFactory(), m_xFrame, aTargetURL, aArgs); xDispatch->dispatch( aTargetURL, aArgs ); Application::AcquireSolarMutex( nRef ); } @@ -1266,7 +1260,6 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF m_xDispatchProvider = rDispatchProvider; const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - m_bWasHiContrast = rSettings.GetHighContrastMode(); m_bShowMenuImages = rSettings.GetUseImagesInMenus(); m_bRetrieveImages = sal_False; @@ -1431,7 +1424,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF if ( bItemShowMenuImages && !pPopup->GetItemImage( ITEMID_ADDONLIST )) { Reference< XFrame > xTemp( rFrame ); - Image aImage = GetImageFromURL( xTemp, aItemCommand, FALSE, m_bWasHiContrast ); + Image aImage = GetImageFromURL( xTemp, aItemCommand, FALSE ); if ( !!aImage ) pPopup->SetItemImage( ITEMID_ADDONLIST, aImage ); } @@ -1461,14 +1454,14 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF if ( pMenuAttributes && pMenuAttributes->aImageId.getLength() > 0 ) { // Retrieve image id from menu attributes - aImage = GetImageFromURL( m_xFrame, aImageId, FALSE, m_bWasHiContrast ); + aImage = GetImageFromURL( m_xFrame, aImageId, FALSE ); } if ( !aImage ) { - aImage = GetImageFromURL( m_xFrame, aItemCommand, FALSE, m_bWasHiContrast ); + aImage = GetImageFromURL( m_xFrame, aItemCommand, FALSE ); if ( !aImage ) - aImage = AddonsOptions().GetImageFromURL( aItemCommand, FALSE, m_bWasHiContrast ); + aImage = AddonsOptions().GetImageFromURL( aItemCommand, FALSE ); } if ( !!aImage ) @@ -2066,9 +2059,6 @@ void MenuBarManager::Init(const Reference< XFrame >& rFrame,AddonMenu* pAddonMen getServiceFactory()->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.PopupMenuControllerFactory" ))), UNO_QUERY ); - const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - m_bWasHiContrast = rSettings.GetHighContrastMode(); - Reference< XStatusListener > xStatusListener; Reference< XDispatch > xDispatch; USHORT nItemCount = pAddonMenu->GetItemCount(); diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index a89daf163cf2..3c6404ae081b 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -94,7 +94,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE ( NewMenuController DEFINE_INIT_SERVICE ( NewMenuController, {} ) -void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImages, sal_Bool bHiContrast ) +void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImages ) { USHORT nItemCount = pPopupMenu->GetItemCount(); Image aImage; @@ -116,7 +116,7 @@ void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImage if ( aImageId.getLength() > 0 ) { - aImage = GetImageFromURL( xFrame, aImageId, FALSE, bHiContrast ); + aImage = GetImageFromURL( xFrame, aImageId, FALSE ); if ( !!aImage ) { bImageSet = sal_True; @@ -128,7 +128,7 @@ void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImage { String aCmd( pPopupMenu->GetItemCommand( nItemId ) ); if ( aCmd.Len() ) - aImage = GetImageFromURL( xFrame, aCmd, FALSE, bHiContrast ); + aImage = GetImageFromURL( xFrame, aCmd, FALSE ); if ( !!aImage ) pPopupMenu->SetItemImage( nItemId, aImage ); @@ -328,7 +328,6 @@ void NewMenuController::retrieveShortcutsFromConfiguration( NewMenuController::NewMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) : svt::PopupMenuControllerBase( xServiceManager ), m_bShowImages( sal_True ), - m_bHiContrast( sal_False ), m_bNewMenu( sal_False ), m_bModuleIdentified( sal_False ), m_bAcceleratorCfg( sal_False ), @@ -388,7 +387,7 @@ void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopup } if ( m_bShowImages ) - setMenuImages( pVCLPopupMenu, m_bShowImages, m_bHiContrast ); + setMenuImages( pVCLPopupMenu, m_bShowImages ); delete pSubMenu; } @@ -447,7 +446,7 @@ void SAL_CALL NewMenuController::select( const css::awt::MenuEvent& rEvent ) thr xURLTransformer->parseStrict( aTargetURL ); aArgsList[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Referer" )); - aArgsList[0].Value = makeAny( ::rtl::OUString::createFromAscii( SFX_REFERER_USER )); + aArgsList[0].Value = makeAny( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SFX_REFERER_USER ))); rtl::OUString aTargetFrame( m_aTargetFrame ); AddInfoForId::const_iterator pItem = m_aAddInfoForItem.find( rEvent.MenuId ); @@ -468,7 +467,7 @@ void SAL_CALL NewMenuController::select( const css::awt::MenuEvent& rEvent ) thr pNewDocument->aTargetURL = aTargetURL; pNewDocument->aArgSeq = aArgsList; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper(::rtl::OUString::createFromAscii("NewMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgsList); + UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NewMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgsList); Application::PostUserEvent( STATIC_LINK(0, NewMenuController, ExecuteHdl_Impl), pNewDocument ); } } @@ -483,17 +482,13 @@ void SAL_CALL NewMenuController::activate( const css::awt::MenuEvent& ) throw (R { const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); sal_Bool bShowImages( rSettings.GetUseImagesInMenus() ); - sal_Bool bHiContrast( rSettings.GetHighContrastMode() ); PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu(); - if (( m_bShowImages != bShowImages ) || - ( m_bHiContrast != bHiContrast )) + if ( m_bShowImages != bShowImages ) { m_bShowImages = bShowImages; - m_bHiContrast = bHiContrast; - - setMenuImages( pVCLPopupMenu, m_bShowImages, m_bHiContrast ); + setMenuImages( pVCLPopupMenu, m_bShowImages ); } setAccelerators( pVCLPopupMenu ); @@ -560,8 +555,6 @@ void SAL_CALL NewMenuController::initialize( const Sequence< Any >& aArguments ) const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); m_bShowImages = rSettings.GetUseImagesInMenus(); - m_bHiContrast = rSettings.GetHighContrastMode(); - m_bNewMenu = m_aCommandURL.equalsAscii( ".uno:AddDirect" ); } } diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx index ebe99722af25..dd009de823a8 100644 --- a/framework/source/uielement/objectmenucontroller.cxx +++ b/framework/source/uielement/objectmenucontroller.cxx @@ -154,7 +154,7 @@ void ObjectMenuController::impl_select(const Reference< XDispatch >& _xDispatch, { Sequence<PropertyValue> aArgs; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper(::rtl::OUString::createFromAscii("ObjectMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs); + UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ObjectMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs); OSL_ENSURE(_xDispatch.is(),"ObjectMenuController::impl_select: No dispatch"); if ( _xDispatch.is() ) _xDispatch->dispatch( aTargetURL, aArgs ); diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index 78186f94aac8..54fed3dfb0a8 100644 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -300,7 +300,7 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex ) aArgsList.realloc( NUM_OF_PICKLIST_ARGS ); aArgsList[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Referer" )); - aArgsList[0].Value = makeAny( ::rtl::OUString::createFromAscii( SFX_REFERER_USER )); + aArgsList[0].Value = makeAny( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SFX_REFERER_USER ))); // documents in the picklist will never be opened as templates aArgsList[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AsTemplate" )); @@ -325,7 +325,7 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex ) aArgsList[NUM_OF_PICKLIST_ARGS-1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" )); aArgsList[NUM_OF_PICKLIST_ARGS-1].Value <<= aFilter; - xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString::createFromAscii("_default"), 0 ); + xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_default")), 0 ); } if ( xDispatch.is() ) @@ -338,7 +338,7 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex ) pLoadRecentFile->aTargetURL = aTargetURL; pLoadRecentFile->aArgSeq = aArgsList; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper(::rtl::OUString::createFromAscii("RecentFilesMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgsList); + UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RecentFilesMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgsList); Application::PostUserEvent( STATIC_LINK(0, RecentFilesMenuController, ExecuteHdl_Impl), pLoadRecentFile ); } } diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index 03fe343a8102..a939b2c472f4 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -79,7 +79,7 @@ using namespace ::com::sun::star; #endif const sal_Int32 HELPID_PREFIX_LENGTH = 7; -static const char* HELPID_PREFIX = "helpid:"; +static const char HELPID_PREFIX[] = "helpid:"; // Property names of a menu/menu item ItemDescriptor static const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL"; diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 0821a55c75eb..edfbee532561 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -176,13 +176,11 @@ throw ( RuntimeException ) //***************************************************************************************************************** -static sal_Int16 getImageTypeFromBools( sal_Bool bBig, sal_Bool bHighContrast ) +static sal_Int16 getImageTypeFromBools( sal_Bool bBig ) { sal_Int16 n( 0 ); if ( bBig ) n |= ::com::sun::star::ui::ImageType::SIZE_LARGE; - if ( bHighContrast ) - n |= ::com::sun::star::ui::ImageType::COLOR_HIGHCONTRAST; return n; } @@ -239,7 +237,6 @@ ToolBarManager::ToolBarManager( const Reference< XMultiServiceFactory >& rServic ThreadHelpBase( &Application::GetSolarMutex() ), OWeakObject(), m_bDisposed( sal_False ), - m_bIsHiContrast( pToolBar->GetSettings().GetStyleSettings().GetHighContrastMode() ), m_bSmallSymbols( !SvtMiscOptions().AreCurrentSymbolsLarge() ), m_bModuleIdentified( sal_False ), m_bAddedToTaskPaneList( sal_True ), @@ -288,7 +285,7 @@ ToolBarManager::ToolBarManager( const Reference< XMultiServiceFactory >& rServic // enables a menu for clipped items and customization SvtCommandOptions aCmdOptions; USHORT nMenuType = TOOLBOX_MENUTYPE_CLIPPEDITEMS; - if ( !aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, ::rtl::OUString::createFromAscii( "CreateDialog" ))) + if ( !aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDialog")))) nMenuType |= TOOLBOX_MENUTYPE_CUSTOMIZE; //added for issue33668 by shizhoubo m_pToolBar->SetCommandHdl( LINK( this, ToolBarManager, Command ) ); @@ -369,21 +366,6 @@ void ToolBarManager::CheckAndUpdateImages() ResetableGuard aGuard( m_aLock ); sal_Bool bRefreshImages = sal_False; - // Check if high contrast/normal mode have changed - if ( m_pToolBar->GetSettings().GetStyleSettings().GetHighContrastMode() ) - { - if ( !m_bIsHiContrast ) - { - bRefreshImages = TRUE; - m_bIsHiContrast = sal_True; - } - } - else if ( m_bIsHiContrast ) - { - bRefreshImages = sal_True; - m_bIsHiContrast = sal_False; - } - SvtMiscOptions aMiscOptions; bool bCurrentSymbolsSmall = !aMiscOptions.AreCurrentSymbolsLarge(); if ( m_bSmallSymbols != bCurrentSymbolsSmall ) @@ -416,11 +398,11 @@ void ToolBarManager::RefreshImages() if ( nId > 0 ) { ::rtl::OUString aCommandURL = m_pToolBar->GetItemCommand( nId ); - Image aImage = GetImageFromURL( m_xFrame, aCommandURL, bBigImages, m_bIsHiContrast ); + Image aImage = GetImageFromURL( m_xFrame, aCommandURL, bBigImages ); // Try also to query for add-on images before giving up and use an // empty image. if ( !aImage ) - aImage = QueryAddonsImage( aCommandURL, bBigImages, m_bIsHiContrast ); + aImage = QueryAddonsImage( aCommandURL, bBigImages ); m_pToolBar->SetItemImage( nId, aImage ); } } @@ -764,8 +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(), - m_bIsHiContrast ); + SvtMiscOptions().AreCurrentSymbolsLarge() + ); if (( Event.aInfo >>= nImageType ) && ( nImageType == nCurrentImageType ) && @@ -1559,8 +1541,7 @@ void ToolBarManager::RequestImages() } sal_Bool bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() ); - m_bIsHiContrast = m_pToolBar->GetSettings().GetStyleSettings().GetHighContrastMode(); - sal_Int16 p = getImageTypeFromBools( SvtMiscOptions().AreCurrentSymbolsLarge(), m_bIsHiContrast ); + sal_Int16 p = getImageTypeFromBools( SvtMiscOptions().AreCurrentSymbolsLarge() ); if ( m_xDocImageManager.is() ) aDocGraphicSeq = m_xDocImageManager->getImages( p, aCmdURLSeq ); @@ -1581,7 +1562,7 @@ void ToolBarManager::RequestImages() // Try also to query for add-on images before giving up and use an // empty image. if ( !aImage ) - aImage = QueryAddonsImage( aCmdURLSeq[i], bBigImages, m_bIsHiContrast ); + aImage = QueryAddonsImage( aCmdURLSeq[i], bBigImages ); pIter->second.nImageInfo = 1; // mark image as module based } @@ -1836,10 +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, - m_bIsHiContrast )); + GetImageFromURL( m_xFrame, aCommandURL, sal_False ) + ); } else { @@ -2135,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 ) @@ -2156,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(); } @@ -2241,9 +2218,9 @@ IMPL_STATIC_LINK_NOINSTANCE( ToolBarManager, ExecuteHdl_Impl, ExecuteInfo*, pExe return 0; } -Image ToolBarManager::QueryAddonsImage( const ::rtl::OUString& aCommandURL, bool bBigImages, bool bHiContrast ) +Image ToolBarManager::QueryAddonsImage( const ::rtl::OUString& aCommandURL, bool bBigImages ) { - Image aImage = framework::AddonsOptions().GetImageFromURL( aCommandURL, bBigImages, bHiContrast ); + Image aImage = framework::AddonsOptions().GetImageFromURL( aCommandURL, bBigImages ); return aImage; } diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 52deaff461e8..f4288dc529f6 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -203,7 +203,7 @@ void ToolbarsMenuController::addCommand( const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); if ( rSettings.GetUseImagesInMenus() ) - aImage = GetImageFromURL( m_xFrame, rCommandURL, FALSE, rSettings.GetHighContrastMode() ); + aImage = GetImageFromURL( m_xFrame, rCommandURL, FALSE ); VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( rPopupMenu ); if ( pPopupMenu ) @@ -747,7 +747,7 @@ void SAL_CALL ToolbarsMenuController::select( const css::awt::MenuEvent& rEvent pExecuteInfo->aTargetURL = aTargetURL; pExecuteInfo->aArgs = aArgs; if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# - UiEventLogHelper(::rtl::OUString::createFromAscii("ToolbarsMenuController")).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs); + UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ToolbarsMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, aArgs); Application::PostUserEvent( STATIC_LINK(0, ToolbarsMenuController, ExecuteHdl_Impl), pExecuteInfo ); } } diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index fb6b1337f104..36aa8d15ecda 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -643,7 +643,7 @@ UICommandDescription::UICommandDescription( const Reference< XMultiServiceFactor { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UICommandDescription::UICommandDescription" ); Reference< XNameAccess > xEmpty; - rtl::OUString aGenericUICommand( ::rtl::OUString::createFromAscii( "GenericCommands" )); + rtl::OUString aGenericUICommand( RTL_CONSTASCII_USTRINGPARAM("GenericCommands") ); m_xGenericUICommands = new ConfigurationAccess_UICommand( aGenericUICommand, xEmpty, xServiceManager ); impl_fillElements("ooSetupFactoryCommandConfigRef"); diff --git a/framework/source/xml/acceleratorconfigurationwriter.cxx b/framework/source/xml/acceleratorconfigurationwriter.cxx index 7f7c8522c134..be48788fa3db 100644 --- a/framework/source/xml/acceleratorconfigurationwriter.cxx +++ b/framework/source/xml/acceleratorconfigurationwriter.cxx @@ -136,16 +136,16 @@ void AcceleratorConfigurationWriter::impl_ts_writeKeyCommandPair(const css::awt: pAttribs->AddAttribute(AL_ATTRIBUTE_URL , ATTRIBUTE_TYPE_CDATA, sCommand); if ((aKey.Modifiers & css::awt::KeyModifier::SHIFT) == css::awt::KeyModifier::SHIFT) - pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_SHIFT, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString::createFromAscii("true")); + pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_SHIFT, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true"))); if ((aKey.Modifiers & css::awt::KeyModifier::MOD1) == css::awt::KeyModifier::MOD1) - pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD1, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString::createFromAscii("true")); + pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD1, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true"))); if ((aKey.Modifiers & css::awt::KeyModifier::MOD2) == css::awt::KeyModifier::MOD2) - pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD2, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString::createFromAscii("true")); + pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD2, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true"))); if ((aKey.Modifiers & css::awt::KeyModifier::MOD3) == css::awt::KeyModifier::MOD3) - pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD3, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString::createFromAscii("true")); + pAttribs->AddAttribute(AL_ATTRIBUTE_MOD_MOD3, ATTRIBUTE_TYPE_CDATA, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true"))); xConfig->ignorableWhitespace(::rtl::OUString()); xConfig->startElement(AL_ELEMENT_ITEM, xAttribs); diff --git a/framework/source/xml/toolboxdocumenthandler.cxx b/framework/source/xml/toolboxdocumenthandler.cxx index a30c5a38b2ce..c7097253545f 100644 --- a/framework/source/xml/toolboxdocumenthandler.cxx +++ b/framework/source/xml/toolboxdocumenthandler.cxx @@ -188,15 +188,15 @@ OReadToolBoxDocumentHandler::OReadToolBoxDocumentHandler( const Reference< XInde } // pre-calculate a hash code for all style strings to speed up xml read process - m_nHashCode_Style_Radio = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_RADIO ).hashCode(); - m_nHashCode_Style_Auto = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_AUTO ).hashCode(); - m_nHashCode_Style_Left = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_LEFT ).hashCode(); - m_nHashCode_Style_AutoSize = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_AUTOSIZE ).hashCode(); - m_nHashCode_Style_DropDown = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_DROPDOWN ).hashCode(); - m_nHashCode_Style_Repeat = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_REPEAT ).hashCode(); - m_nHashCode_Style_DropDownOnly = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_DROPDOWNONLY ).hashCode(); - m_nHashCode_Style_Text = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_TEXT ).hashCode(); - m_nHashCode_Style_Image = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_IMAGE ).hashCode(); + m_nHashCode_Style_Radio = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_RADIO )).hashCode(); + m_nHashCode_Style_Auto = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_AUTO )).hashCode(); + m_nHashCode_Style_Left = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_LEFT )).hashCode(); + m_nHashCode_Style_AutoSize = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_AUTOSIZE )).hashCode(); + m_nHashCode_Style_DropDown = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_DROPDOWN )).hashCode(); + m_nHashCode_Style_Repeat = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_REPEAT )).hashCode(); + m_nHashCode_Style_DropDownOnly = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_DROPDOWNONLY )).hashCode(); + m_nHashCode_Style_Text = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_TEXT )).hashCode(); + m_nHashCode_Style_Image = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE_IMAGE )).hashCode(); m_bToolBarStartFound = sal_False; m_bToolBarEndFound = sal_False; diff --git a/framework/source/xml/xmlnamespaces.cxx b/framework/source/xml/xmlnamespaces.cxx index fb36edaf2793..2352192138b2 100644 --- a/framework/source/xml/xmlnamespaces.cxx +++ b/framework/source/xml/xmlnamespaces.cxx @@ -116,7 +116,7 @@ void XMLNamespaces::addNamespace( const ::rtl::OUString& aName, const ::rtl::OUS if ( aName.getLength() > index+1 ) { ::rtl::OUString aAttributeName = getNamespaceValue( aName.copy( 0, index ) ); - aAttributeName += ::rtl::OUString::createFromAscii( "^" ); + aAttributeName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("^")); aAttributeName += aName.copy( index+1 ); return aAttributeName; } @@ -147,7 +147,7 @@ void XMLNamespaces::addNamespace( const ::rtl::OUString& aName, const ::rtl::OUS if ( aNamespace.getLength() > 0 ) { aElementName = aNamespace; - aElementName += ::rtl::OUString::createFromAscii( "^" ); + aElementName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("^")); } else return aName; diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml b/framework/uiconfig/startmodule/menubar/menubar.xml index fac0b3c0815c..5ac4c3eb4b7c 100644 --- a/framework/uiconfig/startmodule/menubar/menubar.xml +++ b/framework/uiconfig/startmodule/menubar/menubar.xml @@ -76,7 +76,7 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:Credits"/> + <menu:menuitem menu:id=".uno:ShowCredits"/> <menu:menuitem menu:id=".uno:About"/> </menu:menupopup> </menu:menu> |