summaryrefslogtreecommitdiff
path: root/sd/sdi
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:12:08 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:12:08 +0200
commit49ac1b530b440d4fa3ec0bff9cd3d4e70bef838a (patch)
treed432fa8e42251e69e95f7d56cca7fc1b03f18f2c /sd/sdi
parent315eec9e4dbdd27063f4b970c25e9c719e86bcd8 (diff)
recreated tag libreoffice-3.3.3.1 which had these commits:
commit a74d3413eb0220f6c35f38a8ce955098b9fb6eb6 (tag: refs/tags/libreoffice-3.3.3.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue May 31 17:39:06 2011 +0200 Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1) commit 64665cb6c5b6ace06e81d3c98c424b6cf2beb49c Author: Petr Mladek <pmladek@suse.cz> Date: Tue May 31 16:35:37 2011 +0200 Remove extra bracket to fix build build breakage added by the previous commit sd/source/filter/eppt/pptx-epptbase.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 9dd7ef585a463bafa8750e5b30acb38949bbf1ce Author: Tor Lillqvist <tlillqvist@novell.com> Date: Fri May 20 11:00:26 2011 +0300 Add sanity check before dereference, bnc#694119 Signed-off-by: Petr Mladek <pmladek@suse.cz> sd/source/filter/eppt/pptx-epptbase.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit d53f1f6ee9f02d3d77c76910023986f7f346fc30 Author: Caolán McNamara <caolanm@redhat.com> Date: Fri Mar 18 13:19:59 2011 +0100 Fix fdo#33947 crash in Impress after printing Fixes lifetime issue with DrawViewShell - solved by not handing one in to the print preview DocumentRenderer Signed-off-by: Thorsten Behrens <tbehrens@novell.com> sd/source/ui/view/DocumentRenderer.cxx | 2 +- sd/source/ui/view/drawview.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Notes
Notes: split repo tag: impress_libreoffice-3.3.3.1 split repo tag: impress_libreoffice-3.3.4.1
Diffstat (limited to 'sd/sdi')
-rw-r--r--sd/sdi/SlideSorterController.sdi2
-rw-r--r--sd/sdi/ToolPanelViewShell.sdi32
-rwxr-xr-xsd/sdi/ViewShellBase.sdi2
-rw-r--r--sd/sdi/_docsh.sdi2
-rwxr-xr-xsd/sdi/_drvwsh.sdi22
-rw-r--r--sd/sdi/docshell.sdi2
-rwxr-xr-xsd/sdi/drtxtob.sdi20
-rw-r--r--sd/sdi/drviewsh.sdi6
-rw-r--r--sd/sdi/grdocsh.sdi2
-rw-r--r--sd/sdi/grviewsh.sdi4
-rwxr-xr-xsd/sdi/outlnvsh.sdi4
-rw-r--r--sd/sdi/sdgslots.sdi2
-rw-r--r--sd/sdi/sdnew.sdi30
-rw-r--r--sd/sdi/sdslots.hrc2
-rwxr-xr-xsd/sdi/sdslots.sdi4
-rw-r--r--sd/sdi/tables.sdi6
16 files changed, 71 insertions, 71 deletions
diff --git a/sd/sdi/SlideSorterController.sdi b/sd/sdi/SlideSorterController.sdi
index a261f7a7d14a..38115b852bb9 100644
--- a/sd/sdi/SlideSorterController.sdi
+++ b/sd/sdi/SlideSorterController.sdi
@@ -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
diff --git a/sd/sdi/ToolPanelViewShell.sdi b/sd/sdi/ToolPanelViewShell.sdi
index a72342c52da5..c954a6312089 100644
--- a/sd/sdi/ToolPanelViewShell.sdi
+++ b/sd/sdi/ToolPanelViewShell.sdi
@@ -1,6 +1,6 @@
/*************************************************************************
* 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
@@ -177,26 +177,26 @@ SfxVoidItem TaskPaneEditMaster SID_TP_EDIT_MASTER
SfxVoidItem TaskPaneInsertPage SID_INSERTPAGE_LAYOUT_MENU
[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
Readonly = TRUE,
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
GroupId = GID_INSERT;
]
diff --git a/sd/sdi/ViewShellBase.sdi b/sd/sdi/ViewShellBase.sdi
index 3602e711db1b..82eaced38258 100755
--- a/sd/sdi/ViewShellBase.sdi
+++ b/sd/sdi/ViewShellBase.sdi
@@ -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
diff --git a/sd/sdi/_docsh.sdi b/sd/sdi/_docsh.sdi
index c63d20c0f5f6..cb534cf5cdc8 100644
--- a/sd/sdi/_docsh.sdi
+++ b/sd/sdi/_docsh.sdi
@@ -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
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index b8200ec93d5e..c57424bac1a0 100755
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -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
@@ -715,7 +715,7 @@ interface DrawView
ExecMethod = FuPermanent ;
StateMethod = GetMenuState ;
]
-
+
SID_OBJECT_CROP // ole : no, status : play rec
[
ExecMethod = FuPermanent ;
@@ -2207,13 +2207,13 @@ interface DrawView
ExecMethod = FuSupport ;
StateMethod = GetMenuState ;
]
-
+
SID_FORMATPAINTBRUSH //
[
ExecMethod = FuPermanent ;
StateMethod = GetMenuState ;
]
-
+
SID_HEADER_AND_FOOTER // ole : no, status : ?
[
ExecMethod = ExecCtrl ;
@@ -2231,13 +2231,13 @@ interface DrawView
ExecMethod = ExecCtrl ;
StateMethod = GetMenuState ;
]
-
+
SID_MASTER_LAYOUTS
[
ExecMethod = ExecCtrl ;
StateMethod = GetMenuState ;
]
-
+
SID_OPT_LOCALE_CHANGED // ole : no, status : ?
[
ExecMethod = ExecCtrl ;
@@ -2288,7 +2288,7 @@ interface DrawView
[
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
- ]
+ ]
SID_EXTRUSION_DIRECTION_FLOATER
[
ExecMethod = FuTemporary ;
@@ -2388,17 +2388,17 @@ interface DrawView
[
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
- ]
+ ]
SID_DRAW_FONTWORK
[
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
- ]
+ ]
SID_DRAW_FONTWORK_VERTICAL
[
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
- ]
+ ]
SID_DRAWTBX_CS_BASIC
[
ExecMethod = FuPermanent ;
@@ -2433,7 +2433,7 @@ interface DrawView
[
ExecMethod = FuPermanent ;
StateMethod = GetMenuState ;
- ]
+ ]
SID_AVMEDIA_PLAYER // ole : yes, status : ?
[
ExecMethod = FuTemporary ;
diff --git a/sd/sdi/docshell.sdi b/sd/sdi/docshell.sdi
index b69a5bc9c041..7817dee02fc6 100644
--- a/sd/sdi/docshell.sdi
+++ b/sd/sdi/docshell.sdi
@@ -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
diff --git a/sd/sdi/drtxtob.sdi b/sd/sdi/drtxtob.sdi
index f4133f0f4643..a2d48deece88 100755
--- a/sd/sdi/drtxtob.sdi
+++ b/sd/sdi/drtxtob.sdi
@@ -74,63 +74,63 @@ shell TextObjectBar
[
ExecMethod = Execute;
StateMethod = GetAttrState;
-// Cachable, AutoUpdate;
+// Cachable, AutoUpdate;
]
SID_ATTR_PARA_ADJUST_CENTER // ole : ?, status : ?
[
ExecMethod = Execute;
StateMethod = GetAttrState;
-// Cachable, AutoUpdate;
+// Cachable, AutoUpdate;
]
SID_ATTR_PARA_ADJUST_RIGHT // ole : ?, status : ?
[
ExecMethod = Execute;
StateMethod = GetAttrState;
-// Cachable, AutoUpdate;
+// Cachable, AutoUpdate;
]
SID_ATTR_PARA_ADJUST_BLOCK // ole : ?, status : ?
[
ExecMethod = Execute;
StateMethod = GetAttrState;
-// Cachable, AutoUpdate;
+// Cachable, AutoUpdate;
]
SID_ATTR_PARA_LEFT_TO_RIGHT // ole : ?, status : ?
[
ExecMethod = Execute;
StateMethod = GetAttrState;
-// Cachable, AutoUpdate;
+// Cachable, AutoUpdate;
]
SID_ATTR_PARA_RIGHT_TO_LEFT // ole : ?, status : ?
[
ExecMethod = Execute;
StateMethod = GetAttrState;
-// Cachable, AutoUpdate;
+// Cachable, AutoUpdate;
]
SID_ATTR_PARA_LINESPACE_10 // ole : ?, status : ?
[
ExecMethod = Execute;
StateMethod = GetAttrState;
-// Cachable, AutoUpdate;
+// Cachable, AutoUpdate;
]
SID_ATTR_PARA_LINESPACE_15 // ole : ?, status : ?
[
ExecMethod = Execute;
StateMethod = GetAttrState;
-// Cachable, AutoUpdate;
+// Cachable, AutoUpdate;
]
SID_ATTR_PARA_LINESPACE_20 // ole : ?, status : ?
[
ExecMethod = Execute;
StateMethod = GetAttrState;
-// Cachable, AutoUpdate;
+// Cachable, AutoUpdate;
]
SID_SET_SUPER_SCRIPT // ole : ?, status : ?
@@ -208,5 +208,5 @@ shell TextObjectBar
StateMethod = GetAttrState ;
]
-
+
}
diff --git a/sd/sdi/drviewsh.sdi b/sd/sdi/drviewsh.sdi
index 600bbdf19a06..c2465d5cc720 100644
--- a/sd/sdi/drviewsh.sdi
+++ b/sd/sdi/drviewsh.sdi
@@ -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
@@ -211,12 +211,12 @@ interface ImpressEditView : DrawView
[
ExecMethod = ExecuteAnnotation;
StateMethod = GetAnnotationState;
- ]
+ ]
SID_DELETEALLBYAUTHOR_POSTIT
[
ExecMethod = ExecuteAnnotation;
StateMethod = GetAnnotationState;
- ]
+ ]
}
shell DrawViewShell
diff --git a/sd/sdi/grdocsh.sdi b/sd/sdi/grdocsh.sdi
index d033c02b2824..865d6d83465e 100644
--- a/sd/sdi/grdocsh.sdi
+++ b/sd/sdi/grdocsh.sdi
@@ -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
diff --git a/sd/sdi/grviewsh.sdi b/sd/sdi/grviewsh.sdi
index 7fd5b74cb7c0..cce326b1a97b 100644
--- a/sd/sdi/grviewsh.sdi
+++ b/sd/sdi/grviewsh.sdi
@@ -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
@@ -81,7 +81,7 @@ shell GraphicViewShell
[
ExecMethod = ExecuteAnnotation;
StateMethod = GetAnnotationState;
- ]
+ ]
SID_DELETEALLBYAUTHOR_POSTIT
[
ExecMethod = ExecuteAnnotation;
diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi
index 9639f1adc9dc..e4f3b2a6482f 100755
--- a/sd/sdi/outlnvsh.sdi
+++ b/sd/sdi/outlnvsh.sdi
@@ -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
@@ -80,7 +80,7 @@ interface OutlineView
[
ExecMethod = FuTemporary ;
StateMethod = GetStatusBarState ;
- ]
+ ]
SID_ZOOM_OUT // ole : no, status : play rec
[
ExecMethod = FuTemporary ;
diff --git a/sd/sdi/sdgslots.sdi b/sd/sdi/sdgslots.sdi
index e52bd8ea59e8..54634565d554 100644
--- a/sd/sdi/sdgslots.sdi
+++ b/sd/sdi/sdgslots.sdi
@@ -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
diff --git a/sd/sdi/sdnew.sdi b/sd/sdi/sdnew.sdi
index 2c94a4d59786..9b5e9e32c94c 100644
--- a/sd/sdi/sdnew.sdi
+++ b/sd/sdi/sdnew.sdi
@@ -56,22 +56,22 @@ SvxObjectItem RulerObject SID_RULER_OBJECT
SfxBoolItem OutputQualityContrast SID_OUTPUT_QUALITY_CONTRAST
[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
Asynchron;
- Readonly = FALSE,
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ Readonly = FALSE,
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
GroupId = GID_VIEW;
]
diff --git a/sd/sdi/sdslots.hrc b/sd/sdi/sdslots.hrc
index 472f794be479..5001e9fce283 100644
--- a/sd/sdi/sdslots.hrc
+++ b/sd/sdi/sdslots.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
diff --git a/sd/sdi/sdslots.sdi b/sd/sdi/sdslots.sdi
index fbfc8da1903b..10c07bbffc78 100755
--- a/sd/sdi/sdslots.sdi
+++ b/sd/sdi/sdslots.sdi
@@ -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
@@ -103,6 +103,6 @@ ModulePrefix( "Sd" )
include "SlideSorterController.sdi"
include "ViewShellBase.sdi"
include "mediaob.sdi"
- include "tables.sdi"
+ include "tables.sdi"
include "ToolPanelViewShell.sdi"
}
diff --git a/sd/sdi/tables.sdi b/sd/sdi/tables.sdi
index 8126df09b75a..9dc9f5951410 100644
--- a/sd/sdi/tables.sdi
+++ b/sd/sdi/tables.sdi
@@ -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
@@ -31,7 +31,7 @@ shell TableObjectBar
[
ExecMethod = Execute ;
StateMethod = GetState ;
- ]
+ ]
SID_FRAME_LINESTYLE
[
ExecMethod = Execute;
@@ -42,7 +42,7 @@ shell TableObjectBar
ExecMethod = Execute;
StateMethod = GetAttrState;
]
- SID_ATTR_BORDER
+ SID_ATTR_BORDER
[
ExecMethod = Execute;
StateMethod = GetAttrState;