summaryrefslogtreecommitdiff
path: root/framework/inc
diff options
context:
space:
mode:
Diffstat (limited to 'framework/inc')
-rw-r--r--framework/inc/classes/addonmenu.hxx35
-rw-r--r--framework/inc/classes/bmkmenu.hxx33
-rw-r--r--framework/inc/classes/resource.hrc30
-rw-r--r--framework/inc/framework.hrc24
-rw-r--r--framework/inc/helper/imageproducer.hxx16
5 files changed, 73 insertions, 65 deletions
diff --git a/framework/inc/classes/addonmenu.hxx b/framework/inc/classes/addonmenu.hxx
index 9a10738cae..d636536a3e 100644
--- a/framework/inc/classes/addonmenu.hxx
+++ b/framework/inc/classes/addonmenu.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -51,33 +51,34 @@ namespace framework
class AddonMenu : public PopupMenu
{
public:
- AddonMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
- ~AddonMenu();
+ AddonMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
+ ~AddonMenu();
protected:
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame;
};
class AddonMenuManager;
+
class AddonPopupMenu : public AddonMenu
{
public:
- ~AddonPopupMenu();
-
+ ~AddonPopupMenu();
+
// Check if command URL string has the unique prefix to identify addon popup menus
static sal_Bool IsCommandURLPrefix( const rtl::OUString& aCmdURL );
-
+
void SetCommandURL( const rtl::OUString& aCmdURL ) { m_aCommandURL = aCmdURL; }
const rtl::OUString& GetCommandURL() const { return m_aCommandURL; }
protected:
- void Initialize( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rAddonPopupMenuDefinition );
-
+ void Initialize( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rAddonPopupMenuDefinition );
+
private:
- AddonPopupMenu( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame );
+ AddonPopupMenu( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame );
+
+ rtl::OUString m_aCommandURL;
- rtl::OUString m_aCommandURL;
-
friend class AddonMenuManager;
};
@@ -92,9 +93,9 @@ class AddonMenuManager
static sal_Bool HasAddonMenuElements();
static sal_Bool HasAddonHelpMenuElements();
-
+
static sal_Bool IsAddonMenuId( USHORT nId ) { return (( nId >= ADDONMENU_ITEMID_START ) && ( nId < ADDONMENU_ITEMID_END )); }
-
+
// Check if the context string matches the provided xModel context
static sal_Bool IsCorrectContext( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rModel, const rtl::OUString& aContext );
@@ -103,7 +104,7 @@ class AddonMenuManager
// Create the Add-Ons menu
static AddonMenu* CreateAddonMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
-
+
// Merge the Add-Ons help menu items into the given menu bar at a defined pos
static void MergeAddonHelpMenu( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
MenuBar* pMergeMenuBar );
@@ -113,16 +114,16 @@ class AddonMenuManager
const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rModel,
USHORT nMergeAtPos,
MenuBar* pMergeMenuBar );
-
+
// Returns the next position to insert a menu item/sub menu
static USHORT GetNextPos( USHORT nPos );
-
+
// Build up the menu item and sub menu into the provided pCurrentMenu. The sub menus should be of type nSubMenuType.
static void BuildMenu( PopupMenu* pCurrentMenu,
MenuType nSubMenuType,
USHORT nInsPos,
USHORT& nUniqueMenuId,
- com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > aAddonMenuDefinition,
+ com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > aAddonMenuDefinition,
const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rModel );
diff --git a/framework/inc/classes/bmkmenu.hxx b/framework/inc/classes/bmkmenu.hxx
index 7c0a8608bc..840a2b753a 100644
--- a/framework/inc/classes/bmkmenu.hxx
+++ b/framework/inc/classes/bmkmenu.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -54,25 +54,28 @@ class BmkMenu_Impl;
class BmkMenu : public AddonMenu
{
public:
- enum BmkMenuType
- {
- BMK_NEWMENU,
- BMK_WIZARDMENU
- };
-
- BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
- BmkMenuType nType );
- ~BmkMenu();
-
- void Initialize(); // Synchrones Laden der Eintraege
+ enum BmkMenuType
+ {
+ BMK_NEWMENU,
+ BMK_WIZARDMENU
+ };
+
+ BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+ BmkMenuType nType
+ );
+
+ ~BmkMenu();
+
+ void Initialize(); // Synchrones Laden der Eintraege
protected:
BmkMenu::BmkMenuType m_nType;
- USHORT CreateMenuId();
+ USHORT CreateMenuId();
private:
- BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
- BmkMenuType, BmkMenu* pRoot );
+ BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+ BmkMenuType, BmkMenu* pRoot
+ );
BmkMenu_Impl* _pImp;
};
diff --git a/framework/inc/classes/resource.hrc b/framework/inc/classes/resource.hrc
index 5929b8b348..cc85041b41 100644
--- a/framework/inc/classes/resource.hrc
+++ b/framework/inc/classes/resource.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -69,19 +69,19 @@
#define RID_IMAGE_STATUSBAR_LOGO (RID_IMAGE_START+0)
// License Dialog
-#define DLG_LICENSE (RID_FWK_DIALOG_START+256)
-#define ML_LICENSE (RID_FWK_DIALOG_START+11)
-#define FT_INFO1 (RID_FWK_DIALOG_START+12)
-#define FT_INFO2 (RID_FWK_DIALOG_START+13)
-#define FT_INFO3 (RID_FWK_DIALOG_START+14)
-#define FT_INFO2_1 (RID_FWK_DIALOG_START+15)
-#define FT_INFO3_1 (RID_FWK_DIALOG_START+16)
-#define FL_DIVIDE (RID_FWK_DIALOG_START+17)
-#define PB_PAGEDOWN (RID_FWK_DIALOG_START+18)
-#define IMG_ARROW (RID_FWK_DIALOG_START+19)
-#define LICENSE_ACCEPT (RID_FWK_DIALOG_START+20)
-#define LICENSE_NOTACCEPT (RID_FWK_DIALOG_START+21)
-#define PB_DECLINE (RID_FWK_DIALOG_START+22)
-#define PB_ACCEPT (RID_FWK_DIALOG_START+23)
+#define DLG_LICENSE (RID_FWK_DIALOG_START+256)
+#define ML_LICENSE (RID_FWK_DIALOG_START+11)
+#define FT_INFO1 (RID_FWK_DIALOG_START+12)
+#define FT_INFO2 (RID_FWK_DIALOG_START+13)
+#define FT_INFO3 (RID_FWK_DIALOG_START+14)
+#define FT_INFO2_1 (RID_FWK_DIALOG_START+15)
+#define FT_INFO3_1 (RID_FWK_DIALOG_START+16)
+#define FL_DIVIDE (RID_FWK_DIALOG_START+17)
+#define PB_PAGEDOWN (RID_FWK_DIALOG_START+18)
+#define IMG_ARROW (RID_FWK_DIALOG_START+19)
+#define LICENSE_ACCEPT (RID_FWK_DIALOG_START+20)
+#define LICENSE_NOTACCEPT (RID_FWK_DIALOG_START+21)
+#define PB_DECLINE (RID_FWK_DIALOG_START+22)
+#define PB_ACCEPT (RID_FWK_DIALOG_START+23)
#endif
diff --git a/framework/inc/framework.hrc b/framework/inc/framework.hrc
index 86ad3f7470..396dbe51ae 100644
--- a/framework/inc/framework.hrc
+++ b/framework/inc/framework.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -30,19 +30,19 @@
#include "svl/solar.hrc"
-#define RID_FWK_START 260
+#define RID_FWK_START 260
-#define RID_GROUPS_OFFSET 32000
-#define RID_GROUPS_END 32767
+#define RID_GROUPS_OFFSET 32000
+#define RID_GROUPS_END 32767
#define RID_FWK_DIALOG_START_CORRECT (RID_FWK_START + 2048)
-#define DLG_FILTER_SELECT (RID_FWK_DIALOG_START_CORRECT + 0)
+#define DLG_FILTER_SELECT (RID_FWK_DIALOG_START_CORRECT + 0)
-#define STR_FILTER_DOWNLOAD (RID_FWK_START+0)
-#define STR_FILTER_CHOOSER (RID_FWK_START+1)
-#define STR_FILTER_OTHERS (RID_FWK_START+2)
-#define STR_FILTER_ZIPPED (RID_FWK_START+3)
+#define STR_FILTER_DOWNLOAD (RID_FWK_START+0)
+#define STR_FILTER_CHOOSER (RID_FWK_START+1)
+#define STR_FILTER_OTHERS (RID_FWK_START+2)
+#define STR_FILTER_ZIPPED (RID_FWK_START+3)
// ResIds for BackingWindow
#define DLG_BACKING (RID_FWK_DIALOG_START_CORRECT+100)
@@ -57,13 +57,7 @@
#define STR_BACKING_TPLREP 9
#define RES_BACKING_IMAGES (DLG_BACKING+1)
-#define RES_BACKING_IMAGES_HC (DLG_BACKING+2)
-#define BMP_BACKING_BACKGROUND_LEFT 1
-#define BMP_BACKING_BACKGROUND_MIDDLE 2
-#define BMP_BACKING_BACKGROUND_RIGHT 3
-#define BMP_BACKING_BACKGROUND_RTL_LEFT 4
-#define BMP_BACKING_BACKGROUND_RTL_RIGHT 5
#define BMP_BACKING_EXT 6
#define BMP_BACKING_REG 7
#define BMP_BACKING_INFO 8
diff --git a/framework/inc/helper/imageproducer.hxx b/framework/inc/helper/imageproducer.hxx
index 4bf4fc6138..573448cce4 100644
--- a/framework/inc/helper/imageproducer.hxx
+++ b/framework/inc/helper/imageproducer.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -40,11 +40,21 @@
namespace framework
{
-typedef Image ( *pfunc_getImage)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast );
+typedef Image ( *pfunc_getImage)(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+ const ::rtl::OUString& aURL,
+ BOOL bBig,
+ BOOL bHiContrast
+);
pfunc_getImage SAL_CALL SetImageProducer( pfunc_getImage pGetImageFunc );
-Image SAL_CALL GetImageFromURL( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast );
+Image SAL_CALL GetImageFromURL(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+ const ::rtl::OUString& aURL,
+ BOOL bBig,
+ BOOL bHiContrast
+);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-13 07:24:01 +0000