summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sfx2/inc/imgmgr.hxx5
-rw-r--r--sfx2/source/dialog/cfg.src23
-rw-r--r--sfx2/source/dialog/dialog.hrc11
-rw-r--r--sfx2/source/dialog/makefile.mk7
-rw-r--r--sfx2/source/inc/helpid.hrc9
-rw-r--r--sfx2/source/toolbox/imgmgr.cxx35
6 files changed, 76 insertions, 14 deletions
diff --git a/sfx2/inc/imgmgr.hxx b/sfx2/inc/imgmgr.hxx
index 1ed6b97737f0..4ced9764ecc2 100644
--- a/sfx2/inc/imgmgr.hxx
+++ b/sfx2/inc/imgmgr.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: imgmgr.hxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: mba $ $Date: 2001-11-28 11:14:10 $
+ * last change: $Author: cd $ $Date: 2002-02-22 08:04:44 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -110,6 +110,7 @@ public:
Image GetImage(USHORT nId, SfxModule* pMod = 0) const;
void SetImages( ToolBox& rToolBox, SfxModule* );
void LockImage(USHORT nNewId, ToolBox *pBox);
+ Image MakeUserImage(USHORT nNewId, Image& aSourceImage );
Image GetImage(USHORT nId, SfxModule* pMod, BOOL bBig ) const;
// add images to configurable user list
diff --git a/sfx2/source/dialog/cfg.src b/sfx2/source/dialog/cfg.src
index 251c52ccbfea..f7802388765e 100644
--- a/sfx2/source/dialog/cfg.src
+++ b/sfx2/source/dialog/cfg.src
@@ -2,9 +2,9 @@
*
* $RCSfile: cfg.src,v $
*
- * $Revision: 1.25 $
+ * $Revision: 1.26 $
*
- * last change: $Author: rt $ $Date: 2002-02-19 21:12:25 $
+ * last change: $Author: cd $ $Date: 2002-02-22 08:07:53 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1598,6 +1598,25 @@ String STR_MENU
Text[ catalan ] = "Men";
Text[ finnish ] = "Valikko";
};
+
+String STR_TOOLBAR_SEPARATOR
+{
+ Text = "Trenner" ;
+ Text [ ENGLISH ] = "Separator" ;
+};
+
+String STR_TOOLBAR_SPACE
+{
+ Text = "Unsichtbarer Trenner" ;
+ Text [ ENGLISH ] = "Invisible separator" ;
+};
+
+String STR_FUNCTION_ALREADY_IN_TOOLBOX
+{
+ Text = "Die gewnschte Funktion ist bereits in der aktuellen Toolbar vorhanden." ;
+ Text [ ENGLISH ] = "The selected function is already in the current toolbox." ;
+};
+
// ********************************************************************** EOF
diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc
index b314d336ff2b..dc107d107172 100644
--- a/sfx2/source/dialog/dialog.hrc
+++ b/sfx2/source/dialog/dialog.hrc
@@ -2,9 +2,9 @@
*
* $RCSfile: dialog.hrc,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: tra $ $Date: 2001-12-11 08:15:31 $
+ * last change: $Author: cd $ $Date: 2002-02-22 08:07:53 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -95,7 +95,6 @@
#define BMP_COLLAPSED ( RC_DIALOG_BEGIN + 18)
#define BMP_EXPANDED ( RC_DIALOG_BEGIN + 19)
-
#define TP_CONFIG_ACCEL ( RC_DIALOG_BEGIN + 20)
#define TP_CONFIG_MENU ( RC_DIALOG_BEGIN + 21)
#define TP_CONFIG_STATBAR ( RC_DIALOG_BEGIN + 22)
@@ -185,6 +184,12 @@
#define MSG_ERROR_SEND_MAIL ( RC_DIALOG_BEGIN + 92 )
+#define STR_TOOLBAR_SEPARATOR ( RC_DIALOG_BEGIN + 93 )
+#define STR_TOOLBAR_SPACE ( RC_DIALOG_BEGIN + 94 )
+
+#define STR_FUNCTION_ALREADY_IN_TOOLBOX ( RC_DIALOG_BEGIN + 95 )
+
+
#endif // #ifndef _SFX_DIALOG_HRC
// eof ------------------------------------------------------------------------
diff --git a/sfx2/source/dialog/makefile.mk b/sfx2/source/dialog/makefile.mk
index daa6885039b8..c68232f17afc 100644
--- a/sfx2/source/dialog/makefile.mk
+++ b/sfx2/source/dialog/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.10 $
+# $Revision: 1.11 $
#
-# last change: $Author: fs $ $Date: 2001-10-01 16:34:57 $
+# last change: $Author: cd $ $Date: 2002-02-22 08:07:53 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -113,7 +113,8 @@ SLOFILES =\
$(SLO)$/tplpitem.obj \
$(SLO)$/partwnd.obj \
$(SLO)$/versdlg.obj \
- $(SLO)$/printopt.obj
+ $(SLO)$/printopt.obj \
+ $(SLO)$/cfgtreelstbox.obj
SRCFILES =\
about.src \
diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc
index 043346a6183c..712167987179 100644
--- a/sfx2/source/inc/helpid.hrc
+++ b/sfx2/source/inc/helpid.hrc
@@ -2,9 +2,9 @@
*
* $RCSfile: helpid.hrc,v $
*
- * $Revision: 1.15 $
+ * $Revision: 1.16 $
*
- * last change: $Author: pb $ $Date: 2001-10-29 07:08:39 $
+ * last change: $Author: cd $ $Date: 2002-02-22 08:08:51 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -366,6 +366,11 @@
#define HID_CLOSE_WARNING (HID_SFX_START + 299)
#define HID_DID_SAVE_PACKED_XML (HID_SFX_START + 300)
#define HID_HELP_TREELISTBOX_CONTENTS (HID_SFX_START + 301)
+#define HID_CUSTOMIZETOOLBOX (HID_SFX_START + 302)
+#define HID_CUSTOMIZETOOLBOX_FUNCTIONS (HID_SFX_START + 303)
+#define HID_CUSTOMIZETOOLBOX_TOOLBOX (HID_SFX_START + 304)
+
+
#define ACT_SFX_HID_END HID_HELP_TREELISTBOX_CONTENTS
diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx
index b57114f045be..b21a87a611f5 100644
--- a/sfx2/source/toolbox/imgmgr.cxx
+++ b/sfx2/source/toolbox/imgmgr.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: imgmgr.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: obo $ $Date: 2001-11-28 11:47:00 $
+ * last change: $Author: cd $ $Date: 2002-02-22 08:09:54 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -928,6 +928,37 @@ void SfxImageManager::LockImage( USHORT nId, ToolBox *pBox )
//-------------------------------------------------------------------------
+Image SfxImageManager::MakeUserImage( USHORT nId, Image& aImage )
+{
+ // Neue Images kommen aus der Office-Liste
+ if ( !pOffImageList || pOffImageList->GetImagePos( nId ) == IMAGELIST_IMAGE_NOTFOUND )
+ return Image();
+
+ // Das Image mu\s die richtige Gr"o\e haben
+ if ( aImage.GetSizePixel() == pImageList->GetImageSize() )
+ {
+ // Ist das Image schon vorhanden ?
+ ImageList *pUserImageList = pImp->pUserImageList;
+ if ( pUserImageList->GetImagePos( nId ) == IMAGELIST_IMAGE_NOTFOUND )
+ {
+ // Eine physikalische Kopie des Images in der User-Liste machen
+ pUserImageList->AddImage( nId, aImage );
+ if ( SfxMacroConfig::IsMacroSlot(nId) )
+ SfxMacroConfig::GetOrCreate()->RegisterSlotId( nId );
+
+ pImp->SetDefault( FALSE );
+ }
+
+ // In der Toolbox dieses neue Image benutzen, so da\s die Referenz
+ // auf die Quellliste wieder entfernt wird.
+ return pUserImageList->GetImage( nId );
+ }
+
+ return Image();
+}
+
+//-------------------------------------------------------------------------
+
void SfxImageManager::SetSymbolSet_Impl( sal_Int16 nNewSet )
{
if ( nNewSet != pData->nSet && pImageList )
generated by cgit (git 2.34.1) at 2025-02-22 06:49:25 +0000