summaryrefslogtreecommitdiff
path: root/framework/inc
diff options
context:
space:
mode:
Diffstat (limited to 'framework/inc')
-rw-r--r--framework/inc/classes/addonmenu.hxx13
-rw-r--r--framework/inc/classes/addonsoptions.hxx4
-rw-r--r--framework/inc/classes/bmkmenu.hxx27
-rw-r--r--framework/inc/classes/checkediterator.hxx2
-rw-r--r--framework/inc/classes/menumanager.hxx7
-rw-r--r--framework/inc/classes/resource.hrc28
-rw-r--r--framework/inc/dispatch/interceptionhelper.hxx2
-rw-r--r--framework/inc/framework.hrc22
-rw-r--r--framework/inc/helper/imageproducer.hxx14
-rw-r--r--framework/inc/macros/debug/memorymeasure.hxx2
-rw-r--r--framework/inc/macros/xserviceinfo.hxx2
-rw-r--r--framework/inc/services/desktop.hxx4
-rw-r--r--framework/inc/services/substitutepathvars.hxx3
-rw-r--r--framework/inc/uiconfiguration/imagetype.hxx2
-rw-r--r--framework/inc/uielement/controlmenucontroller.hxx3
-rw-r--r--framework/inc/uielement/menubarmanager.hxx1
-rw-r--r--framework/inc/uielement/newmenucontroller.hxx3
-rw-r--r--framework/inc/uielement/toolbarmanager.hxx3
18 files changed, 71 insertions, 71 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,
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 09:30:31 +0000