This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 61060e7075 Maintenance cleanup
61060e7075 is described below
commit 61060e707514bc945097d71ae1e29ddfc7e0338b
Author: mseidel <[email protected]>
AuthorDate: Thu Aug 24 11:40:12 2023 +0200
Maintenance cleanup
(cherry picked from commit 26490e24d3292bc36cc0f0de07aa74d641cb48ea)
---
main/sd/source/ui/animations/CustomAnimation.src | 338 ++++++++++-----------
.../source/ui/animations/CustomAnimationPane.src | 197 ++++++------
.../source/ui/animations/SlideTransitionPane.src | 155 +++++-----
main/sd/source/ui/presenter/SlideRenderer.cxx | 287 ++++++++---------
main/sd/source/ui/sidebar/NavigatorWrapper.cxx | 68 ++---
main/sd/source/ui/slideshow/PaneHider.cxx | 115 ++++---
main/sd/source/ui/slideshow/showwin.cxx | 78 +++--
main/sd/source/ui/view/DocumentRenderer.src | 170 ++++++-----
8 files changed, 686 insertions(+), 722 deletions(-)
diff --git a/main/sd/source/ui/animations/CustomAnimation.src
b/main/sd/source/ui/animations/CustomAnimation.src
index 04b2e3dd25..fdf120e876 100644
--- a/main/sd/source/ui/animations/CustomAnimation.src
+++ b/main/sd/source/ui/animations/CustomAnimation.src
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -27,40 +27,40 @@ Menu RID_EFFECT_CONTEXTMENU
{
ItemList =
{
- MenuItem
- {
- Identifier = CM_WITH_CLICK ;
- Text [ en-US ] = "Start On ~Click" ;
- };
- MenuItem
- {
- Identifier = CM_WITH_PREVIOUS ;
- Text [ en-US ] = "Start ~With Previous" ;
- };
- MenuItem
- {
- Identifier = CM_AFTER_PREVIOUS;
- Text [ en-US ] = "Start ~After Previous" ;
- };
+ MenuItem
+ {
+ Identifier = CM_WITH_CLICK ;
+ Text [ en-US ] = "Start On ~Click" ;
+ };
+ MenuItem
+ {
+ Identifier = CM_WITH_PREVIOUS ;
+ Text [ en-US ] = "Start ~With Previous" ;
+ };
+ MenuItem
+ {
+ Identifier = CM_AFTER_PREVIOUS ;
+ Text [ en-US ] = "Start ~After Previous" ;
+ };
MenuItem
{
Separator = TRUE ;
};
- MenuItem
- {
- Identifier = CM_OPTIONS;
- Text [ en-US ] = "~Effect Options..." ;
- };
- MenuItem
- {
- Identifier = CM_DURATION;
- Text [ en-US ] = "~Timing..." ;
- };
- MenuItem
- {
- Identifier = CM_REMOVE;
- Text [ en-US ] = "~Remove" ;
- };
+ MenuItem
+ {
+ Identifier = CM_OPTIONS ;
+ Text [ en-US ] = "~Effect Options..." ;
+ };
+ MenuItem
+ {
+ Identifier = CM_DURATION ;
+ Text [ en-US ] = "~Timing..." ;
+ };
+ MenuItem
+ {
+ Identifier = CM_REMOVE ;
+ Text [ en-US ] = "~Remove" ;
+ };
};
};
@@ -70,24 +70,24 @@ Menu RID_CUSTOMANIMATION_FONTSIZE_POPUP
{
MenuItem
{
- Identifier = CM_SIZE_25 ;
- Text [ en-US ] = "Tiny" ;
- };
+ Identifier = CM_SIZE_25 ;
+ Text [ en-US ] = "Tiny" ;
+ };
MenuItem
{
- Identifier = CM_SIZE_50 ;
- Text [ en-US ] = "Smaller" ;
- };
+ Identifier = CM_SIZE_50 ;
+ Text [ en-US ] = "Smaller" ;
+ };
MenuItem
{
- Identifier = CM_SIZE_150 ;
- Text [ en-US ] = "Larger" ;
- };
+ Identifier = CM_SIZE_150 ;
+ Text [ en-US ] = "Larger" ;
+ };
MenuItem
{
- Identifier = CM_SIZE_400 ;
- Text [ en-US ] = "Extra large" ;
- };
+ Identifier = CM_SIZE_400 ;
+ Text [ en-US ] = "Extra large" ;
+ };
};
};
@@ -97,87 +97,87 @@ Menu RID_CUSTOMANIMATION_SCALE_POPUP
{
MenuItem
{
- Identifier = CM_SIZE_25 ;
- Text [ en-US ] = "Tiny" ;
- };
+ Identifier = CM_SIZE_25 ;
+ Text [ en-US ] = "Tiny" ;
+ };
MenuItem
{
- Identifier = CM_SIZE_50 ;
- Text [ en-US ] = "Smaller" ;
- };
+ Identifier = CM_SIZE_50 ;
+ Text [ en-US ] = "Smaller" ;
+ };
MenuItem
{
- Identifier = CM_SIZE_150 ;
- Text [ en-US ] = "Larger" ;
- };
+ Identifier = CM_SIZE_150 ;
+ Text [ en-US ] = "Larger" ;
+ };
MenuItem
{
- Identifier = CM_SIZE_400 ;
- Text [ en-US ] = "Extra large" ;
- };
+ Identifier = CM_SIZE_400 ;
+ Text [ en-US ] = "Extra large" ;
+ };
MenuItem
{
Separator = TRUE ;
- };
- MenuItem
- {
- Identifier = CM_HORIZONTAL ;
- Text [ en-US ] = "Horizontal" ;
-
- };
- MenuItem
- {
- Identifier = CM_VERTICAL ;
- Text [ en-US ] = "Vertical" ;
-
- };
- MenuItem
- {
- Identifier = CM_BOTH ;
- Text [ en-US ] = "Both" ;
-
- };
+ };
+ MenuItem
+ {
+ Identifier = CM_HORIZONTAL ;
+ Text [ en-US ] = "Horizontal" ;
+
+ };
+ MenuItem
+ {
+ Identifier = CM_VERTICAL ;
+ Text [ en-US ] = "Vertical" ;
+
+ };
+ MenuItem
+ {
+ Identifier = CM_BOTH ;
+ Text [ en-US ] = "Both" ;
+
+ };
};
};
-
+
Menu RID_CUSTOMANIMATION_ROTATION_POPUP
{
ItemList =
{
- MenuItem
- {
- Identifier = CM_QUARTER_SPIN ;
- Text [ en-US ] = "Quarter spin" ;
- };
- MenuItem
- {
- Identifier = CM_HALF_SPIN ;
- Text [ en-US ] = "Half spin" ;
- };
- MenuItem
- {
- Identifier = CM_FULL_SPIN;
- Text [ en-US ] = "Full spin" ;
- };
- MenuItem
- {
- Identifier = CM_TWO_SPINS;
- Text [ en-US ] = "Two spins" ;
- };
+ MenuItem
+ {
+ Identifier = CM_QUARTER_SPIN ;
+ Text [ en-US ] = "Quarter spin" ;
+ };
+ MenuItem
+ {
+ Identifier = CM_HALF_SPIN ;
+ Text [ en-US ] = "Half spin" ;
+ };
+ MenuItem
+ {
+ Identifier = CM_FULL_SPIN ;
+ Text [ en-US ] = "Full spin" ;
+ };
+ MenuItem
+ {
+ Identifier = CM_TWO_SPINS;
+ Text [ en-US ] = "Two spins" ;
+ };
MenuItem
{
Separator = TRUE ;
};
- MenuItem
- {
- Identifier = CM_CLOCKWISE;
- Text [ en-US ] = "Clockwise" ;
- };
- MenuItem
- {
- Identifier = CM_COUNTERCLOCKWISE;
- Text [ en-US ] = "Counter-clockwise" ;
- };
+ MenuItem
+ {
+ Identifier = CM_CLOCKWISE ;
+ Text [ en-US ] = "Clockwise" ;
+ };
+ MenuItem
+ {
+ Identifier = CM_COUNTERCLOCKWISE ;
+ Text [ en-US ] = "Counter-clockwise" ;
+ };
};
};
@@ -185,207 +185,207 @@ Menu RID_CUSTOMANIMATION_FONTSTYLE_POPUP
{
ItemList =
{
- MenuItem
- {
- Identifier = CM_BOLD ;
- Text [ en-US ] = "Bold" ;
- };
- MenuItem
- {
- Identifier = CM_ITALIC ;
- Text [ en-US ] = "Italic" ;
- };
- MenuItem
- {
- Identifier = CM_UNDERLINED ;
- Text [ en-US ] = "Underlined" ;
- };
+ MenuItem
+ {
+ Identifier = CM_BOLD ;
+ Text [ en-US ] = "Bold" ;
+ };
+ MenuItem
+ {
+ Identifier = CM_ITALIC ;
+ Text [ en-US ] = "Italic" ;
+ };
+ MenuItem
+ {
+ Identifier = CM_UNDERLINED ;
+ Text [ en-US ] = "Underlined" ;
+ };
};
};
String STR_CUSTOMANIMATION_DURATION_VERY_SLOW
{
- Text [ en-US ] = "Very slow";
+ Text [ en-US ] = "Very slow" ;
};
String STR_CUSTOMANIMATION_DURATION_SLOW
{
- Text [ en-US ] = "Slow";
+ Text [ en-US ] = "Slow" ;
};
String STR_CUSTOMANIMATION_DURATION_NORMAL
{
- Text [ en-US ] = "Medium";
+ Text [ en-US ] = "Medium" ;
};
String STR_CUSTOMANIMATION_DURATION_FAST
{
- Text [ en-US ] = "Fast";
+ Text [ en-US ] = "Fast" ;
};
String STR_CUSTOMANIMATION_DURATION_VERY_FAST
{
- Text [ en-US ] = "Very fast";
+ Text [ en-US ] = "Very fast" ;
};
String STR_CUSTOMANIMATION_REPEAT_NONE
{
- Text [ en-US ] = "none";
+ Text [ en-US ] = "none" ;
};
String STR_CUSTOMANIMATION_REPEAT_UNTIL_NEXT_CLICK
{
- Text [ en-US ] = "Until next click";
+ Text [ en-US ] = "Until next click" ;
};
String STR_CUSTOMANIMATION_REPEAT_UNTIL_END_OF_SLIDE
{
- Text [ en-US ] = "Until end of slide";
+ Text [ en-US ] = "Until end of slide" ;
};
String STR_CUSTOMANIMATION_DIRECTION_PROPERTY
{
- Text [ en-US ] = "Direction";
+ Text [ en-US ] = "Direction" ;
};
String STR_CUSTOMANIMATION_ZOOM_PROPERTY
{
- Text [ en-US ] = "Zoom";
+ Text [ en-US ] = "Zoom" ;
};
String STR_CUSTOMANIMATION_SPOKES_PROPERTY
{
- Text [ en-US ] = "Spokes";
+ Text [ en-US ] = "Spokes" ;
};
String STR_CUSTOMANIMATION_FIRST_COLOR_PROPERTY
{
- Text [ en-US ] = "First color";
+ Text [ en-US ] = "First color" ;
};
String STR_CUSTOMANIMATION_SECOND_COLOR_PROPERTY
{
- Text [ en-US ] = "Second color";
+ Text [ en-US ] = "Second color" ;
};
String STR_CUSTOMANIMATION_FILL_COLOR_PROPERTY
{
- Text [ en-US ] = "Fill color";
+ Text [ en-US ] = "Fill color" ;
};
String STR_CUSTOMANIMATION_STYLE_PROPERTY
{
- Text [ en-US ] = "Style";
+ Text [ en-US ] = "Style" ;
};
String STR_CUSTOMANIMATION_FONT_PROPERTY
{
- Text [ en-US ] = "Font";
+ Text [ en-US ] = "Font" ;
};
String STR_CUSTOMANIMATION_FONT_COLOR_PROPERTY
{
- Text [ en-US ] = "Font color";
+ Text [ en-US ] = "Font color" ;
};
String STR_CUSTOMANIMATION_FONT_SIZE_STYLE_PROPERTY
{
- Text [ en-US ] = "Style";
+ Text [ en-US ] = "Style" ;
};
String STR_CUSTOMANIMATION_FONT_STYLE_PROPERTY
{
- Text [ en-US ] = "Typeface";
+ Text [ en-US ] = "Typeface" ;
};
String STR_CUSTOMANIMATION_LINE_COLOR_PROPERTY
{
- Text [ en-US ] = "Line color";
+ Text [ en-US ] = "Line color" ;
};
String STR_CUSTOMANIMATION_SIZE_PROPERTY
{
- Text [ en-US ] = "Font size";
+ Text [ en-US ] = "Font size" ;
};
String STR_CUSTOMANIMATION_SCALE_PROPERTY
{
- Text [ en-US ] = "Size";
+ Text [ en-US ] = "Size" ;
};
String STR_CUSTOMANIMATION_AMOUNT_PROPERTY
{
- Text [ en-US ] = "Amount";
+ Text [ en-US ] = "Amount" ;
};
String STR_CUSTOMANIMATION_COLOR_PROPERTY
{
- Text [ en-US ] = "Color";
+ Text [ en-US ] = "Color" ;
};
String STR_CUSTOMANIMATION_NO_SOUND
{
- Text [ en-US ] = "(No sound)";
+ Text [ en-US ] = "(No sound)" ;
};
String STR_CUSTOMANIMATION_STOP_PREVIOUS_SOUND
{
- Text [ en-US ] = "(Stop previous sound)";
+ Text [ en-US ] = "(Stop previous sound)" ;
};
String STR_CUSTOMANIMATION_BROWSE_SOUND
{
- Text [ en-US ] = "Other sound...";
+ Text [ en-US ] = "Other sound..." ;
};
String STR_CUSTOMANIMATION_SAMPLE
{
- Text [ en-US ] = "Sample";
+ Text [ en-US ] = "Sample" ;
};
String STR_CUSTOMANIMATION_1_SPOKES
{
- Text [ en-US ] = "1 Spoke";
+ Text [ en-US ] = "1 Spoke" ;
};
String STR_CUSTOMANIMATION_2_SPOKES
{
- Text [ en-US ] = "2 Spokes";
+ Text [ en-US ] = "2 Spokes" ;
};
String STR_CUSTOMANIMATION_3_SPOKES
{
- Text [ en-US ] = "3 Spokes";
+ Text [ en-US ] = "3 Spokes" ;
};
String STR_CUSTOMANIMATION_4_SPOKES
{
- Text [ en-US ] = "4 Spokes";
+ Text [ en-US ] = "4 Spokes" ;
};
String STR_CUSTOMANIMATION_8_SPOKES
{
- Text [ en-US ] = "8 Spokes";
+ Text [ en-US ] = "8 Spokes" ;
};
String STR_CUSTOMANIMATION_INSTANT
{
- Text [ en-US ] = "Instant";
+ Text [ en-US ] = "Instant" ;
};
String STR_CUSTOMANIMATION_GRADUAL
{
- Text [ en-US ] = "Gradual";
+ Text [ en-US ] = "Gradual" ;
};
String STR_CUSTOMANIMATION_TRIGGER
{
- Text [ en-US ] = "Trigger";
+ Text [ en-US ] = "Trigger" ;
};
String STR_CUSTOMANIMATION_LIST_HELPTEXT
{
- Text [ en-US ] = "First select the slide element and then click
'Add...' to add an animation effect.";
+ Text [ en-US ] = "First select the slide element and then click
'Add...' to add an animation effect." ;
};
Image IMG_CUSTOMANIMATION_ON_CLICK
@@ -450,42 +450,42 @@ Image IMG_CUSTOMANIMATION_MOTION_PATH_H
Image IMG_CUSTOMANIMATION_OLE
{
- ImageBitmap = Bitmap { File = "effectole_16.png"; } ;
+ ImageBitmap = Bitmap { File = "effectole_16.png" ; } ;
};
Image IMG_CUSTOMANIMATION_OLE_H
{
- ImageBitmap = Bitmap { File = "effectole_16_h.png"; } ;
+ ImageBitmap = Bitmap { File = "effectole_16_h.png" ; } ;
};
Image IMG_CUSTOMANIMATION_MEDIA_PLAY
{
- ImageBitmap = Bitmap { File = "playblue_16.png"; } ;
+ ImageBitmap = Bitmap { File = "playblue_16.png" ; } ;
};
Image IMG_CUSTOMANIMATION_MEDIA_PLAY_H
{
- ImageBitmap = Bitmap { File = "playblue_16_h.png"; } ;
+ ImageBitmap = Bitmap { File = "playblue_16_h.png" ; } ;
};
Image IMG_CUSTOMANIMATION_MEDIA_PAUSE
{
- ImageBitmap = Bitmap { File = "breakplayingblue_16.png"; } ;
+ ImageBitmap = Bitmap { File = "breakplayingblue_16.png" ; } ;
};
Image IMG_CUSTOMANIMATION_MEDIA_PAUSE_H
{
- ImageBitmap = Bitmap { File = "breakplayingblue_16_h.png"; } ;
+ ImageBitmap = Bitmap { File = "breakplayingblue_16_h.png" ; } ;
};
Image IMG_CUSTOMANIMATION_MEDIA_STOP
{
- ImageBitmap = Bitmap { File = "stopplayingblue_16.png"; } ;
+ ImageBitmap = Bitmap { File = "stopplayingblue_16.png" ; } ;
};
Image IMG_CUSTOMANIMATION_MEDIA_STOP_H
{
- ImageBitmap = Bitmap { File = "stopplayingblue_16_h.png"; } ;
+ ImageBitmap = Bitmap { File = "stopplayingblue_16_h.png" ; } ;
};
-
+// ********************************************************************** EOF
diff --git a/main/sd/source/ui/animations/CustomAnimationPane.src
b/main/sd/source/ui/animations/CustomAnimationPane.src
index bf840e9396..602e34a36c 100644
--- a/main/sd/source/ui/animations/CustomAnimationPane.src
+++ b/main/sd/source/ui/animations/CustomAnimationPane.src
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -27,95 +27,95 @@
Control DLG_CUSTOMANIMATIONPANE
{
- OutputSize = TRUE;
- DialogControl = TRUE;
- Border = FALSE;
+ OutputSize = TRUE ;
+ DialogControl = TRUE ;
+ Border = FALSE ;
- Size = MAP_APPFONT( 160, 300 );
- Text [ en-US ] = "Custom Animation";
+ Size = MAP_APPFONT ( 160, 300 ) ;
+ Text [ en-US ] = "Custom Animation" ;
FixedLine FL_EFFECT
{
- OutputSize = TRUE;
- Size = MAP_APPFONT( 260, 8 );
-
- Text [ en-US ] = "Effect";
+ OutputSize = TRUE ;
+ Size = MAP_APPFONT ( 260, 8 ) ;
+
+ Text [ en-US ] = "Effect" ;
};
-
+
PushButton PB_ADD_EFFECT
{
- HelpId = HID_SD_CUSTOMANIMATIONPANE_PB_ADD_EFFECT;
- OutputSize = TRUE;
- TabStop = TRUE;
- Size = MAP_APPFONT( 50, 14 );
+ HelpId = HID_SD_CUSTOMANIMATIONPANE_PB_ADD_EFFECT ;
+ OutputSize = TRUE ;
+ TabStop = TRUE ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
- Text [ en-US ] = "~Add...";
+ Text [ en-US ] = "~Add..." ;
};
-
+
PushButton PB_CHANGE_EFFECT
{
- HelpId = HID_SD_CUSTOMANIMATIONPANE_PB_CHANGE_EFFECT;
- OutputSize = TRUE;
- TabStop = TRUE;
- Size = MAP_APPFONT( 50, 14 );
+ HelpId = HID_SD_CUSTOMANIMATIONPANE_PB_CHANGE_EFFECT ;
+ OutputSize = TRUE ;
+ TabStop = TRUE ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
- Text [ en-US ] = "~Change...";
+ Text [ en-US ] = "~Change..." ;
};
-
+
PushButton PB_REMOVE_EFFECT
{
- HelpId = HID_SD_CUSTOMANIMATIONPANE_PB_REMOVE_EFFECT;
- OutputSize = TRUE;
- TabStop = TRUE;
- Size = MAP_APPFONT( 50, 14 );
+ HelpId = HID_SD_CUSTOMANIMATIONPANE_PB_REMOVE_EFFECT ;
+ OutputSize = TRUE ;
+ TabStop = TRUE ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
- Text [ en-US ] = "~Remove";
+ Text [ en-US ] = "~Remove" ;
};
-
+
FixedLine FL_MODIFY
{
- OutputSize = TRUE;
- Size = MAP_APPFONT( 260, 8 );
-
- Text [ en-US ] = "Modify effect";
+ OutputSize = TRUE ;
+ Size = MAP_APPFONT ( 260, 8 ) ;
+
+ Text [ en-US ] = "Modify effect" ;
};
-
+
FixedText FT_START
{
- OutputSize = TRUE;
- Size = MAP_APPFONT( 42, 8 );
+ OutputSize = TRUE ;
+ Size = MAP_APPFONT ( 42, 8 ) ;
- Text [ en-US ] = "~Start";
+ Text [ en-US ] = "~Start" ;
};
ListBox LB_START
{
- HelpId = HID_SD_CUSTOMANIMATIONPANE_LB_START;
- Size = MAP_APPFONT ( 120 , 48 );
+ HelpId = HID_SD_CUSTOMANIMATIONPANE_LB_START ;
+ Size = MAP_APPFONT ( 120, 48 ) ;
TabStop = TRUE ;
Border = TRUE ;
DropDown = TRUE ;
StringList [ en-US ] =
{
- < "On click" ; > ;
- < "With previous" ; > ;
- < "After previous" ; > ;
+ < "On click" ; > ;
+ < "With previous" ; > ;
+ < "After previous" ; > ;
};
};
-
+
FixedText FT_PROPERTY
{
- OutputSize = TRUE;
- Size = MAP_APPFONT( 42, 8 );
+ OutputSize = TRUE ;
+ Size = MAP_APPFONT ( 42, 8 ) ;
- Text [ en-US ] = "Property";
+ Text [ en-US ] = "Property" ;
};
ListBox LB_PROPERTY
{
- HelpId = HID_SD_CUSTOMANIMATIONPANE_LB_PROPERTY;
- Size = MAP_APPFONT ( 120 , 48 );
+ HelpId = HID_SD_CUSTOMANIMATIONPANE_LB_PROPERTY ;
+ Size = MAP_APPFONT ( 120, 48 ) ;
TabStop = TRUE ;
Border = TRUE ;
DropDown = TRUE ;
@@ -123,28 +123,28 @@ Control DLG_CUSTOMANIMATIONPANE
PushButton PB_PROPERTY_MORE
{
- HelpId = HID_SD_CUSTOMANIMATIONPANE_PB_PROPERTY_MORE;
- OutputSize = TRUE;
- TabStop = TRUE;
- Size = MAP_APPFONT( 16, 14 );
+ HelpId = HID_SD_CUSTOMANIMATIONPANE_PB_PROPERTY_MORE ;
+ OutputSize = TRUE ;
+ TabStop = TRUE ;
+ Size = MAP_APPFONT ( 16, 14 ) ;
+
+ Text [ en-US ] = "~..." ;
- Text [ en-US ] = "~...";
-
- QuickHelpText [en-US ] = "Effect Options";
+ QuickHelpText [en-US ] = "Effect Options" ;
};
FixedText FT_SPEED
{
- OutputSize = TRUE;
- Size = MAP_APPFONT( 42, 8 );
+ OutputSize = TRUE ;
+ Size = MAP_APPFONT ( 42, 8 ) ;
- Text [ en-US ] = "Sp~eed";
+ Text [ en-US ] = "Sp~eed" ;
};
-
+
ComboBox CB_SPEED
{
- HelpId = HID_SD_CUSTOMANIMATIONPANE_CB_SPEED;
- Size = MAP_APPFONT ( 120 , 48 );
+ HelpId = HID_SD_CUSTOMANIMATIONPANE_CB_SPEED ;
+ Size = MAP_APPFONT ( 120, 48 ) ;
TabStop = TRUE ;
Border = TRUE ;
DropDown = TRUE ;
@@ -152,70 +152,71 @@ Control DLG_CUSTOMANIMATIONPANE
Control CT_CUSTOM_ANIMATION_LIST
{
- HelpId = HID_SD_CUSTOMANIMATIONPANE_CT_CUSTOM_ANIMATION_LIST;
- TabStop = TRUE;
- Border = TRUE;
+ HelpId = HID_SD_CUSTOMANIMATIONPANE_CT_CUSTOM_ANIMATION_LIST ;
+ TabStop = TRUE ;
+ Border = TRUE ;
};
-
+
FixedText FT_CHANGE_ORDER
{
- OutputSize = TRUE;
- Size = MAP_APPFONT( 42, 8 );
+ OutputSize = TRUE ;
+ Size = MAP_APPFONT ( 42, 8 ) ;
- Text [ en-US ] = "Change order:";
+ Text [ en-US ] = "Change order:" ;
};
-
+
PushButton PB_MOVE_UP
{
- HelpId = HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_UP;
- OutputSize = TRUE;
- TabStop = TRUE;
- Size = MAP_APPFONT( 16, 14 );
+ HelpId = HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_UP ;
+ OutputSize = TRUE ;
+ TabStop = TRUE ;
+ Size = MAP_APPFONT ( 16, 14 ) ;
};
PushButton PB_MOVE_DOWN
{
- HelpId = HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_DOWN;
- OutputSize = TRUE;
- TabStop = TRUE;
- Size = MAP_APPFONT( 16, 14 );
+ HelpId = HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_DOWN ;
+ OutputSize = TRUE ;
+ TabStop = TRUE ;
+ Size = MAP_APPFONT ( 16, 14 ) ;
};
- FixedLine FL_SEPERATOR1
+ FixedLine FL_SEPERATOR1
{
- OutputSize = TRUE;
- Size = MAP_APPFONT( 8, 8 );
+ OutputSize = TRUE ;
+ Size = MAP_APPFONT ( 8, 8 ) ;
};
PushButton PB_PLAY
{
- HelpId = HID_SD_CUSTOMANIMATIONPANE_PB_PLAY;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE;
-
- Text [ en-US ] = "~Play";
+ HelpId = HID_SD_CUSTOMANIMATIONPANE_PB_PLAY ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
+ TabStop = TRUE ;
+
+ Text [ en-US ] = "~Play" ;
};
PushButton PB_SLIDE_SHOW
{
- HelpId = HID_SD_CUSTOMANIMATIONPANE_PB_SLIDE_SHOW;
- Size = MAP_APPFONT ( 80 , 14 ) ;
- TabStop = TRUE;
-
- Text [ en-US ] = "Slide Sho~w";
+ HelpId = HID_SD_CUSTOMANIMATIONPANE_PB_SLIDE_SHOW ;
+ Size = MAP_APPFONT ( 80, 14 ) ;
+ TabStop = TRUE ;
+
+ Text [ en-US ] = "Slide Sho~w" ;
};
FixedLine FL_SEPERATOR2
{
- Size = MAP_APPFONT( 8, 8 );
+ Size = MAP_APPFONT ( 8, 8 ) ;
};
-
+
CheckBox CB_AUTOPREVIEW
{
- HelpId = HID_SD_CUSTOMANIMATIONPANE_CB_AUTOPREVIEW;
- Size = MAP_APPFONT ( 120 , 10 ) ;
+ HelpId = HID_SD_CUSTOMANIMATIONPANE_CB_AUTOPREVIEW ;
+ Size = MAP_APPFONT ( 120, 10 ) ;
TabStop = TRUE ;
- Text [ en-US ] = "Automatic pre~view" ;
+ Text [ en-US ] = "Automatic pre~view" ;
};
};
+// ********************************************************************** EOF
diff --git a/main/sd/source/ui/animations/SlideTransitionPane.src
b/main/sd/source/ui/animations/SlideTransitionPane.src
index e14750410a..b31d89140e 100644
--- a/main/sd/source/ui/animations/SlideTransitionPane.src
+++ b/main/sd/source/ui/animations/SlideTransitionPane.src
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -29,188 +29,189 @@
#include <svtools/controldims.hrc>
#endif
-// Note: Sizes of 1 usually mean they are auto-calculated
+// Note: Sizes of 1 usually means they are auto-calculated
Control DLG_SLIDE_TRANSITION_PANE
{
- OutputSize = TRUE;
- DialogControl = TRUE;
- Size = MAP_APPFONT( 1, 1 );
+ OutputSize = TRUE ;
+ DialogControl = TRUE ;
+ Size = MAP_APPFONT ( 1, 1 ) ;
- Text [ en-US ] = "Slide Transition";
+ Text [ en-US ] = "Slide Transition" ;
FixedLine FL_APPLY_TRANSITION
{
- Size = MAP_APPFONT( 1, RSC_CD_FIXEDLINE_HEIGHT );
- Text [ en-US ] = "Apply to selected slides";
+ Size = MAP_APPFONT ( 1, RSC_CD_FIXEDLINE_HEIGHT ) ;
+ Text [ en-US ] = "Apply to selected slides" ;
};
ListBox LB_SLIDE_TRANSITIONS
{
- HelpId = HID_SD_SLIDETRANSITIONPANE_LB_SLIDE_TRANSITIONS;
+ HelpId = HID_SD_SLIDETRANSITIONPANE_LB_SLIDE_TRANSITIONS ;
Border = TRUE ;
TabStop = TRUE ;
AutoHScroll = TRUE ;
- Size = MAP_APPFONT( 1, 1 );
+ Size = MAP_APPFONT ( 1, 1 ) ;
};
Fixedline FL_MODIFY_TRANSITION
{
- Size = MAP_APPFONT( 1, RSC_CD_FIXEDLINE_HEIGHT );
- Text [ en-US ] = "Modify transition";
+ Size = MAP_APPFONT ( 1, RSC_CD_FIXEDLINE_HEIGHT ) ;
+ Text [ en-US ] = "Modify transition" ;
};
FixedText FT_SPEED
{
- Size = MAP_APPFONT( 1, RSC_CD_FIXEDTEXT_HEIGHT );
- Text [ en-US ] = "Speed";
+ Size = MAP_APPFONT ( 1, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+ Text [ en-US ] = "Speed" ;
};
ListBox LB_SPEED
{
- HelpId = HID_SD_SLIDETRANSITIONPANE_LB_SPEED;
+ HelpId = HID_SD_SLIDETRANSITIONPANE_LB_SPEED ;
Border = TRUE ;
DropDown = TRUE ;
TabStop = TRUE ;
- Size = MAP_APPFONT( 1, RSC_CD_DROPDOWN_HEIGHT );
+ Size = MAP_APPFONT ( 1, RSC_CD_DROPDOWN_HEIGHT ) ;
StringList [ en-US ] =
{
- < "Slow" ; > ;
- < "Medium" ; > ;
- < "Fast" ; > ;
+ < "Slow" ; > ;
+ < "Medium" ; > ;
+ < "Fast" ; > ;
};
};
FixedText FT_SOUND
{
- Size = MAP_APPFONT( 1, RSC_CD_FIXEDTEXT_HEIGHT );
- Text [ en-US ] = "Sound";
+ Size = MAP_APPFONT ( 1, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+ Text [ en-US ] = "Sound" ;
};
- ListBox LB_SOUND
- {
- HelpId = HID_SD_SLIDETRANSITIONPANE_LB_SOUND;
+ ListBox LB_SOUND
+ {
+ HelpId = HID_SD_SLIDETRANSITIONPANE_LB_SOUND ;
Border = TRUE ;
DropDown = TRUE ;
TabStop = TRUE ;
- Size = MAP_APPFONT( 1, RSC_CD_DROPDOWN_HEIGHT );
+ Size = MAP_APPFONT ( 1, RSC_CD_DROPDOWN_HEIGHT ) ;
- StringList [ en-US ] =
- {
- < "<No Sound>" ; > ;
- < "<Stop Previous Sound>" ; > ;
- < "Other Sound..." ; > ;
- };
- };
+ StringList [ en-US ] =
+ {
+ < "<No Sound>" ; > ;
+ < "<Stop Previous Sound>" ; > ;
+ < "Other Sound..." ; > ;
+ };
+ };
- Checkbox CB_LOOP_SOUND
- {
- HelpId = HID_SD_SLIDETRANSITIONPANE_CB_LOOP_SOUND;
- Size = MAP_APPFONT( 1, RSC_CD_CHECKBOX_HEIGHT );
+ Checkbox CB_LOOP_SOUND
+ {
+ HelpId = HID_SD_SLIDETRANSITIONPANE_CB_LOOP_SOUND ;
+ Size = MAP_APPFONT ( 1, RSC_CD_CHECKBOX_HEIGHT ) ;
TabStop = TRUE ;
- Text [ en-US ] = "Loop until next sound";
- };
+ Text [ en-US ] = "Loop until next sound" ;
+ };
Fixedline FL_ADVANCE_SLIDE
{
- Size = MAP_APPFONT( 1, RSC_CD_FIXEDLINE_HEIGHT );
- Text [ en-US ] = "Advance slide";
+ Size = MAP_APPFONT ( 1, RSC_CD_FIXEDLINE_HEIGHT ) ;
+ Text [ en-US ] = "Advance slide" ;
};
RadioButton RB_ADVANCE_ON_MOUSE
{
- HelpId = HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_ON_MOUSE;
- Size = MAP_APPFONT( 1, RSC_CD_RADIOBUTTON_HEIGHT );
+ HelpId = HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_ON_MOUSE ;
+ Size = MAP_APPFONT ( 1, RSC_CD_RADIOBUTTON_HEIGHT ) ;
TabStop = TRUE ;
- Text [ en-US ] = "On mouse click";
+ Text [ en-US ] = "On mouse click" ;
};
RadioButton RB_ADVANCE_AUTO
{
- HelpId = HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_AUTO;
- Size = MAP_APPFONT( 1, RSC_CD_RADIOBUTTON_HEIGHT );
+ HelpId = HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_AUTO ;
+ Size = MAP_APPFONT ( 1, RSC_CD_RADIOBUTTON_HEIGHT ) ;
TabStop = TRUE ;
- Text [ en-US ] = "Automatically after";
+ Text [ en-US ] = "Automatically after" ;
};
MetricField MF_ADVANCE_AUTO_AFTER
{
- HelpId = HID_SD_SLIDETRANSITIONPANE_MF_ADVANCE_AUTO_AFTER;
- Size = MAP_APPFONT( 1, RSC_CD_TEXTBOX_HEIGHT );
+ HelpId = HID_SD_SLIDETRANSITIONPANE_MF_ADVANCE_AUTO_AFTER ;
+ Size = MAP_APPFONT ( 1, RSC_CD_TEXTBOX_HEIGHT ) ;
- Border = TRUE ;
+ Border = TRUE ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
Minimum = 0 ;
Maximum = 999 ;
- // decimal digits should be 1, but for now the model only supports
whole seconds
+ // decimal digits should be 1, but for now the model only
supports whole seconds
DecimalDigits = 0 ;
- // spin size (increment value) should be 5 if digits are 1
+ // spin size (increment value) should be 5 if digits are 1
SpinSize = 1 ;
Unit = FUNIT_CUSTOM ;
- CustomUnitText [ en-US ] = " sec";
+ CustomUnitText [ en-US ] = " sec" ;
};
- FixedLine FL_EMPTY1
- {
- Size = MAP_APPFONT( 1, RSC_CD_FIXEDLINE_HEIGHT );
- };
+ FixedLine FL_EMPTY1
+ {
+ Size = MAP_APPFONT ( 1, RSC_CD_FIXEDLINE_HEIGHT ) ;
+ };
PushButton PB_APPLY_TO_ALL
{
- HelpId = HID_SD_SLIDETRANSITIONPANE_PB_APPLY_TO_ALL;
- Size = MAP_APPFONT( 1, RSC_CD_PUSHBUTTON_HEIGHT );
+ HelpId = HID_SD_SLIDETRANSITIONPANE_PB_APPLY_TO_ALL ;
+ Size = MAP_APPFONT ( 1, RSC_CD_PUSHBUTTON_HEIGHT ) ;
TabStop = TRUE ;
- Text [ en-US ] = "Apply to All Slides";
+ Text [ en-US ] = "Apply to All Slides" ;
};
PushButton PB_PLAY
{
- HelpId = HID_SD_SLIDETRANSITIONPANE_PB_PLAY;
- Size = MAP_APPFONT( 1, RSC_CD_PUSHBUTTON_HEIGHT );
+ HelpId = HID_SD_SLIDETRANSITIONPANE_PB_PLAY ;
+ Size = MAP_APPFONT ( 1, RSC_CD_PUSHBUTTON_HEIGHT ) ;
TabStop = TRUE ;
- Text [ en-US ] = "Play";
+ Text [ en-US ] = "Play" ;
};
PushButton PB_SLIDE_SHOW
{
- HelpId = HID_SD_SLIDETRANSITIONPANE_PB_SLIDE_SHOW;
- Size = MAP_APPFONT( 1, RSC_CD_PUSHBUTTON_HEIGHT );
+ HelpId = HID_SD_SLIDETRANSITIONPANE_PB_SLIDE_SHOW ;
+ Size = MAP_APPFONT ( 1, RSC_CD_PUSHBUTTON_HEIGHT ) ;
TabStop = TRUE ;
- Text [ en-US ] = "Slide Show";
+ Text [ en-US ] = "Slide Show" ;
};
- FixedLine FL_EMPTY2
- {
- Size = MAP_APPFONT( 1, RSC_CD_FIXEDLINE_HEIGHT );
- };
+ FixedLine FL_EMPTY2
+ {
+ Size = MAP_APPFONT ( 1, RSC_CD_FIXEDLINE_HEIGHT ) ;
+ };
Checkbox CB_AUTO_PREVIEW
{
- HelpId = HID_SD_SLIDETRANSITIONPANE_CB_AUTO_PREVIEW;
- Size = MAP_APPFONT( 1, RSC_CD_CHECKBOX_HEIGHT );
+ HelpId = HID_SD_SLIDETRANSITIONPANE_CB_AUTO_PREVIEW ;
+ Size = MAP_APPFONT ( 1, RSC_CD_CHECKBOX_HEIGHT ) ;
TabStop = TRUE ;
- Text [ en-US ] = "Automatic preview";
+ Text [ en-US ] = "Automatic preview" ;
};
- // --------------------
+ // --------------------
String STR_NO_TRANSITION
{
- Text [ en-US ] = "No Transition";
+ Text [ en-US ] = "No Transition" ;
};
};
+// ********************************************************************** EOF
diff --git a/main/sd/source/ui/presenter/SlideRenderer.cxx
b/main/sd/source/ui/presenter/SlideRenderer.cxx
index a1523cfe73..e39c94178e 100644
--- a/main/sd/source/ui/presenter/SlideRenderer.cxx
+++ b/main/sd/source/ui/presenter/SlideRenderer.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -39,230 +39,209 @@ namespace sd { namespace presenter {
//===== Service ===============================================================
Reference<XInterface> SAL_CALL SlideRenderer_createInstance (
- const Reference<XComponentContext>& rxContext)
+ const Reference<XComponentContext>& rxContext)
{
- return Reference<XInterface>(static_cast<XWeak*>(new
SlideRenderer(rxContext)));
+ return Reference<XInterface>(static_cast<XWeak*>(new
SlideRenderer(rxContext)));
}
-
-
::rtl::OUString SlideRenderer_getImplementationName (void)
throw(RuntimeException)
{
- return OUString::createFromAscii("com.sun.star.comp.Draw.SlideRenderer");
+ return
OUString::createFromAscii("com.sun.star.comp.Draw.SlideRenderer");
}
-
-
Sequence<rtl::OUString> SAL_CALL SlideRenderer_getSupportedServiceNames (void)
- throw (RuntimeException)
+ throw (RuntimeException)
{
static const ::rtl::OUString sServiceName(
-
::rtl::OUString::createFromAscii("com.sun.star.drawing.SlideRenderer"));
+
::rtl::OUString::createFromAscii("com.sun.star.drawing.SlideRenderer"));
return Sequence<rtl::OUString>(&sServiceName, 1);
}
-
-
//===== SlideRenderer
==========================================================
SlideRenderer::SlideRenderer (const Reference<XComponentContext>& rxContext)
- : SlideRendererInterfaceBase(m_aMutex),
- maPreviewRenderer()
+ : SlideRendererInterfaceBase(m_aMutex),
+ maPreviewRenderer()
{
- (void)rxContext;
+ (void)rxContext;
}
-
-
SlideRenderer::~SlideRenderer (void)
{
}
-
-
void SAL_CALL SlideRenderer::disposing (void)
{
}
-
-
//----- XInitialization -------------------------------------------------------
void SAL_CALL SlideRenderer::initialize (const Sequence<Any>& rArguments)
- throw (Exception, RuntimeException)
+ throw (Exception, RuntimeException)
{
- ThrowIfDisposed();
-
- if (rArguments.getLength() == 0)
- {
- try
- {
- }
- catch (RuntimeException&)
- {
- throw;
- }
- }
- else
- {
- throw RuntimeException(
- OUString::createFromAscii("SlideRenderer: invalid number of
arguments"),
- static_cast<XWeak*>(this));
- }
-}
-
+ ThrowIfDisposed();
+ if (rArguments.getLength() == 0)
+ {
+ try
+ {
+ }
+ catch (RuntimeException&)
+ {
+ throw;
+ }
+ }
+ else
+ {
+ throw RuntimeException(
+ OUString::createFromAscii("SlideRenderer: invalid
number of arguments"),
+ static_cast<XWeak*>(this));
+ }
+}
//----- XSlideRenderer --------------------------------------------------------
Reference<awt::XBitmap> SlideRenderer::createPreview (
- const Reference<drawing::XDrawPage>& rxSlide,
- const awt::Size& rMaximalSize,
- sal_Int16 nSuperSampleFactor)
- throw (css::uno::RuntimeException)
+ const Reference<drawing::XDrawPage>& rxSlide,
+ const awt::Size& rMaximalSize,
+ sal_Int16 nSuperSampleFactor)
+ throw (css::uno::RuntimeException)
{
- ThrowIfDisposed();
+ ThrowIfDisposed();
::vos::OGuard aGuard (Application::GetSolarMutex());
- return VCLUnoHelper::CreateBitmap(
- CreatePreview(rxSlide, rMaximalSize, nSuperSampleFactor));
+ return VCLUnoHelper::CreateBitmap(
+ CreatePreview(rxSlide, rMaximalSize, nSuperSampleFactor));
}
-
-
Reference<rendering::XBitmap> SlideRenderer::createPreviewForCanvas (
- const Reference<drawing::XDrawPage>& rxSlide,
- const awt::Size& rMaximalSize,
- sal_Int16 nSuperSampleFactor,
- const Reference<rendering::XCanvas>& rxCanvas)
- throw (css::uno::RuntimeException)
+ const Reference<drawing::XDrawPage>& rxSlide,
+ const awt::Size& rMaximalSize,
+ sal_Int16 nSuperSampleFactor,
+ const Reference<rendering::XCanvas>& rxCanvas)
+ throw (css::uno::RuntimeException)
{
- ThrowIfDisposed();
+ ThrowIfDisposed();
::vos::OGuard aGuard (Application::GetSolarMutex());
- cppcanvas::BitmapCanvasSharedPtr pCanvas
(cppcanvas::VCLFactory::getInstance().createCanvas(
- Reference<rendering::XBitmapCanvas>(rxCanvas, UNO_QUERY)));
- if (pCanvas.get() != NULL)
- return cppcanvas::VCLFactory::getInstance().createBitmap(
- pCanvas,
- CreatePreview(rxSlide, rMaximalSize,
nSuperSampleFactor))->getUNOBitmap();
- else
- return NULL;
+ cppcanvas::BitmapCanvasSharedPtr pCanvas
(cppcanvas::VCLFactory::getInstance().createCanvas(
+ Reference<rendering::XBitmapCanvas>(rxCanvas, UNO_QUERY)));
+ if (pCanvas.get() != NULL)
+ return cppcanvas::VCLFactory::getInstance().createBitmap(
+ pCanvas,
+ CreatePreview(rxSlide, rMaximalSize,
nSuperSampleFactor))->getUNOBitmap();
+ else
+ return NULL;
}
-
-
awt::Size SAL_CALL SlideRenderer::calculatePreviewSize (
- double nSlideAspectRatio,
- const awt::Size& rMaximalSize)
- throw (css::uno::RuntimeException)
+ double nSlideAspectRatio,
+ const awt::Size& rMaximalSize)
+ throw (css::uno::RuntimeException)
{
- if (rMaximalSize.Width <= 0
- || rMaximalSize.Height <= 0
- || nSlideAspectRatio <= 0)
- {
- return awt::Size(0,0);
- }
-
- const double nWindowAspectRatio (double(rMaximalSize.Width) /
double(rMaximalSize.Height));
- if (nSlideAspectRatio < nWindowAspectRatio)
- return awt::Size(
- sal::static_int_cast<sal_Int32>(rMaximalSize.Height *
nSlideAspectRatio),
- rMaximalSize.Height);
- else
- return awt::Size(
- rMaximalSize.Width,
- sal::static_int_cast<sal_Int32>(rMaximalSize.Width /
nSlideAspectRatio));
+ if (rMaximalSize.Width <= 0
+ || rMaximalSize.Height <= 0
+ || nSlideAspectRatio <= 0)
+ {
+ return awt::Size(0,0);
+ }
+
+ const double nWindowAspectRatio (double(rMaximalSize.Width) /
double(rMaximalSize.Height));
+ if (nSlideAspectRatio < nWindowAspectRatio)
+ return awt::Size(
+ sal::static_int_cast<sal_Int32>(rMaximalSize.Height *
nSlideAspectRatio),
+ rMaximalSize.Height);
+ else
+ return awt::Size(
+ rMaximalSize.Width,
+ sal::static_int_cast<sal_Int32>(rMaximalSize.Width /
nSlideAspectRatio));
}
-
-
//-----------------------------------------------------------------------------
BitmapEx SlideRenderer::CreatePreview (
- const Reference<drawing::XDrawPage>& rxSlide,
- const awt::Size& rMaximalSize,
- sal_Int16 nSuperSampleFactor)
- throw (css::uno::RuntimeException)
+ const Reference<drawing::XDrawPage>& rxSlide,
+ const awt::Size& rMaximalSize,
+ sal_Int16 nSuperSampleFactor)
+ throw (css::uno::RuntimeException)
{
- const SdPage* pPage = SdPage::getImplementation(rxSlide);
- if (pPage == NULL)
- throw lang::IllegalArgumentException(
- OUString::createFromAscii("SlideRenderer::createPreview() called
with invalid slide"),
- static_cast<XWeak*>(this),
- 0);
-
- // Determine the size of the current slide and its aspect ratio.
- Size aPageSize = pPage->GetSize();
- if (aPageSize.Height() <= 0)
- throw lang::IllegalArgumentException(
- OUString::createFromAscii("SlideRenderer::createPreview() called
with invalid size"),
- static_cast<XWeak*>(this),
- 1);
-
- // Compare with the aspect ratio of the window (which rMaximalSize
- // assumed to be) and calculate the size of the preview so that it
- // a) will have the aspect ratio of the page and
- // b) will be as large as possible.
- awt::Size aPreviewSize (calculatePreviewSize(
- double(aPageSize.Width()) / double(aPageSize.Height()),
- rMaximalSize));
- if (aPreviewSize.Width <= 0 || aPreviewSize.Height <= 0)
- return BitmapEx();
-
- // Make sure that the super sample factor has a sane value.
- sal_Int16 nFactor (nSuperSampleFactor);
- if (nFactor < 1)
- nFactor = 1;
- else if (nFactor > 10)
- nFactor = 10;
-
- // Create the preview. When the super sample factor n is greater than 1
- // then a preview is created in size (n*width, n*height) and then scaled
- // down to (width, height). This is a poor mans antialiasing for the
- // time being. When we have true antialiasing support this workaround
- // can be removed.
- const Image aPreview = maPreviewRenderer.RenderPage (
- pPage,
- Size(aPreviewSize.Width*nFactor, aPreviewSize.Height*nFactor),
- ::rtl::OUString());
- if (nFactor == 1)
- return aPreview.GetBitmapEx();
- else
- {
- BitmapEx aScaledPreview = aPreview.GetBitmapEx();
- aScaledPreview.Scale(
- Size(aPreviewSize.Width,aPreviewSize.Height),
- BMP_SCALE_INTERPOLATE);
- return aScaledPreview;
- }
+ const SdPage* pPage = SdPage::getImplementation(rxSlide);
+ if (pPage == NULL)
+ throw lang::IllegalArgumentException(
+
OUString::createFromAscii("SlideRenderer::createPreview() called with invalid
slide"),
+ static_cast<XWeak*>(this),
+ 0);
+
+ // Determine the size of the current slide and its aspect ratio.
+ Size aPageSize = pPage->GetSize();
+ if (aPageSize.Height() <= 0)
+ throw lang::IllegalArgumentException(
+
OUString::createFromAscii("SlideRenderer::createPreview() called with invalid
size"),
+ static_cast<XWeak*>(this),
+ 1);
+
+ // Compare with the aspect ratio of the window (which rMaximalSize
+ // assumed to be) and calculate the size of the preview so that it
+ // a) will have the aspect ratio of the page and
+ // b) will be as large as possible.
+ awt::Size aPreviewSize (calculatePreviewSize(
+ double(aPageSize.Width()) / double(aPageSize.Height()),
+ rMaximalSize));
+ if (aPreviewSize.Width <= 0 || aPreviewSize.Height <= 0)
+ return BitmapEx();
+
+ // Make sure that the super sample factor has a sane value.
+ sal_Int16 nFactor (nSuperSampleFactor);
+ if (nFactor < 1)
+ nFactor = 1;
+ else if (nFactor > 10)
+ nFactor = 10;
+
+ // Create the preview. When the super sample factor n is greater than 1
+ // then a preview is created in size (n*width, n*height) and then scaled
+ // down to (width, height). This is a poor mans antialiasing for the
+ // time being. When we have true antialiasing support this workaround
+ // can be removed.
+ const Image aPreview = maPreviewRenderer.RenderPage (
+ pPage,
+ Size(aPreviewSize.Width*nFactor, aPreviewSize.Height*nFactor),
+ ::rtl::OUString());
+ if (nFactor == 1)
+ return aPreview.GetBitmapEx();
+ else
+ {
+ BitmapEx aScaledPreview = aPreview.GetBitmapEx();
+ aScaledPreview.Scale(
+ Size(aPreviewSize.Width,aPreviewSize.Height),
+ BMP_SCALE_FASTESTINTERPOLATE);
+ return aScaledPreview;
+ }
}
-
-
void SlideRenderer::ThrowIfDisposed (void)
- throw (::com::sun::star::lang::DisposedException)
+ throw (::com::sun::star::lang::DisposedException)
{
if (SlideRendererInterfaceBase::rBHelper.bDisposed ||
SlideRendererInterfaceBase::rBHelper.bInDispose)
{
- throw lang::DisposedException (
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "SlideRenderer object has already been disposed")),
- static_cast<uno::XWeak*>(this));
- }
+ throw lang::DisposedException (
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "SlideRenderer object has already been
disposed")),
+ static_cast<uno::XWeak*>(this));
+ }
}
} } // end of namespace ::sd::presenter
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sd/source/ui/sidebar/NavigatorWrapper.cxx
b/main/sd/source/ui/sidebar/NavigatorWrapper.cxx
index c7a7ba74ec..92d49868dd 100644
--- a/main/sd/source/ui/sidebar/NavigatorWrapper.cxx
+++ b/main/sd/source/ui/sidebar/NavigatorWrapper.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,18 +7,20 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
+
+
#include "precompiled_sd.hxx"
#include "NavigatorWrapper.hxx"
@@ -33,66 +35,56 @@
namespace sd { namespace sidebar {
NavigatorWrapper::NavigatorWrapper (
- ::Window* pParent,
- sd::ViewShellBase& rViewShellBase,
- SfxBindings* pBindings)
- : Control(pParent, 0),
- mrViewShellBase(rViewShellBase),
- maNavigator(
- this,
- NULL,
- SdResId(FLT_NAVIGATOR),
- pBindings,
- ::boost::bind(&NavigatorWrapper::UpdateNavigator, this))
+ ::Window* pParent,
+ sd::ViewShellBase& rViewShellBase,
+ SfxBindings* pBindings)
+ : Control(pParent, 0),
+ mrViewShellBase(rViewShellBase),
+ maNavigator(
+ this,
+ NULL,
+ SdResId(FLT_NAVIGATOR),
+ pBindings,
+ ::boost::bind(&NavigatorWrapper::UpdateNavigator, this))
{
- maNavigator.SetPosSizePixel(
- Point(0,0),
- GetSizePixel());
-
maNavigator.SetBackground(sfx2::sidebar::Theme::GetWallpaper(sfx2::sidebar::Theme::Paint_PanelBackground));
- maNavigator.Show();
+ maNavigator.SetPosSizePixel(
+ Point(0,0),
+ GetSizePixel());
+
maNavigator.SetBackground(sfx2::sidebar::Theme::GetWallpaper(sfx2::sidebar::Theme::Paint_PanelBackground));
+ maNavigator.Show();
}
-
-
NavigatorWrapper::~NavigatorWrapper (void)
{
}
-
-
void NavigatorWrapper::Resize (void)
{
- maNavigator.SetSizePixel(GetSizePixel());
+ maNavigator.SetSizePixel(GetSizePixel());
}
-
-
css::ui::LayoutSize NavigatorWrapper::GetHeightForWidth (const sal_Int32
nWidth)
{
- (void)nWidth;
-
- return css::ui::LayoutSize(-1,-1,-1);
-}
-
+ (void)nWidth;
+ return css::ui::LayoutSize(-1,-1,-1);
+}
void NavigatorWrapper::UpdateNavigator (void)
{
- maNavigator.InitTreeLB(mrViewShellBase.GetDocument());
+ maNavigator.InitTreeLB(mrViewShellBase.GetDocument());
}
-
-
void NavigatorWrapper::GetFocus (void)
{
- maNavigator.GrabFocus();
+ maNavigator.GrabFocus();
}
-
-
} } // end of namespace sd::sidebar
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sd/source/ui/slideshow/PaneHider.cxx
b/main/sd/source/ui/slideshow/PaneHider.cxx
index 162c31d1b2..29f6c1a99f 100644
--- a/main/sd/source/ui/slideshow/PaneHider.cxx
+++ b/main/sd/source/ui/slideshow/PaneHider.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,21 +7,20 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sd.hxx"
#include "PaneHider.hxx"
@@ -48,66 +47,66 @@ using ::com::sun::star::lang::DisposedException;
namespace sd {
PaneHider::PaneHider (const ViewShell& rViewShell, SlideshowImpl* pSlideShow)
- : mrViewShell(rViewShell),
- mbWindowVisibilitySaved(false),
- mbOriginalLeftPaneWindowVisibility(false),
- mbOriginalRightPaneWindowVisibility(false)
+ : mrViewShell(rViewShell),
+ mbWindowVisibilitySaved(false),
+ mbOriginalLeftPaneWindowVisibility(false),
+ mbOriginalRightPaneWindowVisibility(false)
{
- // Hide the left and right pane windows when a slideshow exists and is
- // not full screen.
- if (pSlideShow!=NULL && !pSlideShow->isFullScreen()) try
- {
- Reference<XControllerManager> xControllerManager (
- mrViewShell.GetViewShellBase().GetController(), UNO_QUERY_THROW);
- mxConfigurationController =
xControllerManager->getConfigurationController();
- if (mxConfigurationController.is())
- {
- // Get and save the current configuration.
- mxConfiguration =
mxConfigurationController->getRequestedConfiguration();
- if (mxConfiguration.is())
- {
- // Iterate over the resources and deactivate the panes.
- Sequence<Reference<XResourceId> > aResources (
- mxConfiguration->getResources(
- NULL,
- framework::FrameworkHelper::msPaneURLPrefix,
- AnchorBindingMode_DIRECT));
- for (sal_Int32 nIndex=0; nIndex<aResources.getLength();
++nIndex)
- {
- Reference<XResourceId> xPaneId (aResources[nIndex]);
- if ( !
xPaneId->getResourceURL().equals(FrameworkHelper::msCenterPaneURL))
- {
-
mxConfigurationController->requestResourceDeactivation(xPaneId);
- }
- }
- }
- }
-
FrameworkHelper::Instance(mrViewShell.GetViewShellBase())->WaitForUpdate();
- }
- catch (RuntimeException&)
- {
- DBG_UNHANDLED_EXCEPTION();
- }
+ // Hide the left and right pane windows when a slideshow exists and is
+ // not full screen.
+ if (pSlideShow!=NULL && !pSlideShow->isFullScreen()) try
+ {
+ Reference<XControllerManager> xControllerManager (
+ mrViewShell.GetViewShellBase().GetController(),
UNO_QUERY_THROW);
+ mxConfigurationController =
xControllerManager->getConfigurationController();
+ if (mxConfigurationController.is())
+ {
+ // Get and save the current configuration.
+ mxConfiguration =
mxConfigurationController->getRequestedConfiguration();
+ if (mxConfiguration.is())
+ {
+ // Iterate over the resources and deactivate
the panes.
+ Sequence<Reference<XResourceId> > aResources (
+ mxConfiguration->getResources(
+ NULL,
+
framework::FrameworkHelper::msPaneURLPrefix,
+ AnchorBindingMode_DIRECT));
+ for (sal_Int32 nIndex=0;
nIndex<aResources.getLength(); ++nIndex)
+ {
+ Reference<XResourceId> xPaneId
(aResources[nIndex]);
+ if ( !
xPaneId->getResourceURL().equals(FrameworkHelper::msCenterPaneURL))
+ {
+
mxConfigurationController->requestResourceDeactivation(xPaneId);
+ }
+ }
+ }
+ }
+
FrameworkHelper::Instance(mrViewShell.GetViewShellBase())->WaitForUpdate();
+ }
+ catch (RuntimeException&)
+ {
+ DBG_UNHANDLED_EXCEPTION();
+ }
}
-
-
PaneHider::~PaneHider (void)
{
- if (mxConfiguration.is() && mxConfigurationController.is())
- {
- try
- {
- mxConfigurationController->restoreConfiguration(mxConfiguration);
- }
- catch (DisposedException&)
- {
- // When the configuration controller is already disposed then
- // there is no point in restoring the configuration.
- }
- }
+ if (mxConfiguration.is() && mxConfigurationController.is())
+ {
+ try
+ {
+
mxConfigurationController->restoreConfiguration(mxConfiguration);
+ }
+ catch (DisposedException&)
+ {
+ // When the configuration controller is already
disposed then
+ // there is no point in restoring the configuration.
+ }
+ }
}
} // end of namespace sd
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sd/source/ui/slideshow/showwin.cxx
b/main/sd/source/ui/slideshow/showwin.cxx
index 80e5dad25e..ed06ac421b 100644
--- a/main/sd/source/ui/slideshow/showwin.cxx
+++ b/main/sd/source/ui/slideshow/showwin.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -63,9 +63,9 @@ ShowWindow::ShowWindow( const ::rtl::Reference< SlideshowImpl
>& xController, ::
{
SetOutDevViewType( OUTDEV_VIEWTYPE_SLIDESHOW );
- // Do never mirror the preview window. This explicitly includes right
- // to left writing environments.
- EnableRTL (sal_False);
+ // Do never mirror the preview window. This explicitly includes right
+ // to left writing environments.
+ EnableRTL (sal_False);
MapMode aMap(GetMapMode());
aMap.SetMapUnit(MAP_100TH_MM);
@@ -82,7 +82,7 @@ ShowWindow::ShowWindow( const ::rtl::Reference< SlideshowImpl
>& xController, ::
maShowBackground = Wallpaper( Color( COL_BLACK ) );
// SetBackground( Wallpaper( Color( COL_BLACK ) ) );
- SetBackground(); // avoids that VCL paints any background!
+ SetBackground(); // avoids that VCL paints any background!
GetParent()->Show();
AddEventListener( LINK( this, ShowWindow, EventHdl ) );
}
@@ -94,9 +94,7 @@ ShowWindow::~ShowWindow(void)
}
/*************************************************************************
-|*
|* Keyboard event
-|*
\************************************************************************/
void ShowWindow::KeyInput(const KeyEvent& rKEvt)
@@ -182,9 +180,7 @@ void ShowWindow::KeyInput(const KeyEvent& rKEvt)
}
/*************************************************************************
-|*
|* MouseButtonDown event
-|*
\************************************************************************/
void ShowWindow::MouseButtonDown(const MouseEvent& /*rMEvt*/)
@@ -200,9 +196,7 @@ void ShowWindow::MouseButtonDown(const MouseEvent&
/*rMEvt*/)
}
/*************************************************************************
-|*
|* MouseMove event
-|*
\************************************************************************/
void ShowWindow::MouseMove(const MouseEvent& /*rMEvt*/)
@@ -247,9 +241,7 @@ void ShowWindow::MouseMove(const MouseEvent& /*rMEvt*/)
}
/*************************************************************************
-|*
|* MouseButtonUp event
-|*
\************************************************************************/
void ShowWindow::MouseButtonUp(const MouseEvent& rMEvt)
@@ -265,7 +257,7 @@ void ShowWindow::MouseButtonUp(const MouseEvent& rMEvt)
else if( (( SHOWWINDOWMODE_BLANK == meShowWindowMode ) || (
SHOWWINDOWMODE_PAUSE == meShowWindowMode ))
&& !rMEvt.IsRight() )
{
- RestartShow();
+ RestartShow();
}
else
{
@@ -275,9 +267,7 @@ void ShowWindow::MouseButtonUp(const MouseEvent& rMEvt)
}
/*************************************************************************
-|*
|* Paint-Event: wenn FuSlideShow noch erreichbar ist, weiterleiten
-|*
\************************************************************************/
void ShowWindow::Paint(const Rectangle& rRect)
@@ -286,7 +276,7 @@ void ShowWindow::Paint(const Rectangle& rRect)
{
/*
Region aOldClipRegion( GetClipRegion() );
-
+
Region aClipRegion( rRect );
aClipRegion.Exclude( maPresArea );
SetClipRegion( aClipRegion );
@@ -324,9 +314,7 @@ void ShowWindow::Paint(const Rectangle& rRect)
}
/*************************************************************************
-|*
|* Notify
-|*
\************************************************************************/
long ShowWindow::Notify(NotifyEvent& rNEvt)
@@ -456,7 +444,7 @@ sal_Bool ShowWindow::SetPauseMode( sal_Int32
nPageIndexToRestart, sal_Int32 nTim
sal_Bool ShowWindow::SetBlankMode( sal_Int32 nPageIndexToRestart, const Color&
rBlankColor )
{
- if( ( SHOWWINDOWMODE_NORMAL == meShowWindowMode ) && mpViewShell &&
mpViewShell->GetView() )
+ if( ( SHOWWINDOWMODE_NORMAL == meShowWindowMode ) && mpViewShell &&
mpViewShell->GetView() )
{
DeleteWindowFromPaintView();
mnRestartPageIndex = nPageIndexToRestart;
@@ -495,7 +483,7 @@ void ShowWindow::TerminateShow()
Erase();
// SetBackground( maShowBackground );
maShowBackground = Wallpaper( Color( COL_BLACK ) );
- meShowWindowMode = SHOWWINDOWMODE_NORMAL;
+ meShowWindowMode = SHOWWINDOWMODE_NORMAL;
mnPauseTimeout = SLIDE_NO_TIMEOUT;
if( mpViewShell )
@@ -526,7 +514,7 @@ void ShowWindow::RestartShow()
void ShowWindow::RestartShow( sal_Int32 nPageIndexToRestart )
{
- ShowWindowMode eOldShowWindowMode = meShowWindowMode;
+ ShowWindowMode eOldShowWindowMode = meShowWindowMode;
maLogo.Clear();
maPauseTimer.Stop();
@@ -539,17 +527,17 @@ void ShowWindow::RestartShow( sal_Int32
nPageIndexToRestart )
if( mpViewShell )
{
rtl::Reference< SlideShow > xSlideShow(
SlideShow::GetSlideShow( mpViewShell->GetViewShellBase() ) );
-
+
if( xSlideShow.is() )
{
AddWindowToPaintView();
-
- if( SHOWWINDOWMODE_BLANK == eOldShowWindowMode )
+
+ if( SHOWWINDOWMODE_BLANK == eOldShowWindowMode )
{
xSlideShow->pause(false);
Invalidate();
}
- else
+ else
{
xSlideShow->jumpToPageIndex(
nPageIndexToRestart );
}
@@ -612,18 +600,18 @@ void ShowWindow::DrawPauseScene( sal_Bool bTimeoutOnly )
aVMap.SetOrigin( Point() );
aVDev.SetMapMode( aVMap );
aVDev.SetBackground( Wallpaper( Color( COL_BLACK ) ) );
-
+
// set font first, to determine real output height
aVDev.SetFont( aFont );
-
+
const Size aVDevSize( aOutSize.Width(), aVDev.GetTextHeight() );
if( aVDev.SetOutputSize( aVDevSize ) )
{
// Note: if performance gets an issue here, we can use
NumberFormatter directly
SvtSysLocale aSysLocale;
- const LocaleDataWrapper& aLocaleData =
aSysLocale.GetLocaleData();
-
+ const LocaleDataWrapper& aLocaleData =
aSysLocale.GetLocaleData();
+
aText.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " ( " ));
aText += aLocaleData.getDuration( Time( 0, 0,
mnPauseTimeout ) );
aText.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " )" ));
@@ -665,7 +653,7 @@ void ShowWindow::DrawEndScene()
void ShowWindow::DrawBlankScene()
{
- // just blank through background color => nothing to be done here
+ // just blank through background color => nothing to be done here
}
//
-----------------------------------------------------------------------------
@@ -688,7 +676,7 @@ IMPL_LINK( ShowWindow, MouseTimeoutHdl, Timer*, EMPTYARG )
if( mbMouseCursorHidden )
{
// not enough mouse movements since first recording so
- // cancle show mouse pointer for now
+ // cancel show mouse pointer for now
mnFirstMouseMove = 0;
}
else
@@ -723,7 +711,7 @@ void ShowWindow::DeleteWindowFromPaintView()
if( mpViewShell->GetView() )
mpViewShell->GetView()->DeleteWindowFromPaintView( this );
- sal_uInt16 nChild = GetChildCount();
+ sal_uInt16 nChild = GetChildCount();
while( nChild-- )
GetChild( nChild )->Show( sal_False );
}
@@ -733,31 +721,33 @@ void ShowWindow::AddWindowToPaintView()
if( mpViewShell->GetView() )
mpViewShell->GetView()->AddWindowToPaintView( this );
- sal_uInt16 nChild = GetChildCount();
+ sal_uInt16 nChild = GetChildCount();
while( nChild-- )
GetChild( nChild )->Show( sal_True );
}
// Overload the sd::Window's CreateAccessible to create a different accessible
object
::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessible>
- ShowWindow::CreateAccessible (void)
+ ::com::sun::star::accessibility::XAccessible>
+ ShowWindow::CreateAccessible (void)
{
::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible > xAcc = GetAccessible(sal_False);
if (xAcc.get())
{
return xAcc;
}
- if (mpViewShell != NULL)
+ if (mpViewShell != NULL)
{
xAcc = mpViewShell->CreateAccessibleDocumentView (this);
SetAccessible(xAcc);
return xAcc;
}
- else
- {
- OSL_TRACE ("::sd::Window::CreateAccessible: no view shell");
+ else
+ {
+ OSL_TRACE ("::sd::Window::CreateAccessible: no view shell");
return ::Window::CreateAccessible ();
- }
+ }
}
} // end of namespace sd
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sd/source/ui/view/DocumentRenderer.src
b/main/sd/source/ui/view/DocumentRenderer.src
index aa1a7354f1..017604f99e 100644
--- a/main/sd/source/ui/view/DocumentRenderer.src
+++ b/main/sd/source/ui/view/DocumentRenderer.src
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -26,32 +26,32 @@
Resource _STR_IMPRESS_PRINT_UI_OPTIONS
{
- String _STR_IMPRESS_PRINT_UI_GROUP_NAME
- {
- Text [en-US] = "%PRODUCTNAME %s";
- };
- String _STR_IMPRESS_PRINT_UI_PRINT_CONTENT
- {
- Text [ en-US ] = "Print content";
+ String _STR_IMPRESS_PRINT_UI_GROUP_NAME
+ {
+ Text [en-US] = "%PRODUCTNAME %s" ;
+ };
+ String _STR_IMPRESS_PRINT_UI_PRINT_CONTENT
+ {
+ Text [ en-US ] = "Print content" ;
};
String _STR_IMPRESS_PRINT_UI_PRINT_GROUP
{
- Text [ en-US ] = "Print";
- };
- String _STR_IMPRESS_PRINT_UI_CONTENT
- {
- Text [ en-US ] = "Document";
- };
- StringArray _STR_IMPRESS_PRINT_UI_CONTENT_CHOICES
- {
- ItemList [ en-US ] =
- {
- < "Slides" ; > ;
- < "Handouts" ; > ;
- < "Notes" ; > ;
- < "Outline" ; > ;
- };
- };
+ Text [ en-US ] = "Print" ;
+ };
+ String _STR_IMPRESS_PRINT_UI_CONTENT
+ {
+ Text [ en-US ] = "Document" ;
+ };
+ StringArray _STR_IMPRESS_PRINT_UI_CONTENT_CHOICES
+ {
+ ItemList [ en-US ] =
+ {
+ < "Slides" ; > ;
+ < "Handouts" ; > ;
+ < "Notes" ; > ;
+ < "Outline" ; > ;
+ };
+ };
String _STR_IMPRESS_PRINT_UI_SLIDESPERPAGE
{
Text [ en-US ] = "Slides per page" ;
@@ -60,14 +60,14 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS
{
ItemList [ en-US ] =
{
- < "Default" ; > ;
- < "1" ; > ;
- < "2" ; > ;
- < "3" ; > ;
- < "4" ; > ;
- < "6" ; > ;
- < "9" ; > ;
- };
+ < "Default" ; > ;
+ < "1" ; > ;
+ < "2" ; > ;
+ < "3" ; > ;
+ < "4" ; > ;
+ < "6" ; > ;
+ < "9" ; > ;
+ };
};
String _STR_IMPRESS_PRINT_UI_ORDER
{
@@ -77,122 +77,124 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS
{
ItemList [ en-US ] =
{
- < "Left to right, then down" ; > ;
- < "Top to bottom, then right" ; > ;
- };
+ < "Left to right, then down" ; > ;
+ < "Top to bottom, then right" ; > ;
+ };
};
String _STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT
{
- Text [ en-US ] = "~Contents";
+ Text [ en-US ] = "~Contents" ;
};
String _STR_IMPRESS_PRINT_UI_IS_PRINT_NAME
{
- Text [ en-US ] = "~Slide name";
+ Text [ en-US ] = "~Slide name" ;
};
String _STR_DRAW_PRINT_UI_IS_PRINT_NAME
{
- Text [ en-US ] = "P~age name";
+ Text [ en-US ] = "P~age name" ;
};
String _STR_IMPRESS_PRINT_UI_IS_PRINT_DATE
{
- Text [ en-US ] = "~Date and time";
+ Text [ en-US ] = "~Date and time" ;
};
String _STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN
{
- Text [ en-US ] = "Hidden pages";
+ Text [ en-US ] = "Hidden pages" ;
};
String _STR_IMPRESS_PRINT_UI_OUTPUT_OPTIONS_GROUP
{
- Text [ en-US ] = "Output options";
+ Text [ en-US ] = "Output options" ;
};
String _STR_IMPRESS_PRINT_UI_QUALITY
{
- Text [ en-US ] = "Color";
+ Text [ en-US ] = "Color" ;
};
StringArray _STR_IMPRESS_PRINT_UI_QUALITY_CHOICES
{
ItemList [ en-US ] =
{
- < "Original colors" ; > ;
- < "Grayscale" ; > ;
- < "Black & white" ; > ;
- };
+ < "Original colors" ; > ;
+ < "Grayscale" ; > ;
+ < "Black & white" ; > ;
+ };
};
String _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS
{
- Text [ en-US ] = "~Size";
+ Text [ en-US ] = "~Size" ;
};
StringArray _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES
{
ItemList [ en-US ] =
{
- < "Original size" ; > ;
- < "Fit to printable page" ; > ;
- < "Distribute on multiple sheets of paper" ; > ;
- < "Tile sheet of paper with repeated slides" ; > ;
- };
+ < "Original size" ;
> ;
+ < "Fit to printable page" ;
> ;
+ < "Distribute on multiple sheets of paper" ; > ;
+ < "Tile sheet of paper with repeated slides" ; > ;
+ };
};
StringArray _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW
{
ItemList [ en-US ] =
{
- < "Original size" ; > ;
- < "Fit to printable page" ; > ;
- < "Distribute on multiple sheets of paper" ; > ;
- < "Tile sheet of paper with repeated pages" ; > ;
- };
+ < "Original size" ;
> ;
+ < "Fit to printable page" ;
> ;
+ < "Distribute on multiple sheets of paper" ; > ;
+ < "Tile sheet of paper with repeated pages" ; > ;
+ };
};
String _STR_IMPRESS_PRINT_UI_BROCHURE
{
- Text [en-US] = "Brochure";
+ Text [en-US] = "Brochure" ;
};
String _STR_IMPRESS_PRINT_UI_PAGE_SIDES
{
- Text [ en-US ] = "Page sides";
+ Text [ en-US ] = "Page sides" ;
};
String _STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE
{
- Text [ en-US ] = "Include";
+ Text [ en-US ] = "Include" ;
};
StringArray _STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST
{
ItemList [ en-US ] =
{
- < "All pages" ; > ;
- < "Front sides / right pages" ; > ;
- < "Back sides / left pages" ; > ;
- };
- };
+ < "All pages" ; > ;
+ < "Front sides / right pages" ; > ;
+ < "Back sides / left pages" ; > ;
+ };
+ };
- String _STR_IMPRESS_PRINT_UI_PAPER_TRAY_GROUP
- {
- Text [ en-US ] = "Paper tray";
+ String _STR_IMPRESS_PRINT_UI_PAPER_TRAY_GROUP
+ {
+ Text [ en-US ] = "Paper tray" ;
};
String _STR_IMPRESS_PRINT_UI_PAPER_TRAY
{
- Text [ en-US ] = "~Use only paper tray from printer preferences";
+ Text [ en-US ] = "~Use only paper tray from printer preferences" ;
};
String _STR_IMPRESS_PRINT_UI_PAGE_RANGE
{
- Text [en-US] = "Print range";
+ Text [en-US] = "Print range" ;
};
StringArray _STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE
{
ItemList [ en-US ] =
{
- < "~All slides"; >;
- < "~Slides"; >;
- < "Se~lection"; >;
+ < "~All slides" ; > ;
+ < "~Slides" ; > ;
+ < "Se~lection" ; > ;
};
- };
+ };
- StringArray _STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE
- {
+ StringArray _STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE
+ {
ItemList [ en-US ] =
{
- < "~All pages"; >;
- < "Pa~ges"; >;
- < "Se~lection"; >;
- };
- };
+ < "~All pages" ; > ;
+ < "Pa~ges" ; > ;
+ < "Se~lection" ; > ;
+ };
+ };
};
+
+// ********************************************************************** EOF
