[Libreoffice-commits] .: 3 commits - filter/source sd/AllLangResTarget_sd.mk sd/source toolkit/src2xml
Ivan Timofeev
ivantimofeev at kemper.freedesktop.org
Mon Jan 16 22:12:45 PST 2012
filter/source/msfilter/msdffimp.cxx | 21
sd/AllLangResTarget_sd.mk | 4
sd/source/ui/app/accelids_tmpl.src | 54 -
sd/source/ui/app/menu_tmpl.src | 40 -
sd/source/ui/app/menuids2_tmpl.src | 981 -----------------------------------
sd/source/ui/app/menuids3_tmpl.src | 104 ---
sd/source/ui/app/menuids4_tmpl.src | 79 --
sd/source/ui/app/menuids_tmpl.src | 91 ---
sd/source/ui/app/menuportal_tmpl.src | 386 -------------
sd/source/ui/app/tbxww.cxx | 1
sd/source/ui/dlg/celltempl.src | 1
sd/source/ui/dlg/prltempl.cxx | 1
sd/source/ui/dlg/prltempl.src | 1
sd/source/ui/inc/celltempl.hrc | 1
sd/source/ui/inc/cfgids.hxx | 10
sd/source/ui/inc/enumdlg.hrc | 42 -
sd/source/ui/inc/prltempl.hrc | 1
sd/source/ui/inc/res_bmp.hrc | 105 ---
sd/source/ui/inc/tabtempl.hrc | 1
sd/source/ui/inc/tbx_ww.hrc | 29 -
toolkit/src2xml/src-sd.lst | 12
toolkit/src2xml/src.lst | 6
22 files changed, 13 insertions(+), 1958 deletions(-)
New commits:
commit 005d6524977bd51ce2f859b5ae5352a2fba68dd0
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date: Mon Jan 16 23:05:48 2012 +0400
fdo#43193: fix rotation of shapes in imported MS documents
This partially reverts commit 1fbbd6134573beedc72a3839d65b27dfc829f2fb.
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 7c4284f..9c6a719 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -4443,22 +4443,27 @@ SdrObject* SvxMSDffManager::ImportGroup( const DffRecordHeader& rHd, SvStream& r
rSt >> aRecHd;
if ( aRecHd.nRecType == DFF_msofbtSpContainer )
{
+ sal_Int32 nGroupRotateAngle = 0;
+ sal_Int32 nSpFlags = 0;
mnFix16Angle = 0;
if (!aRecHd.SeekToBegOfRecord(rSt))
return pRet;
-
pRet = ImportObj( rSt, pClientData, rClientRect, rGlobalChildRect, nCalledByGroup + 1, pShapeId );
if ( pRet )
{
+ nSpFlags = nGroupShapeFlags;
+ nGroupRotateAngle = mnFix16Angle;
+
Rectangle aClientRect( rClientRect );
+
Rectangle aGlobalChildRect;
if ( !nCalledByGroup || rGlobalChildRect.IsEmpty() )
aGlobalChildRect = GetGlobalChildAnchor( rHd, rSt, aClientRect );
else
aGlobalChildRect = rGlobalChildRect;
- if ( ( mnFix16Angle > 4500 && mnFix16Angle <= 13500 )
- || ( mnFix16Angle > 22500 && mnFix16Angle <= 31500 ) )
+ if ( ( nGroupRotateAngle > 4500 && nGroupRotateAngle <= 13500 )
+ || ( nGroupRotateAngle > 22500 && nGroupRotateAngle <= 31500 ) )
{
sal_Int32 nHalfWidth = ( aClientRect.GetWidth() + 1 ) >> 1;
sal_Int32 nHalfHeight = ( aClientRect.GetHeight() + 1 ) >> 1;
@@ -4509,18 +4514,18 @@ SdrObject* SvxMSDffManager::ImportGroup( const DffRecordHeader& rHd, SvStream& r
return pRet;
}
- if ( mnFix16Angle )
+ if ( nGroupRotateAngle )
{
- double a = mnFix16Angle * nPi180;
- pRet->NbcRotate( aClientRect.Center(), mnFix16Angle, sin( a ), cos( a ) );
+ double a = nGroupRotateAngle * nPi180;
+ pRet->NbcRotate( aClientRect.Center(), nGroupRotateAngle, sin( a ), cos( a ) );
}
- if ( nGroupShapeFlags & SP_FFLIPV ) // Vertical flip?
+ if ( nSpFlags & SP_FFLIPV ) // Vertical flip?
{ // BoundRect in aBoundRect
Point aLeft( aClientRect.Left(), ( aClientRect.Top() + aClientRect.Bottom() ) >> 1 );
Point aRight( aLeft.X() + 1000, aLeft.Y() );
pRet->NbcMirror( aLeft, aRight );
}
- if ( nGroupShapeFlags & SP_FFLIPH ) // Horizontal flip?
+ if ( nSpFlags & SP_FFLIPH ) // Horizontal flip?
{ // BoundRect in aBoundRect
Point aTop( ( aClientRect.Left() + aClientRect.Right() ) >> 1, aClientRect.Top() );
Point aBottom( aTop.X(), aTop.Y() + 1000 );
commit d8088c2262884e6a39f67879cbb808d588fde1fd
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date: Mon Jan 16 16:15:12 2012 +0400
sd: remove some unused defines
diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx
index 5c2b697..f562f4b 100644
--- a/sd/source/ui/app/tbxww.cxx
+++ b/sd/source/ui/app/tbxww.cxx
@@ -47,7 +47,6 @@
#include "res_bmp.hrc"
#include "sdresid.hxx"
#include "tbx_ww.hxx"
-#include "tbx_ww.hrc"
SFX_IMPL_TOOLBOX_CONTROL( SdTbxControl, TbxImageItem )
diff --git a/sd/source/ui/dlg/celltempl.src b/sd/source/ui/dlg/celltempl.src
index 9ee4b9c..80a4de7 100644
--- a/sd/source/ui/dlg/celltempl.src
+++ b/sd/source/ui/dlg/celltempl.src
@@ -25,7 +25,6 @@
*
************************************************************************/
-#include "enumdlg.hrc"
#include "celltempl.hrc"
#include <svx/dialogs.hrc>
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index f0d92c8..8f8e042 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -52,7 +52,6 @@
#include "sdresid.hxx"
#include "prltempl.hxx"
#include "prltempl.hrc"
-#include "enumdlg.hrc"
#include "bulmaper.hxx"
#include <svl/intitem.hxx>
#include <svx/svxgrahicitem.hxx>
diff --git a/sd/source/ui/dlg/prltempl.src b/sd/source/ui/dlg/prltempl.src
index d7251c0..e6d3410 100644
--- a/sd/source/ui/dlg/prltempl.src
+++ b/sd/source/ui/dlg/prltempl.src
@@ -25,7 +25,6 @@
*
************************************************************************/
-#include "enumdlg.hrc"
#include "prltempl.hrc"
#include <svx/dialogs.hrc>
TabDialog TAB_PRES_LAYOUT_TEMPLATE
diff --git a/sd/source/ui/inc/celltempl.hrc b/sd/source/ui/inc/celltempl.hrc
index ee3c596..3a22772 100644
--- a/sd/source/ui/inc/celltempl.hrc
+++ b/sd/source/ui/inc/celltempl.hrc
@@ -26,4 +26,3 @@
************************************************************************/
#include <sfx2/sfx.hrc>
#define TAB_CELL_TEMPLATE 910
-#define TAB_CONTROL 1
diff --git a/sd/source/ui/inc/enumdlg.hrc b/sd/source/ui/inc/enumdlg.hrc
deleted file mode 100644
index 5b3b4e1..0000000
--- a/sd/source/ui/inc/enumdlg.hrc
+++ /dev/null
@@ -1,42 +0,0 @@
-/*************************************************************************
- *
- * 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#define TP_ENUM_BULLET 943
-#define LB_STYLE 1
-#define GRP_STYLE 1
-#define FT_ENUM 1
-#define NUM_FLD_ENUM 1
-#define FT_PREVIEW_ENUM 2
-#define GRP_ENUM 3
-#define BTN_GET_BULLET 1
-#define CTL_BULLET_PREVIEW 1
-#define GRP_BULLET 2
-#define MTR_FLD_SIZE 1
-#define LB_BULLET_COLOR 2
-#define FT_BULLET_SIZE 3
-#define FT_BULLET_COLOR 4
-#define FT_SAMPLE 5
-#define TSB_USE_BULLET 1
diff --git a/sd/source/ui/inc/prltempl.hrc b/sd/source/ui/inc/prltempl.hrc
index 97529b7..1643ef2 100644
--- a/sd/source/ui/inc/prltempl.hrc
+++ b/sd/source/ui/inc/prltempl.hrc
@@ -28,4 +28,3 @@
/* #define TAB_PRES_LAYOUT_TEMPLATE RID_APP_START+??? */
#define TAB_PRES_LAYOUT_TEMPLATE 844
#define TAB_PRES_LAYOUT_TEMPLATE_BACKGROUND 846
-#define TAB_CONTROL 1
diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc
index 14b3b11..59b3aa4 100755
--- a/sd/source/ui/inc/res_bmp.hrc
+++ b/sd/source/ui/inc/res_bmp.hrc
@@ -32,40 +32,6 @@
// -----------
#define IMAGE_MASK_STDCOLOR Color{ Red = 0xff00; Green = 0x0000; Blue = 0xff00; }
-#define IMAGE_MASK_STDCOLOR_HC IMAGE_MASK_STDCOLOR
-#define IMAGE_STDBTN_COLOR_HC COL_LIGHTMAGENTA
-
-#define RID_ALIGNMENT RID_APP_START+1
-#define RID_ZOOM RID_APP_START+2
-#define RID_CONTROLS RID_APP_START+3
-#define RID_IMPRESS_DOCWINDOWICON RID_APP_START+4
-
-#define RID_ALIGNMENT_TBX RID_APP_START+5
-#define RID_ZOOM_TBX RID_APP_START+6
-#define RID_CHOOSE_MODE RID_APP_START+7
-#define RID_CHOOSE_MODE_TBX RID_APP_START+8
-
-#define RID_TEXT RID_APP_START+10
-#define RID_TEXT_TBX RID_APP_START+11
-#define RID_RECTANGLES RID_APP_START+12
-#define RID_RECTANGLES_TBX RID_APP_START+13
-#define RID_ELLIPSES RID_APP_START+14
-#define RID_ELLIPSES_TBX RID_APP_START+15
-#define RID_LINES RID_APP_START+16
-#define RID_LINES_TBX RID_APP_START+17
-#define RID_3D_OBJECTS RID_APP_START+18
-#define RID_3D_OBJECTS_TBX RID_APP_START+19
-#define RID_INSERT RID_APP_START+20
-#define RID_INSERT_TBX RID_APP_START+21
-#define RID_POSITION RID_APP_START+22
-#define RID_POSITION_TBX RID_APP_START+23
-#define RID_CONNECTORS RID_APP_START+24
-#define RID_CONNECTORS_TBX RID_APP_START+25
-#define RID_ARROWS RID_APP_START+26
-#define RID_ARROWS_TBX RID_APP_START+27
-#define RID_DRAW_DOCWINDOWICON RID_APP_START+28
-#define RID_GRAFFILTERS RID_APP_START+29
-#define RID_GRAFFILTERS_TBX RID_APP_START+30
// Bitmaps fuer Tree-ListBox im Effekte-TabDialog
#define BMP_PAGE RID_APP_START+42
@@ -96,50 +62,6 @@
// -----------------------------------------------------------------------------
// additional effects
-#define BMP_EFFECT_DISCARD_FROM_UL RID_APP_START+130
-#define BMP_EFFECT_DISCARD_FROM_UR RID_APP_START+131
-#define BMP_EFFECT_DISCARD_FROM_LR RID_APP_START+132
-#define BMP_EFFECT_DISCARD_FROM_LL RID_APP_START+133
-#define BMP_EFFECT_DISCARD_S_FROM_L RID_APP_START+134
-#define BMP_EFFECT_DISCARD_S_FROM_UL RID_APP_START+135
-#define BMP_EFFECT_DISCARD_S_FROM_T RID_APP_START+136
-#define BMP_EFFECT_DISCARD_S_FROM_UR RID_APP_START+137
-#define BMP_EFFECT_DISCARD_S_FROM_R RID_APP_START+138
-#define BMP_EFFECT_DISCARD_S_FROM_LR RID_APP_START+139
-#define BMP_EFFECT_DISCARD_S_FROM_B RID_APP_START+140
-#define BMP_EFFECT_DISCARD_S_FROM_LL RID_APP_START+141
-#define BMP_EFFECT_VERTICAL_CHECKERBOARD RID_APP_START+142
-#define BMP_EFFECT_HORIZONTAL_CHECKERBOARD RID_APP_START+143
-#define BMP_EFFECT_STRTCH_FROM_L RID_APP_START+144
-#define BMP_EFFECT_STRTCH_FROM_UL RID_APP_START+145
-#define BMP_EFFECT_STRTCH_FROM_T RID_APP_START+146
-#define BMP_EFFECT_STRTCH_FROM_UR RID_APP_START+147
-#define BMP_EFFECT_STRTCH_FROM_R RID_APP_START+148
-#define BMP_EFFECT_STRTCH_FROM_LR RID_APP_START+149
-#define BMP_EFFECT_STRTCH_FROM_B RID_APP_START+150
-#define BMP_EFFECT_STRTCH_FROM_LL RID_APP_START+151
-
-#define BMP_EFFECT_STRTCH_HORIZONTAL RID_APP_START+152
-#define BMP_EFFECT_STRTCH_VERTICAL RID_APP_START+153
-#define BMP_EFFECT_ROTATE_HORIZONTAL RID_APP_START+154
-#define BMP_EFFECT_ROTATE_VERTICAL RID_APP_START+155
-
-#define BMP_FOIL_21 RID_APP_START+156
-#define BMP_FOIL_22 RID_APP_START+157
-#define BMP_FOIL_23 RID_APP_START+158
-#define BMP_FOIL_24 RID_APP_START+159
-
-#define BMP_EFFECT_UNCOVER_TO_L RID_APP_START+165
-#define BMP_EFFECT_UNCOVER_TO_UL RID_APP_START+166
-#define BMP_EFFECT_UNCOVER_TO_T RID_APP_START+167
-#define BMP_EFFECT_UNCOVER_TO_UR RID_APP_START+168
-#define BMP_EFFECT_UNCOVER_TO_R RID_APP_START+169
-#define BMP_EFFECT_UNCOVER_TO_LR RID_APP_START+170
-#define BMP_EFFECT_UNCOVER_TO_B RID_APP_START+171
-#define BMP_EFFECT_UNCOVER_TO_LL RID_APP_START+172
-
-#define BMP_FOIL_NONE_H RID_SD_START+225
-#define BMP_WAIT_ICON_H RID_SD_START+229
#define BMP_FADE_EFFECT_INDICATOR RID_SD_START+331
@@ -258,17 +180,6 @@
#define RID_DRAW_OUTLINETEXTOBJ_POPUP RID_APP_START+95
#define RID_GRAPHIC_OUTLINETEXTOBJ_POPUP RID_APP_START+96
-/*
- * Pointer (Mauszeiger)
- */
-#define PTR_WATERCAN RID_APP_START+100
-#define PTR_PENCIL RID_APP_START+101
-
-
-/*
- * Globale Dialog-IDs
- */
-#define DLG_FONTWORK RID_APP_START+150
/*
* ResourceIDs fuer Toolboxen nicht aendern, ohne die Strings in
@@ -276,20 +187,6 @@
* Konfigurationsstring muessen dieselbe ResourceID haben!).
*/
-// --> Jetzt in cfgids.hxx
-/*
-#define _RID_DRAW_TOOLBOX RID_APP_START+200
-#define _RID_SLIDE_TOOLBOX RID_APP_START+201
-#define _RID_DRAW_OBJ_TOOLBOX RID_APP_START+202
-#define _RID_SLIDE_OBJ_TOOLBOX RID_APP_START+203
-#define _RID_BEZIER_TOOLBOX RID_APP_START+204
-#define _RID_TEXT_TOOLBOX RID_APP_START+205
-#define _RID_OUTLINE_TOOLBOX RID_APP_START+206
-#define _RID_DRAW_POLYLINEOBJ_POPUP RID_APP_START+207
-#define _RID_GLUEPOINTS_TOOLBOX RID_APP_START+208
-*/
-
-
#define RID_DRAW_SNAPOBJECT_POPUP RID_APP_START+390
#define RID_DRAW_GLUEPOINT_POPUP RID_APP_START+392
#define RID_DRAW_CONTROL_POPUP RID_APP_START+393
@@ -297,5 +194,3 @@
#define RID_GRAPHICSTYLEFAMILY RID_APP_START+395
#define RID_PRESENTATIONSTYLEFAMILY RID_APP_START+396
-#define RID_GRAPHICSCELLFAMILY RID_APP_START+397
-
diff --git a/sd/source/ui/inc/tabtempl.hrc b/sd/source/ui/inc/tabtempl.hrc
index 19fd910..07fa261 100644
--- a/sd/source/ui/inc/tabtempl.hrc
+++ b/sd/source/ui/inc/tabtempl.hrc
@@ -27,4 +27,3 @@
#include <sfx2/sfx.hrc>
/* #define TAB_TEMPLATE RID_APP_START+??? */
#define TAB_TEMPLATE 637
-#define TAB_CONTROL 1
diff --git a/sd/source/ui/inc/tbx_ww.hrc b/sd/source/ui/inc/tbx_ww.hrc
deleted file mode 100644
index 0189eec..0000000
--- a/sd/source/ui/inc/tbx_ww.hrc
+++ /dev/null
@@ -1,29 +0,0 @@
-/*************************************************************************
- *
- * 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#define TBX_ALIGNMENT 1
-#define TBX_ZOOM 1
-#define TBX_CONTROLS 1
diff --git a/toolkit/src2xml/src-sd.lst b/toolkit/src2xml/src-sd.lst
index dbd33ac..041f426 100644
--- a/toolkit/src2xml/src-sd.lst
+++ b/toolkit/src2xml/src-sd.lst
@@ -7,7 +7,6 @@
../../sd/source/ui/app/strings.src
../../sd/source/ui/app/menuids_tmpl.src
../../sd/source/ui/app/accel_tmpl.src
-../../sd/source/ui/app/tbx_ww.src
../../sd/source/ui/app/menuids3_tmpl.src
../../sd/source/ui/app/app.src
../../sd/source/ui/app/res_bmp.src
@@ -67,7 +66,6 @@
../../sd/unxlngi6.pro/misc/app/toolbox.src
../../sd/unxlngi6.pro/misc/app/sdstring.src
../../sd/unxlngi6.pro/misc/app/strings.src
-../../sd/unxlngi6.pro/misc/app/tbx_ww.src
../../sd/unxlngi6.pro/misc/app/app.src
../../sd/unxlngi6.pro/misc/app/res_bmp.src
../../sd/unxlngi6.pro/misc/app/pseudo.src
diff --git a/toolkit/src2xml/src.lst b/toolkit/src2xml/src.lst
index 1f170d8..d0aad01 100644
--- a/toolkit/src2xml/src.lst
+++ b/toolkit/src2xml/src.lst
@@ -63,7 +63,6 @@
../../sd/source/ui/app/strings.src
../../sd/source/ui/app/menuids_tmpl.src
../../sd/source/ui/app/accel_tmpl.src
-../../sd/source/ui/app/tbx_ww.src
../../sd/source/ui/app/menuids3_tmpl.src
../../sd/source/ui/app/app.src
../../sd/source/ui/app/res_bmp.src
commit b314b1296fa13abfcecbc6bb3a6b918096392d43
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date: Sun Jan 15 23:23:15 2012 +0400
sd: remove unused templates
diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index fd2225b..01486fa 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -96,12 +96,8 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\
))
$(eval $(call gb_SrsTarget_add_templates,sd/res,\
- sd/source/ui/app/menuids2_tmpl.src \
sd/source/ui/app/menuids3_tmpl.src \
- sd/source/ui/app/menuids4_tmpl.src \
sd/source/ui/app/menuids_tmpl.src \
- sd/source/ui/app/menuportal_tmpl.src \
- sd/source/ui/app/menu_tmpl.src \
sd/source/ui/app/popup2_tmpl.src \
sd/source/ui/app/tbxids_tmpl.src \
sd/source/ui/app/toolbox2_tmpl.src \
diff --git a/sd/source/ui/app/accelids_tmpl.src b/sd/source/ui/app/accelids_tmpl.src
deleted file mode 100644
index 0a3c33c..0000000
--- a/sd/source/ui/app/accelids_tmpl.src
+++ /dev/null
@@ -1,54 +0,0 @@
-/*************************************************************************
- *
- * 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-
-#ifndef _ACCELIDS_SRC
-#define _ACCELIDS_SRC
-
-#define AI( Id, c, bSh, bM1, bM2 ) \
- AcceleratorItem { Identifier = Id; \
- Key = KeyCode { Code = c ; \
- Shift = bSh ; Modifier1 = bM1 ; Modifier2 = bM2 ; }; };
-
-#define AIF( Id, f ) \
- AcceleratorItem { Identifier = Id; \
- Key = KeyCode { Function = f ; }; };
-
-#define KC( language, c, bSh, bM1, bM2 ) \
- Key[ language ] = KeyCode { Code = c ; \
- Shift = bSh ; Modifier1 = bM1 ; Modifier2 = bM2 ; };
-
-#define KCD( c, bSh, bM1, bM2 ) \
- Key = KeyCode { Code = c ; \
- Shift = bSh ; Modifier1 = bM1 ; Modifier2 = bM2 ; };
-
-#endif // _ACCELIDS_SRC
-
-
-
-
diff --git a/sd/source/ui/app/menu_tmpl.src b/sd/source/ui/app/menu_tmpl.src
deleted file mode 100644
index d4c6e27..0000000
--- a/sd/source/ui/app/menu_tmpl.src
+++ /dev/null
@@ -1,40 +0,0 @@
-/*************************************************************************
- *
- * 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#include "menuids.src"
-#include "menuids3.src"
-#ifndef SD_MENU
-#define SD_MENU RID_DRAW_DEFAULTMENU
-#include "menuids2.src"
-#endif
-
-#define DEFINE_SLOTID_FOR_NUMBER_BULLETS SID_OUTLINE_BULLET
-
-
-/*The application menu bar resource has become obsolete. You can now find the menu bar definition at:
-<project>/[simpress|sdraw]/menubar/menubar.xml.
-
-*/
diff --git a/sd/source/ui/app/menuids2_tmpl.src b/sd/source/ui/app/menuids2_tmpl.src
deleted file mode 100644
index cd126e8..0000000
--- a/sd/source/ui/app/menuids2_tmpl.src
+++ /dev/null
@@ -1,981 +0,0 @@
-/*************************************************************************
- *
- * 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _MENUIDS2_SRC
-#define _MENUIDS2_SRC
-#define MI(x) MenuItem { x };
-#define SEPARATOR MenuItem { Separator = TRUE; };
- // SubMenu-IDs
-#define MN_SUB_VIEW 91
-#define MN_SUB_TOOLBAR 92
-#define MN_SUB_GRAPHIC 93
-#define MN_SUB_SPELLING 94
-#define MN_SUB_TEMPLATES 95
-#define MN_SUB_POSITION 96
-#define MN_SUB_MASTERPAGE 97
-#define MN_SUB_SEND 98
-#define MN_SUB_FIELD 99
-#define MN_SUB_OUTPUT_QUALITY 100
-#define MN_SUB_PREVIEW_OUTPUT_QUALITY 101
-#define MN_SUB_GROUP 102
-#define MN_TEMPLATES 103
-#define MN_SUB_MASTER_LAYOUTS 104
-
- // Windowmenu-ID (wird in globlmn.hrc gebraucht)
-#ifndef MN_WIN
-#define MN_WIN
-#endif
- // Helpmenu-ID (wird in globlmn.hrc gebraucht)
-#ifndef MN_HELP
-#define MN_HELP
-#endif
- //
- // Datei-Menu
- //
-#define MN_NEWDOCDIRECT \
- MenuItem\
- {\
- Identifier = SID_NEWDOCDIRECT ; \
- HelpId = CMD_SID_NEWDOCDIRECT ; \
- Text [ en-US ] = "~New" ; \
- };
-
-#define MN_EXPORTDOC \
- MenuItem\
- {\
- Identifier = SID_EXPORTDOC ; \
- HelpId = CMD_SID_EXPORTDOC ; \
- Text [ en-US ] = "~Export..." ; \
- };
-
-#define MN_EXPORTPDF \
- MenuItem\
- {\
- Identifier = SID_EXPORTDOCASPDF ; \
- HelpId = CMD_SID_EXPORTDOCASPDF ; \
- Text [ en-US ] = "Export as PDF..." ; \
- };
-
-#define MNSUB_SEND \
- MenuItem\
- {\
- Identifier = MN_SUB_SEND ; \
- HelpID = HID_MN_SUB_SEND ; \
- Command = ".uno:SendMenu" ; \
- Text [ en-US ] = "Sen~d" ; \
- SubMenu = Menu\
- {\
- ItemList = \
- {\
- MI ( ITEM_FILE_MAIL_SENDDOC ) \
- MI ( ITEM_FILE_MAIL_SENDDOCASPDF ) \
- };\
- };\
- };
-
-#define MN_PAGESETUP \
- MenuItem\
- {\
- Identifier = SID_PAGESETUP ; \
- HelpId = CMD_SID_PAGESETUP ; \
- Text [ en-US ] = "~Page..." ; \
- };
- //
- // Bearbeiten-Menu
- //
-#define MN_EDIT \
- Identifier = 20 ; \
- HelpID = "what a hack!" ; \
- Command = ".uno:EditMenu"; \
- Text [ en-US ] = "~Edit" ; \
-
-#define MN_PASTE2 \
- MenuItem\
- {\
- Identifier = SID_PASTE2 ; \
- HelpId = CMD_SID_PASTE2 ; \
- Text [ en-US ] = "Paste ~Special..." ; \
- };
-
-#define MN_COPYOBJECTS \
- MenuItem\
- {\
- Identifier = SID_COPYOBJECTS ; \
- HelpId = CMD_SID_COPYOBJECTS ; \
- Text [ en-US ] = "Duplicat~e..." ; \
- };
-
-#define MN_POLYGON_MORPHING \
- MenuItem\
- {\
- Identifier = SID_POLYGON_MORPHING ; \
- HelpId = CMD_SID_POLYGON_MORPHING ; \
- Text [ en-US ] = "Cross-fading..." ; \
- };
-
-#define MN_MODIFY_FIELD \
- MenuItem\
- {\
- Identifier = SID_MODIFY_FIELD ; \
- HelpId = CMD_SID_MODIFY_FIELD ; \
- Text [ en-US ] = "F~ields..." ; \
- };
-
-#define MN_DELETE_LAYER \
- MenuItem\
- {\
- Identifier = SID_DELETE_LAYER ; \
- HelpId = CMD_SID_DELETE_LAYER ; \
- Text [ en-US ] = "Delete ~Layer..." ; \
- };
-
-#define MN_MANAGE_LINKS \
- MenuItem\
- {\
- Identifier = SID_MANAGE_LINKS ; \
- HelpId = CMD_SID_MANAGE_LINKS ; \
- Text [ en-US ] = "Lin~ks..." ; \
- };
- //
- // Ansicht-Menu
- //
-#define MN_VIEW \
- Identifier = 23 ; \
- HelpID = "what a hack!" ; \
- Command = ".uno:ViewMenu" ; \
- Text [ en-US ] = "~View" ; \
-
-#define MN_TOGGLETOOLBAR \
- MenuItem\
- {\
- Identifier = SID_TOGGLETOOLBAR ; \
- HelpId = CMD_SID_TOGGLETOOLBAR ; \
- Text [ en-US ] = "Main ~Toolbar" ; \
- };
-
-#define MN_TOGGLEOPTIONBAR \
- MenuItem\
- {\
- Identifier = SID_TOGGLEOPTIONBAR ; \
- HelpId = CMD_SID_TOGGLEOPTIONBAR ; \
- Text [ en-US ] = "Optio~n Bar" ; \
- };
-
-#define MN_TOGGLECOMMONTASKBAR \
- MenuItem\
- {\
- Identifier = SID_TOGGLECOMMONTASKBAR ; \
- HelpId = CMD_SID_TOGGLECOMMONTASKBAR ; \
- Text [ en-US ] = "~Presentation" ; \
- };
-
-#define MN_CUSTOMIZETOOLBOX \
- MenuItem\
- {\
- Identifier = SID_CUSTOMIZETOOLBOX ; \
- HelpId = CMD_SID_CUSTOMIZETOOLBOX ; \
- Text [ en-US ] = "Customi~ze..." ; \
- };
-
-#define MN_RULER \
- MenuItem\
- {\
- Identifier = SID_RULER ; \
- HelpId = CMD_SID_RULER ; \
- Command = ".uno:ShowRuler" ; \
- Text [ en-US ] = "~Rulers" ; \
- };
-
-#define MN_NOTESMODE \
- MenuItem\
- {\
- Identifier = SID_NOTESMODE ; \
- HelpId = CMD_SID_NOTESMODE ; \
- Check = TRUE ; \
- Text [ en-US ] = "~Notes View" ; \
- };
-
-#define MN_HANDOUTMODE \
- MenuItem\
- {\
- Identifier = SID_HANDOUTMODE ; \
- HelpId = CMD_SID_HANDOUTMODE ; \
- Check = TRUE ; \
- Text [ en-US ] = "~Handout View" ; \
- };
-
-#define MN_PREVIEW_WIN \
- MenuItem\
- {\
- Identifier = SID_PREVIEW_WIN ; \
- HelpId = CMD_SID_PREVIEW_WIN ; \
- Text [ en-US ] = "~Preview" ; \
- };
-
-#define MN_PAGEMODE \
- MenuItem\
- {\
- Identifier = SID_PAGEMODE ; \
- HelpId = CMD_SID_PAGEMODE ; \
- Check = TRUE ; \
- Text [ en-US ] = "S~lide" ; \
- };
-
-#define MN_SLIDE_MASTERPAGE \
- MenuItem\
- {\
- Identifier = SID_SLIDE_MASTERPAGE ; \
- HelpId = CMD_SID_SLIDE_MASTERPAGE ; \
- Check = TRUE ; \
- Text [ en-US ] = "~Slide Master" ; \
- };
-
-#define MN_TITLE_MASTERPAGE \
- MenuItem\
- {\
- Identifier = SID_TITLE_MASTERPAGE ; \
- HelpId = CMD_SID_TITLE_MASTERPAGE ; \
- Check = TRUE ; \
- Text [ en-US ] = "~Title" ; \
- };
-
-#define MN_NOTES_MASTERPAGE \
- MenuItem\
- {\
- Identifier = SID_NOTES_MASTERPAGE ; \
- HelpId = CMD_SID_NOTES_MASTERPAGE ; \
- Check = TRUE ; \
- Text [ en-US ] = "~Notes" ; \
- };
-
-#define MN_HANDOUT_MASTERPAGE \
- MenuItem\
- {\
- Identifier = SID_HANDOUT_MASTERPAGE ; \
- HelpId = CMD_SID_HANDOUT_MASTERPAGE ; \
- Check = TRUE ; \
- Text [ en-US ] = "~Handout" ; \
- };
-
-#define MN_LAYERMODE \
- MenuItem\
- {\
- Identifier = SID_LAYERMODE ; \
- HelpId = CMD_SID_LAYERMODE ; \
- Check = TRUE ; \
- Text [ en-US ] = "La~yer" ; \
- };
-
-#define MN_HEADERANDFOOTER \
- MenuItem\
- {\
- Identifier = SID_HEADER_AND_FOOTER ; \
- HelpId = CMD_SID_HEADER_AND_FOOTER ; \
- Text = "Kopf- und Fußzeile.."; \
- };
-
-#define MN_INSERT_PAGE_NUMBER \
- MenuItem\
- {\
- Identifier = SID_INSERT_PAGE_NUMBER ; \
- HelpId = CMD_SID_INSERT_PAGE_NUMBER ; \
- Text = "Seitenzahl..." ; \
- };
-
-#define MN_INSERT_DATE_AND_TIME \
- MenuItem\
- {\
- Identifier = SID_INSERT_DATE_TIME ; \
- HelpId = CMD_SID_INSERT_DATE_TIME ; \
- Text = "Datum und Uhrzeit..." ; \
- };
-
-#define MN_MASTER_LAYOUTS \
- MenuItem\
- {\
- Identifier = MN_SUB_MASTER_LAYOUTS ; \
- HelpId = HID_MN_SUB_MASTER_LAYOUTS; \
- Text = "Masterlayouts";\
- SubMenu = Menu\
- {\
- ItemList = \
- {\
- MenuItem\
- {\
- Identifier = SID_MASTER_LAYOUTS_SLIDE ; \
- HelpId = CMD_SID_MASTER_LAYOUTS_SLIDE ; \
- Text = "Masterlayout..." ; \
- };\
- MenuItem\
- {\
- Identifier = SID_MASTER_LAYOUTS_NOTES ; \
- HelpId = CMD_SID_MASTER_LAYOUTS_NOTES ; \
- Text = "Notizenmasterlayout..." ; \
- };\
- MenuItem\
- {\
- Identifier = SID_MASTER_LAYOUTS_HANDOUTS ; \
- HelpId = CMD_SID_MASTER_LAYOUTS_HANDOUTS ; \
- Text = "Handzettelmasterlayout..." ; \
- };\
- };\
- };\
- };
-
- //#define MNSUB_TOOLBAR \ -> menu.src
-#define MNSUB_VIEW \
- MenuItem\
- {\
- Identifier = MN_SUB_VIEW ; \
- HelpID = HID_MN_SUB_VIEW ; \
- Command = ".uno:WorkspaceMenu" ; \
- Text [ en-US ] = "Wor~kspace" ; \
- SubMenu = Menu\
- {\
- ItemList = \
- {\
- MN_DRAWINGMODE\
- MN_OUTLINEMODE\
- MN_DIAMODE\
- MN_NOTESMODE\
- MN_HANDOUTMODE\
- };\
- };\
- };
-
-#define MNSUB_MASTERPAGE \
- MenuItem\
- {\
- Identifier = MN_SUB_MASTERPAGE ; \
- HelpID = HID_MN_SUB_MASTERPAGE ; \
- Command = ".uno:MasterPageMenu" ; \
- Text [ en-US ] = "~Master" ; \
- SubMenu = Menu\
- {\
- ItemList = \
- {\
- MN_SLIDE_MASTERPAGE\
- MN_TITLE_MASTERPAGE\
- MN_NOTES_MASTERPAGE\
- MN_HANDOUT_MASTERPAGE\
- };\
- };\
- };
- //
- // Einfuegen-Menu
- //
-#define MN_INSERT \
- Identifier = 21 ; \
- HelpID = "what a hack" ; \
- Command = ".uno:InsertMenu" ; \
- Text [ en-US ] = "~Insert" ; \
-
-#define MN_INSERTPAGE \
- MenuItem\
- {\
- Identifier = SID_INSERTPAGE ; \
- HelpId = CMD_SID_INSERTPAGE ; \
- Text [ en-US ] = "Slid~e..." ; \
- };
-
-#define MN_INSERTPAGE_DRAW \
- MenuItem\
- {\
- Identifier = SID_INSERTPAGE ; \
- HelpId = CMD_SID_INSERTPAGE ; \
- Text [ en-US ] = "Slid~e" ; \
- };
-
-#define MN_DUPLICATE_PAGE \
- MenuItem\
- {\
- Identifier = SID_DUPLICATE_PAGE ; \
- HelpId = CMD_SID_DUPLICATE_PAGE ; \
- Text [ en-US ] = "D~uplicate Slide" ; \
- };
-
-#define MN_EXPAND_PAGE \
- MenuItem\
- {\
- Identifier = SID_EXPAND_PAGE ; \
- HelpId = CMD_SID_EXPAND_PAGE ; \
- Text [ en-US ] = "E~xpand Slide" ; \
- };
-
-#define MN_SUMMARY_PAGE \
- MenuItem\
- {\
- Identifier = SID_SUMMARY_PAGE ; \
- HelpId = CMD_SID_SUMMARY_PAGE ; \
- Text [ en-US ] = "Su~mmary Slide" ; \
- };
-
-#define MN_INSERTLAYER \
- MenuItem\
- {\
- Identifier = SID_INSERTLAYER ; \
- HelpId = CMD_SID_INSERTLAYER ; \
- Text [ en-US ] = "~Layer..." ; \
- };
-
-#define MN_INSERT_FLD_DATE_FIX \
- MenuItem\
- {\
- Identifier = SID_INSERT_FLD_DATE_FIX ; \
- HelpId = CMD_SID_INSERT_FLD_DATE_FIX ; \
- Text [ en-US ] = "~Date (fixed)" ; \
- };
-
-#define MN_INSERT_FLD_DATE_VAR \
- MenuItem\
- {\
- Identifier = SID_INSERT_FLD_DATE_VAR ; \
- HelpId = CMD_SID_INSERT_FLD_DATE_VAR ; \
- Text [ en-US ] = "Dat~e (variable)" ; \
- };
-
-#define MN_INSERT_FLD_TIME_FIX \
- MenuItem\
- {\
- Identifier = SID_INSERT_FLD_TIME_FIX ; \
- HelpId = CMD_SID_INSERT_FLD_TIME_FIX ; \
- Text [ en-US ] = "~Time (fixed)" ; \
- };
-
-#define MN_INSERT_FLD_TIME_VAR \
- MenuItem\
- {\
- Identifier = SID_INSERT_FLD_TIME_VAR ; \
- HelpId = CMD_SID_INSERT_FLD_TIME_VAR ; \
- Text [ en-US ] = "T~ime (variable)" ; \
- };
-
-#define MN_INSERT_FLD_PAGE \
- MenuItem\
- {\
- Identifier = SID_INSERT_FLD_PAGE ; \
- HelpId = CMD_SID_INSERT_FLD_PAGE ; \
- Text [ en-US ] = "~Page Number" ; \
- };
-
-#define MN_INSERT_FLD_FILE \
- MenuItem\
- {\
- Identifier = SID_INSERT_FLD_FILE ; \
- HelpId = CMD_SID_INSERT_FLD_FILE ; \
- Text [ en-US ] = "~File Name" ; \
- };
-
-#define MN_INSERT_FLD_AUTHOR \
- MenuItem\
- {\
- Identifier = SID_INSERT_FLD_AUTHOR ; \
- HelpId = CMD_SID_INSERT_FLD_AUTHOR ; \
- Text [ en-US ] = "~Author" ; \
- };
-
-#define MN_TWAIN_SELECT \
- MenuItem\
- {\
- Identifier = SID_TWAIN_SELECT ; \
- HelpId = CMD_SID_TWAIN_SELECT ; \
- Text [ en-US ] = "~Select Source..." ; \
- };
-
-#define MN_TWAIN_TRANSFER \
- MenuItem\
- {\
- Identifier = SID_TWAIN_TRANSFER ; \
- HelpId = CMD_SID_TWAIN_TRANSFER ; \
- Text [ en-US ] = "~Request..." ; \
- };
-
-#define MN_ATTR_TABLE \
- MenuItem\
- {\
- Identifier = SID_ATTR_TABLE ; \
- HelpId = CMD_SID_ATTR_TABLE ; \
- Text [ en-US ] = "Sp~readsheet" ; \
- };
-
-#define MN_INSERT_INSERT_GRAPHIC \
- MenuItem\
- {\
- ITEM_INSERT_INSERT_GRAPHIC\
- Text [ en-US ] = "From ~File..." ; \
- };
-
-#define MN_INSERT_INSERT_DIAGRAM \
- MenuItem\
- {\
- Identifier = SID_INSERT_DIAGRAM ; \
- HelpId = CMD_SID_INSERT_DIAGRAM ; \
- Text [ en-US ] = "Chart" ; \
- };
-
-#define MN_INSERT_FLOATINGFRAME \
- MenuItem\
- {\
- Identifier = SID_INSERT_FLOATINGFRAME ; \
- HelpId = CMD_SID_INSERT_FLOATINGFRAME ; \
- Text [ en-US ] = "Float~ing Frame..." ; \
- };
-
-#define MN_INSERTFILE \
- MenuItem\
- {\
- Identifier = SID_INSERTFILE ; \
- HelpId = CMD_SID_INSERTFILE ; \
- Text [ en-US ] = "~File..." ; \
- };
-
-#define MNSUB_FIELD \
- MenuItem\
- {\
- Identifier = MN_SUB_FIELD ; \
- HelpID = HID_MN_SUB_FIELD ; \
- Command = ".uno:FieldMenu" ; \
- Text [ en-US ] = "Fiel~ds" ; \
- SubMenu = Menu\
- {\
- ItemList = \
- {\
- MN_INSERT_FLD_DATE_FIX\
- MN_INSERT_FLD_DATE_VAR\
- MN_INSERT_FLD_TIME_FIX\
- MN_INSERT_FLD_TIME_VAR\
- SEPARATOR\
- MN_INSERT_FLD_AUTHOR\
- MN_INSERT_FLD_PAGE\
- MN_INSERT_FLD_FILE\
- };\
- };\
- };
-
-#define MNSUB_SCAN \
- ITEM_INSERT_TWAIN_MENU
-
-#define MNSUB_GRAPHIC \
- MenuItem\
- {\
- ITEM_INSERT_INSERT_GRAPHIC \
- };
-
-
- //
- // Format-Menu
- //
-#define MN_FORMAT \
- Identifier = 22 ; \
- HelpID = "what a hack!" ; \
- Command = ".uno:FormatMenu" ; \
- Text [ en-US ] = "F~ormat" ; \
-
-#define MN_TEXTATTR_DLG \
- MenuItem\
- {\
- Identifier = SID_TEXTATTR_DLG ; \
- HelpId = CMD_SID_TEXTATTR_DLG ; \
- Text [ en-US ] = "Te~xt..." ; \
- };
-
-#define MN_MEASURE_DLG \
- MenuItem\
- {\
- Identifier = SID_MEASURE_DLG ; \
- HelpId = CMD_SID_MEASURE_DLG ; \
- Text [ en-US ] = "Dimen~sions..." ; \
- };
-
-#define MN_CONNECTION_DLG \
- MenuItem\
- {\
- Identifier = SID_CONNECTION_DLG ; \
- HelpId = CMD_SID_CONNECTION_DLG ; \
- Text [ en-US ] = "~Connector..." ; \
- };
-
-#define MN_MODIFYLAYER \
- MenuItem\
- {\
- Identifier = SID_MODIFYLAYER ; \
- HelpId = CMD_SID_MODIFYLAYER ; \
- Text [ en-US ] = "~Layer..." ; \
- };
-
- // Seiten-Attribute
-#define MN_MODIFYPAGE \
- MenuItem\
- {\
- Identifier = SID_MODIFYPAGE ; \
- HelpId = CMD_SID_MODIFYPAGE ; \
- Text [ en-US ] = "Modify ~Layout..." ; \
- };
-
-#define MNSUB_TEMPLATES \
- MenuItem\
- {\
- Identifier = MN_SUB_TEMPLATES ; \
- HelpID = HID_MN_SUB_TEMPLATES ; \
- Command = ".uno:TemplatesMenu" ; \
- Text [ en-US ] = "Styl~es" ; \
- SubMenu = Menu\
- {\
- ItemList = \
- {\
- MI ( ITEM_FORMAT_TEMPLATECATALOG ) \
- MN_PRESENTATION_LAYOUT\
- };\
- };\
- };
-
- //
- // Extras-Menu
- //
-#define MN_EXTRAS \
- Identifier = ITEM_TOOLS_ID ; \
- HelpID = "what a hack!" ; \
- Command = ".uno:ToolsMenu" ; \
- Text [ en-US ] = "~Tools" ; \
-
- //
- // Praesentations-Menu
- //
-#define MN_SLIDESHOW \
- Identifier = 26 ; \
- HelpID = "what a hack!" ; \
- Command = ".uno:SlideShowMenu" ; \
- Text [ en-US ] = "~Slide Show" ; \
-
-#define MN_SPELLING \
- MenuItem\
- {\
- Identifier = SID_SPELL_DIALOG ; \
- HelpId = CMD_SID_SPELL_DIALOG ; \
- Text [ en-US ] = "~Check..." ; \
- };
-
-#define MN_AUTOSPELL_CHECK \
- MenuItem\
- {\
- Identifier = SID_AUTOSPELL_CHECK ; \
- HelpId = CMD_SID_AUTOSPELL_CHECK ; \
- Text [ en-US ] = "~AutoSpellcheck" ; \
- };
-
-#define MN_THESAURUS \
- MenuItem\
- {\
- Identifier = SID_THESAURUS ; \
- HelpId = CMD_SID_THESAURUS ; \
- Text [ en-US ] = "~Thesaurus..." ; \
- };
-
-#define MN_HYPHENATION \
- MenuItem\
- {\
- Identifier = SID_HYPHENATION ; \
- HelpId = CMD_SID_HYPHENATION ; \
- Text [ en-US ] = "~Hyphenation" ; \
- };
-
-#define MN_AUTO_CORRECT_DLG \
- MenuItem\
- {\
- Identifier = SID_AUTO_CORRECT_DLG ; \
- HelpId = CMD_SID_AUTO_CORRECT_DLG ; \
- Text [ en-US ] = "~AutoCorrect..." ; \
- };
-
-#define MN_PRESENTATION_DLG \
- MenuItem\
- {\
- Identifier = SID_PRESENTATION_DLG ; \
- HelpId = CMD_SID_PRESENTATION_DLG ; \
- Text [ en-US ] = "~Slide Show Settings..." ; \
- };
-
-#define MN_CUSTOMSHOW_DLG \
- MenuItem\
- {\
- Identifier = SID_CUSTOMSHOW_DLG ; \
- HelpId = CMD_SID_CUSTOMSHOW_DLG ; \
- Text [ en-US ] = "~Custom Slide Show..." ; \
- };
-
-#define MN_ANIMATION_OBJECTS \
- MenuItem\
- {\
- Identifier = SID_ANIMATION_OBJECTS ; \
- HelpId = CMD_SID_ANIMATION_OBJECTS ; \
- Text [ en-US ] = "~Animation" ; \
- };
-
-#define MN_ANIMATION_EFFECTS \
- MenuItem\
- {\
- Identifier = SID_ANIMATION_EFFECTS ; \
- HelpId = CMD_SID_ANIMATION_EFFECTS ; \
- Text [ en-US ] = "~Interaction..." ; \
- };
-
-#define MNSUB_SPELLING \
- MenuItem\
- {\
- Identifier = MN_SUB_SPELLING ; \
- HelpID = HID_MN_SUB_SPELLING ; \
- Command = ".uno:SpellingMenu" ; \
- Text [ en-US ] = "~Spellcheck" ; \
- SubMenu = Menu\
- {\
- ItemList = \
- {\
- MN_SPELLING\
- MN_AUTOSPELL_CHECK\
- };\
- };\
- };
- //
- // Aendern-Menu
- //
-#define MN_MODIFY \
- Identifier = 24 ; \
- HelpID = "what a hack!" ; \
- Command = ".uno:ModifyMenu" ; \
- Text [ en-US ] = "~Modify" ; \
-
-#define MN_MOREFRONT \
- MenuItem\
- {\
- Identifier = SID_MOREFRONT ; \
- HelpId = CMD_SID_MOREFRONT ; \
- Text [ en-US ] = "Bring ~Forward" ; \
- };
-
-#define MN_MOREBACK \
- MenuItem\
- {\
- Identifier = SID_MOREBACK ; \
- HelpId = CMD_SID_MOREBACK ; \
- Text [ en-US ] = "Send Back~ward" ; \
- };
-
-#define MN_BEFORE_OBJ \
- MenuItem\
- {\
- Identifier = SID_BEFORE_OBJ ; \
- HelpId = CMD_SID_BEFORE_OBJ ; \
- Text [ en-US ] = "In Front of ~Object" ; \
- };
-
-#define MN_BEHIND_OBJ \
- MenuItem\
- {\
- Identifier = SID_BEHIND_OBJ ; \
- HelpId = CMD_SID_BEHIND_OBJ ; \
- Text [ en-US ] = "Be~hind Object" ; \
- };
-
-#define MN_REVERSE_ORDER \
- MenuItem\
- {\
- Identifier = SID_REVERSE_ORDER ; \
- HelpId = CMD_SID_REVERSE_ORDER ; \
- Text [ en-US ] = "~Reverse" ; \
- };
-
-#define MN_BMPMASK \
- MenuItem\
- {\
- Identifier = SID_BMPMASK ; \
- HelpId = CMD_SID_BMPMASK ; \
- Text [ en-US ] = "~Eyedropper" ; \
- };
-
-#define MN_GALLERY \
- MenuItem\
- {\
- Identifier = SID_GALLERY; \
- HelpId = CMD_SID_GALLERY; \
- Text [ en-US ] = "~Gallery" ; \
- };
-
-#define MN_OUTPUT_QUALITY_COLOR \
- MenuItem\
- {\
- Identifier = SID_OUTPUT_QUALITY_COLOR ; \
- HelpId = CMD_SID_OUTPUT_QUALITY_COLOR ; \
- RadioCheck = TRUE ; \
- Text [ en-US ] = "~Color" ; \
- };
-
-#define MN_OUTPUT_QUALITY_GRAYSCALE \
- MenuItem\
- {\
- Identifier = SID_OUTPUT_QUALITY_GRAYSCALE ; \
- HelpId = CMD_SID_OUTPUT_QUALITY_GRAYSCALE ; \
- RadioCheck = TRUE ; \
- Text [ en-US ] = "~Grayscale" ; \
- };
-
-#define MN_OUTPUT_QUALITY_BLACKWHITE \
- MenuItem\
- {\
- Identifier = SID_OUTPUT_QUALITY_BLACKWHITE ; \
- HelpId = CMD_SID_OUTPUT_QUALITY_BLACKWHITE ; \
- RadioCheck = TRUE ; \
- Text [ en-US ] = "~Black and White" ; \
- };
-
-#define MN_OUTPUT_QUALITY_CONTRAST \
- MenuItem\
- {\
- Identifier = SID_OUTPUT_QUALITY_CONTRAST ; \
- HelpId = CMD_SID_OUTPUT_QUALITY_CONTRAST ; \
- RadioCheck = TRUE ; \
- Text [ en-US ] = "~High Contrast";\
- };
-
-#define MN_PREVIEW_QUALITY_COLOR \
- MenuItem\
- {\
- Identifier = SID_PREVIEW_QUALITY_COLOR ; \
- HelpId = CMD_SID_PREVIEW_QUALITY_COLOR ; \
- RadioCheck = TRUE ; \
- Text [ en-US ] = "~Color" ; \
- };
-
-#define MN_PREVIEW_QUALITY_GRAYSCALE \
- MenuItem\
- {\
- Identifier = SID_PREVIEW_QUALITY_GRAYSCALE ; \
- HelpId = CMD_SID_PREVIEW_QUALITY_GRAYSCALE ; \
- RadioCheck = TRUE ; \
- Text [ en-US ] = "~Grayscale" ; \
- };
-
-#define MN_PREVIEW_QUALITY_BLACKWHITE \
- MenuItem\
- {\
- Identifier = SID_PREVIEW_QUALITY_BLACKWHITE ; \
- HelpId = CMD_SID_PREVIEW_QUALITY_BLACKWHITE ; \
- RadioCheck = TRUE ; \
- Text [ en-US ] = "~Black and White" ; \
- };
-
-#define MN_PREVIEW_QUALITY_CONTRAST \
- MenuItem\
- {\
- Identifier = SID_PREVIEW_QUALITY_CONTRAST ; \
- HelpId = CMD_SID_PREVIEW_QUALITY_CONTRAST ; \
- RadioCheck = TRUE ; \
- Text [ en-US ] = "~High Contrast";\
- };
-
-#define MNSUB_POSITION \
- MenuItem\
- {\
- Identifier = MN_SUB_POSITION ; \
- HelpID = HID_MN_SUB_POSITION ; \
- Command = ".uno:ArrangeMenu" ; \
- Text [ en-US ] = "~Arrange" ; \
- SubMenu = Menu\
- {\
- ItemList = \
- {\
- MI ( ITEM_FORMAT_FRAME_TO_TOP ) \
- MN_MOREFRONT\
- MN_MOREBACK\
- MI ( ITEM_FORMAT_FRAME_TO_BOTTOM ) \
- SEPARATOR\
- MN_BEFORE_OBJ\
- MN_BEHIND_OBJ\
- SEPARATOR\
- MN_REVERSE_ORDER\
- };\
- };\
- };
-
-#define MNSUB_OBJECT_ALIGN \
- MenuItem\
- {\
- ITEM_FORMAT_OBJECT_ALIGN\
- SubMenu = Menu\
- {\
- ItemList = \
- {\
- MI ( ITEM_FORMAT_OBJECT_ALIGN_LEFT ) \
- MI ( ITEM_FORMAT_OBJECT_ALIGN_CENTER ) \
- MI ( ITEM_FORMAT_OBJECT_ALIGN_RIGHT ) \
- SEPARATOR\
- MI ( ITEM_FORMAT_OBJECT_ALIGN_UP ) \
- MI ( ITEM_FORMAT_OBJECT_ALIGN_MIDDLE ) \
- MI ( ITEM_FORMAT_OBJECT_ALIGN_DOWN ) \
- };\
- };\
- };
-
-#define MNSUB_OUTPUT_QUALITY \
- MenuItem\
- {\
- Identifier = MN_SUB_OUTPUT_QUALITY ; \
- HelpID = HID_MN_SUB_OUTPUT_QUALITY ; \
- Command = ".uno:DisplayQualityMenu" ; \
- SubMenu = Menu\
- {\
- ItemList = \
- {\
- MN_OUTPUT_QUALITY_COLOR\
- MN_OUTPUT_QUALITY_GRAYSCALE\
- MN_OUTPUT_QUALITY_BLACKWHITE\
- MN_OUTPUT_QUALITY_CONTRAST\
- };\
- };\
- Text [ en-US ] = "~Display Quality" ; \
- };
-
-#define MNSUB_PREVIEW_OUTPUT_QUALITY \
- MenuItem\
- {\
- Identifier = MN_SUB_PREVIEW_OUTPUT_QUALITY ; \
- HelpID = HID_MN_SUB_PREVIEW_OUTPUT_QUALITY ; \
- Command = ".uno:PreviewDisplayQualityMenu" ; \
- SubMenu = Menu\
- {\
- ItemList = \
- {\
- MN_PREVIEW_QUALITY_COLOR\
- MN_PREVIEW_QUALITY_GRAYSCALE\
- MN_PREVIEW_QUALITY_BLACKWHITE\
- MN_PREVIEW_QUALITY_CONTRAST\
- };\
- };\
- Text [ en-US ] = "Pre~view Mode" ; \
- };
-
-#endif // _MENUIDS2_SRC
-
diff --git a/sd/source/ui/app/menuids3_tmpl.src b/sd/source/ui/app/menuids3_tmpl.src
index 67fee7f..80456e4 100644
--- a/sd/source/ui/app/menuids3_tmpl.src
+++ b/sd/source/ui/app/menuids3_tmpl.src
@@ -139,107 +139,3 @@
HelpId = CMD_SID_HIDE_SLIDE ; \
Text [ en-US ] = "~Hide Slide" ; \
};
-
-#define MN_GROUP_IMPRESS \
- MenuItem\
- {\
- Identifier = SID_GROUP ; \
- HelpId = CMD_SID_GROUP ; \
- Text [ en-US ] = "~Group" ; \
- };
-
-#define MN_UNGROUP_IMPRESS \
- MenuItem\
- {\
- Identifier = SID_UNGROUP ; \
- HelpId = CMD_SID_UNGROUP ; \
- Text [ en-US ] = "~Ungroup" ; \
- };
-
-#define MN_ENTER_GROUP_IMPRESS \
- MenuItem\
- {\
- Identifier = SID_ENTER_GROUP ; \
- HelpId = CMD_SID_ENTER_GROUP ; \
- Text [ en-US ] = "~Edit Group" ; \
- };
-
-#define MN_LEAVE_GROUP_IMPRESS \
- MenuItem\
- {\
- Identifier = SID_LEAVE_GROUP ; \
- HelpId = CMD_SID_LEAVE_GROUP ; \
- Text [ en-US ] = "E~xit group" ; \
- };
-
-#define MNSUB_GROUP \
- MenuItem\
- {\
- Identifier = MN_SUB_GROUP ; \
- HelpID = HID_MN_SUB_GROUP ; \
- Command = ".uno:GroupMenu" ; \
- Text [ en-US ] = "~Group" ; \
- SubMenu = Menu\
- {\
- ItemList = \
- {\
- MN_GROUP_IMPRESS\
- MN_UNGROUP_IMPRESS\
- MN_ENTER_GROUP_IMPRESS\
- MN_LEAVE_GROUP_IMPRESS\
- };\
- };\
- };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sd/source/ui/app/menuids4_tmpl.src b/sd/source/ui/app/menuids4_tmpl.src
deleted file mode 100644
index 61a43aa..0000000
--- a/sd/source/ui/app/menuids4_tmpl.src
+++ /dev/null
@@ -1,79 +0,0 @@
-/*************************************************************************
- *
- * 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _MENUIDS4_SRC
-#define _MENUIDS4_SRC
-
-#ifndef _MENUIDS2_SRC
-#include "menuids2.src"
-#endif
-
-#define MNSUB_GRAPHIC_PORTAL \
- MenuItem\
- {\
- Identifier = MN_SUB_GRAPHIC ; \
- HelpID = HID_MN_SUB_GRAPHIC ; \
- Text [ en-US ] = "~Graphics" ; \
- SubMenu = Menu\
- {\
- ItemList = \
- {\
- MN_INSERT_INSERT_GRAPHIC\
- };\
- };\
- };
-#endif // _MENUIDS4_SRC
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sd/source/ui/app/menuids_tmpl.src b/sd/source/ui/app/menuids_tmpl.src
index 24d00b8..932eb2d 100644
--- a/sd/source/ui/app/menuids_tmpl.src
+++ b/sd/source/ui/app/menuids_tmpl.src
@@ -780,15 +780,6 @@
Text [ en-US ] = "Description..." ; \
};
- // Dia-Funktionen
-#define MN_REHEARSE_TIMINGS \
- MenuItem\
- {\
- Identifier = SID_REHEARSE_TIMINGS ; \
- HelpId = CMD_SID_REHEARSE_TIMINGS ; \
- Text [ en-US ] = "~Rehearse Timings" ; \
- };
-
#define MN_EFFECT \
MenuItem\
{\
@@ -1128,26 +1119,6 @@
Text [ en-US ] = "24 Bit ~True Colors" ; \
};
-#define MN_COLORRESOLUTION \
- MenuItem\
- {\
- Identifier = DUMMY + 4 ; \
- Command = ".uno:ColorResMenu" ; \
- SubMenu = Menu\
- {\
- ItemList = \
- {\
- MN_CONVERT_TO_1BIT_THRESHOLD\
- MN_CONVERT_TO_1BIT_MATRIX\
- MN_CONVERT_TO_4BIT_GRAYS\
- MN_CONVERT_TO_4BIT_COLORS\
- MN_CONVERT_TO_8BIT_GRAYS\
- MN_CONVERT_TO_8BIT_COLORS\
- MN_CONVERT_TO_24BIT\
- };\
- };\
- Text [ en-US ] = "~Color Resolution" ; \
- };
#define MNSUB_CONVERT \
MenuItem\
@@ -1220,65 +1191,3 @@
Text [ en-US ] = "Edit Style..." ; \
};
-#define MN_EDIT_HYPERLINK \
- MenuItem\
- {\
- Identifier = SID_EDIT_HYPERLINK ; \
- HelpId = CMD_SID_EDIT_HYPERLINK ; \
- Text [ en-US ] = "H~yperlink..." ; \
- };
-
-#define MN_POINT_EDITMODE \
- MenuItem\
- {\
- Identifier = SID_BEZIER_EDIT ; \
- HelpId = CMD_SID_BEZIER_EDIT ; \
- Text [ en-US ] = "Poi~nts";\
- };
-
-#define MN_GLUE_EDITMODE \
- MenuItem\
- {\
- Identifier = SID_GLUE_EDITMODE ; \
- HelpId = CMD_SID_GLUE_EDITMODE ; \
- Text [ en-US ] = "~Glue Points";\
- };
-
-#define MN_LAYER_EDITMODE \
- MenuItem\
- {\
- Identifier = DUMMY + 7 ; \
- Command = ".uno:LayerMenu" ; \
- Text [ en-US ] = "La~yer"; \
- SubMenu = Menu \
- {\
- ItemList = \
- {\
- MenuItem \
- {\
- Identifier = SID_INSERTLAYER ; \
- HelpId = CMD_SID_INSERTLAYER ; \
- Text [ en-US ] = "~Insert";\
- };\
- MenuItem \
- {\
- Identifier = SID_MODIFYLAYER ; \
- HelpId = CMD_SID_MODIFYLAYER ; \
- Text [ en-US ] = "~Modify";\
- };\
- MenuItem \
- {\
- Identifier = SID_DELETE_LAYER ; \
- HelpId = CMD_SID_DELETE_LAYER ; \
- Text [ en-US ] = "Delete";\
- };\
- MenuItem \
- {\
- Identifier = SID_RENAMELAYER ; \
- HelpId = CMD_SID_RENAMELAYER ; \
- Text [ en-US ] = "~Rename";\
- }; \
- };\
- };\
- };
-
diff --git a/sd/source/ui/app/menuportal_tmpl.src b/sd/source/ui/app/menuportal_tmpl.src
deleted file mode 100644
index 9865bfa..0000000
--- a/sd/source/ui/app/menuportal_tmpl.src
+++ /dev/null
@@ -1,386 +0,0 @@
-/*************************************************************************
- *
- * 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#include "menuids.src"
-#include "menuids3.src"
-#include "menuids4.src"
-#ifndef SD_MENU_PORTAL
-#define SD_MENU_PORTAL RID_DRAW_PORTALMENU
-#include "menuids2.src"
-#endif
-
-#define DEFINE_SLOTID_FOR_NUMBER_BULLETS SID_OUTLINE_BULLET
-
-Menu SD_MENU_PORTAL
-{
- ItemList =
- {
- //
- // Datei-Menu
- //
- MenuItem
- {
- ITEM_FILE_PICKLIST
- SubMenu = Menu
- {
- ItemList =
- {
- MN_NEWDOCDIRECT
- MI ( ITEM_FILE_OPENDOC )
- ITEM_FILE_AUTOPILOT
- SEPARATOR
- MI ( ITEM_FILE_CLOSEDOC )
- MI ( ITEM_FILE_SAVEDOC )
- MI ( ITEM_FILE_SAVEASDOC )
- MI ( ITEM_FILE_SAVEDOCS )
- MI ( ITEM_FILE_LASTVERSIONDOC )
- MI ( ITEM_FILE_VERSIONDIALOG )
- SEPARATOR
- MN_EXPORTDOC
- MNSUB_SEND
- SEPARATOR
- MI ( ITEM_FILE_DOCINFO )
- MI ( ITEM_FILE_DOCTEMPLATE )
- SEPARATOR
- MI ( ITEM_FILE_PRINTDOC )
- MI ( ITEM_FILE_SETUPPRINTER )
- SEPARATOR
- MI ( ITEM_FILE_LOGOUT )
- };
- };
- };
- //
- // Bearbeiten-Menu
- //
- MenuItem
- {
- MN_EDIT
- SubMenu = Menu
- {
- ItemList =
- {
- MI ( ITEM_EDIT_UNDO )
- MI ( ITEM_EDIT_REDO )
- MI ( ITEM_EDIT_REPEAT )
- SEPARATOR
- MI ( ITEM_EDIT_CUT )
- MI ( ITEM_EDIT_COPY )
- MI ( ITEM_EDIT_PASTE )
- MN_PASTE2
- MI ( ITEM_EDIT_SELECTALL )
- SEPARATOR
- MI ( ITEM_EDIT_SEARCH_DLG )
- MI ( ITEM_EDIT_NAVIGATOR )
- SEPARATOR
- MN_COPYOBJECTS
-#if SD_MENU_PORTAL != RID_DRAW_PORTALMENU
- MN_POLYGON_MORPHING
-#endif
- MN_MODIFY_FIELD
- MN_DELETE_PAGE
-#if SD_MENU_PORTAL != RID_DRAW_PORTALMENU
- MN_DELETE_LAYER
-#endif
- SEPARATOR
- MN_MANAGE_LINKS
- MI ( ITEM_EDIT_IMAP )
- MI ( ITEM_EDIT_OBJECT )
- MN_EDIT_HYPERLINK
- };
- };
- };
- //
- // Ansicht-Menu
- //
- MenuItem
- {
- MN_VIEW
- SubMenu = Menu
- {
- ItemList =
- {
- MI ( ITEM_VIEW_ATTR_ZOOM )
- SEPARATOR
- //MNSUB_TOOLBAR
- MenuItem
- {
- Identifier = MN_SUB_TOOLBAR ;
- HelpID = MN_SUB_TOOLBAR ;
- Text [ en-US ] = "~Toolbars" ;
- SubMenu = Menu
- {
- ItemList =
- {
- MI ( ITEM_VIEW_TOGGLEFUNCTIONBAR )
- MI ( ITEM_VIEW_TOGGLEOBJECTBAR )
- MN_TOGGLETOOLBAR
- MN_TOGGLEOPTIONBAR
-#if SD_MENU_PORTAL == RID_DRAW_PORTALMENU
- MN_TOGGLECOMMONTASKBAR
-#endif
- MI ( ITEM_VIEW_COLORBAR )
- SEPARATOR
- MN_CUSTOMIZETOOLBOX
- };
- };
- };
- MN_RULER
- MI ( ITEM_VIEW_TOGGLESTATUSBAR )
- MI ( ITEM_VIEW_TOGGLEIMESTATUSWINDOW )
- SEPARATOR
-#if SD_MENU_PORTAL == RID_DRAW_PORTALMENU
- MNSUB_VIEW
-#endif
- MNSUB_OUTPUT_QUALITY
-#if SD_MENU_PORTAL == RID_DRAW_PORTALMENU
- SEPARATOR
-#endif
- MN_PREVIEW_WIN
- MNSUB_PREVIEW_OUTPUT_QUALITY
- SEPARATOR
- MN_PAGEMODE
-#if SD_MENU_PORTAL == RID_DRAW_PORTALMENU
- MNSUB_MASTERPAGE
-#endif
- MN_LAYERMODE
- SEPARATOR
- ITEM_VIEW_SCREENMODE
- };
- };
- };
- //
- // Einfuegen-Menu
- //
- MenuItem
- {
- MN_INSERT
- SubMenu = Menu
- {
- ItemList =
- {
-#if SD_MENU_PORTAL == RID_DRAW_PORTALMENU
- MN_INSERTPAGE
-#else
- MN_INSERTPAGE_DRAW
-#endif
- MN_DUPLICATE_PAGE
-#if SD_MENU_PORTAL == RID_DRAW_PORTALMENU
- MN_EXPAND_PAGE
- MN_SUMMARY_PAGE
-#endif
-#if SD_MENU_PORTAL != RID_DRAW_PORTALMENU
- MN_INSERTLAYER
- MN_CAPTUREPOINT
-#endif
- MNSUB_FIELD
- MN_BULLET
- ITEM_HYPERLINK_DIALOG
- SEPARATOR
- MN_ATTR_TABLE
- MNSUB_GRAPHIC_PORTAL
- ITEM_INSERT_OBJECT_PORTAL
- MN_INSERT_INSERT_DIAGRAM
- MN_INSERT_FLOATINGFRAME
- SEPARATOR
- MN_INSERTFILE
- };
- };
- };
- //
- // Format-Menu
- //
- MenuItem
- {
- MN_FORMAT
- SubMenu = Menu
- {
- ItemList =
- {
- MN_SET_DEFAULT
- SEPARATOR
- MI ( ITEM_FORMAT_ATTRIBUTES_LINE )
- MI ( ITEM_FORMAT_ATTRIBUTES_AREA )
- MN_TEXTATTR_DLG
- MI ( ITEM_FORMAT_ATTR_TRANSFORM )
- MI ( ITEM_FORM_CONTROL_PROPERTIES )
- MI ( ITEM_FORM_PROPERTIES )
-#if SD_MENU_PORTAL != RID_DRAW_PORTALMENU
- MN_MEASURE_DLG
-#endif
- MN_CONNECTION_DLG
- SEPARATOR
- MI ( ITEM_FORMAT_CHAR_DLG )
- ITEM_FORMAT_NUMBERING
- MI ( ITEM_FORMAT_PARA_DLG )
- MN_PAGESETUP
- SEPARATOR
-#if SD_MENU_PORTAL == RID_DRAW_PORTALMENU
- MN_MODIFYPAGE
-#endif
-#if SD_MENU_PORTAL != RID_DRAW_PORTALMENU
- MN_MODIFYLAYER
-#endif
- SEPARATOR
- MNSUB_TEMPLATES
- MI ( ITEM_FORMAT_TEMPLATE )
- SEPARATOR
- MI ( ITEM_FORMAT_FONTWORK )
- MN_3D_WIN
-#if SD_MENU_PORTAL == RID_DRAW_PORTALMENU
- MNSUB_GROUP
-#endif
- };
- };
- };
- //
- // Extras-Menu
- //
- MenuItem
- {
- MN_EXTRAS
- SubMenu = Menu
- {
- ItemList =
- {
- MN_THESAURUS
- MN_HYPHENATION
- SEPARATOR
- MN_AUTO_CORRECT_DLG
- SEPARATOR
- MN_GALLERY
- MN_BMPMASK
- SEPARATOR
- MI ( ITEM_TOOLS_BASICCHOOSER )
- MI ( ITEM_TOOLS_CONFIG )
- ITEM_MN_OPTIONS
- };
- };
- };
-#if SD_MENU_PORTAL != RID_DRAW_PORTALMENU
- //
- // Aendern-Menu
- //
- MenuItem
- {
- MN_MODIFY
- SubMenu = Menu
- {
- ItemList =
- {
- MNSUB_MIRROR
- MNSUB_CONVERT
- SEPARATOR
- MNSUB_POSITION
- MNSUB_OBJECT_ALIGN
- MN_DISTRIBUTE
-
- //-#i68101#----------------------
- SEPARATOR
- MN_OBJECT_TITLE_DESCRIPTION
- MN_NAME_GROUP
- //-#i68101#----------------------
-
- SEPARATOR
- MN_GROUP
- MN_UNGROUP
- MN_ENTER_GROUP
- MN_LEAVE_GROUP
- SEPARATOR
- MN_COMBINE
- MN_DISMANTLE
- MNSUB_FORMEN
- SEPARATOR
- MN_CONNECT
- MN_BREAK
- };
- };
- };
-#endif
-#if SD_MENU_PORTAL == RID_DRAW_PORTALMENU
- //
- // Praesentations-Menu
- //
- MenuItem
- {
- MN_SLIDESHOW
- SubMenu = Menu
- {
- ItemList =
- {
- MN_PRESENTATION
- MN_REHEARSE_TIMINGS
- SEPARATOR
- MN_PRESENTATION_DLG
- MN_CUSTOMSHOW_DLG
- SEPARATOR
- MN_DIA
- MN_HIDE_SLIDE
- SEPARATOR
- MN_ANIMATION_OBJECTS
-// MN_EFFECT_WIN
- MN_ANIMATION_EFFECTS
- };
- };
- };
-#endif
- //
- // Fenster-Menu
- //
- ITEM_WINDOW_MENU
-
- //
- // Hilfe-Menu
- //
- ITEM_HELP_MENU
- };
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sd/source/ui/inc/cfgids.hxx b/sd/source/ui/inc/cfgids.hxx
index df2a4de..285ef2b 100644
--- a/sd/source/ui/inc/cfgids.hxx
+++ b/sd/source/ui/inc/cfgids.hxx
@@ -33,22 +33,12 @@
// Item-Ids fuer Config-Items
#define SDCFG_IMPRESS (SFX_ITEMTYPE_SD_BEGIN + 1)
-#define SDCFG_SPELL (SFX_ITEMTYPE_SD_BEGIN + 2)
#define SDCFG_DRAW (SFX_ITEMTYPE_SD_BEGIN + 3)
// Acceleratoren, Menus, ...
-#define RID_DRAW_DEFAULTACCEL (SFX_ITEMTYPE_SD_BEGIN + 5)
-#define RID_DRAW_DEFAULTMENU (SFX_ITEMTYPE_SD_BEGIN + 6)
-#define RID_DRAW_PORTALMENU (SFX_ITEMTYPE_SD_BEGIN + 35)
#define RID_DRAW_STATUSBAR (SFX_ITEMTYPE_SD_BEGIN + 7)
-// Acceleratoren, Menus, ... (fuers Draw (Graphic))
-#define RID_GRAPHIC_DEFAULTACCEL (SFX_ITEMTYPE_SD_BEGIN + 8)
-#define RID_GRAPHIC_DEFAULTMENU (SFX_ITEMTYPE_SD_BEGIN + 9)
-#define RID_GRAPHIC_PORTALMENU (SFX_ITEMTYPE_SD_BEGIN + 36)
-//#define RID_GRAPHIC_STATUSBAR (SFX_ITEMTYPE_SD_BEGIN + 30)
// Toolbars
-#define RID_DRAW_DEFAULTTOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 10)
#define RID_DRAW_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 11)
#define RID_SLIDE_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 12)
#define RID_DRAW_OBJ_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 13)
diff --git a/toolkit/src2xml/src-sd.lst b/toolkit/src2xml/src-sd.lst
index 6dc236e..dbd33ac 100644
--- a/toolkit/src2xml/src-sd.lst
+++ b/toolkit/src2xml/src-sd.lst
@@ -3,20 +3,15 @@
../../sd/source/ui/app/popup2_tmpl.src
../../sd/source/ui/app/popup.src
../../sd/source/ui/app/toolbox.src
-../../sd/source/ui/app/menuids2_tmpl.src
../../sd/source/ui/app/sdstring.src
-../../sd/source/ui/app/menu_tmpl.src
../../sd/source/ui/app/strings.src
../../sd/source/ui/app/menuids_tmpl.src
../../sd/source/ui/app/accel_tmpl.src
../../sd/source/ui/app/tbx_ww.src
-../../sd/source/ui/app/accelids_tmpl.src
-../../sd/source/ui/app/menuportal_tmpl.src
../../sd/source/ui/app/menuids3_tmpl.src
../../sd/source/ui/app/app.src
../../sd/source/ui/app/res_bmp.src
../../sd/source/ui/app/pseudo.src
-../../sd/source/ui/app/menuids4_tmpl.src
../../sd/source/ui/app/toolbox2_tmpl.src
../../sd/source/ui/dlg/headerfooterdlg.src
../../sd/source/ui/dlg/dlgfield.src
@@ -62,16 +57,11 @@
../../sd/source/ui/slideshow/slideshow.src
../../sd/source/core/glob.src
../../sd/source/filter/html/pubdlg.src
-../../sd/unxlngi6.pro/inc/menu.src
-../../sd/unxlngi6.pro/inc/menuids2.src
../../sd/unxlngi6.pro/inc/menuids3.src
-../../sd/unxlngi6.pro/inc/menuids4.src
../../sd/unxlngi6.pro/inc/popup2.src
../../sd/unxlngi6.pro/inc/toolbox2.src
../../sd/unxlngi6.pro/inc/accel.src
../../sd/unxlngi6.pro/inc/menuids.src
-../../sd/unxlngi6.pro/inc/menuportal.src
-../../sd/unxlngi6.pro/inc/accelids.src
../../sd/unxlngi6.pro/inc/tbxids.src
../../sd/unxlngi6.pro/misc/app/popup.src
../../sd/unxlngi6.pro/misc/app/toolbox.src
diff --git a/toolkit/src2xml/src.lst b/toolkit/src2xml/src.lst
index 020749c..1f170d8 100644
--- a/toolkit/src2xml/src.lst
+++ b/toolkit/src2xml/src.lst
@@ -59,20 +59,15 @@
../../sd/source/ui/app/popup2_tmpl.src
../../sd/source/ui/app/popup.src
../../sd/source/ui/app/toolbox.src
-../../sd/source/ui/app/menuids2_tmpl.src
../../sd/source/ui/app/sdstring.src
-../../sd/source/ui/app/menu_tmpl.src
../../sd/source/ui/app/strings.src
../../sd/source/ui/app/menuids_tmpl.src
../../sd/source/ui/app/accel_tmpl.src
../../sd/source/ui/app/tbx_ww.src
-../../sd/source/ui/app/accelids_tmpl.src
-../../sd/source/ui/app/menuportal_tmpl.src
../../sd/source/ui/app/menuids3_tmpl.src
../../sd/source/ui/app/app.src
../../sd/source/ui/app/res_bmp.src
../../sd/source/ui/app/pseudo.src
-../../sd/source/ui/app/menuids4_tmpl.src
../../sd/source/ui/app/toolbox2_tmpl.src
../../sd/source/ui/dlg/headerfooterdlg.src
../../sd/source/ui/dlg/dlgfield.src
More information about the Libreoffice-commits
mailing list