You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ja...@apache.org on 2013/10/26 16:59:23 UTC
svn commit: r1536001 [3/4] - in /openoffice/branches/l10n40/main:
basegfx/inc/basegfx/polygon/ basegfx/source/polygon/
connectivity/source/commontools/ connectivity/source/resource/
cppuhelper/source/ cui/source/dialogs/ cui/source/options/ cui/source/...
Modified: openoffice/branches/l10n40/main/cui/source/dialogs/colorpicker.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/cui/source/dialogs/colorpicker.hrc?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/cui/source/dialogs/colorpicker.hrc (original)
+++ openoffice/branches/l10n40/main/cui/source/dialogs/colorpicker.hrc Sat Oct 26 14:59:22 2013
@@ -19,45 +19,45 @@
*
*************************************************************/
-#ifndef _CUI_COLORPICKER_HRC_
-#define _CUI_COLORPICKER_HRC_
-
-#include <cuires.hrc>
-
-#define FT_BOTTOMLINE 1
-#define BTN_OK 2
-#define BTN_CANCEL 3
-#define BTN_HELP 4
-
-#define CT_COLORFIELD 5
-#define CT_COLORSLIDER 6
-#define CT_PREVIEW 7
-#define CT_PREVIOUS 8
-
-#define FL_RGB 9
-#define CT_RED 10
-#define CT_GREEN 11
-#define CT_BLUE 12
-#define CT_HEX 13
-
-#define FL_HSB 14
-#define CT_HUE 15
-#define CT_SATURATION 16
-#define CT_BRIGHTNESS 17
-
-#define FL_CMYK 18
-#define CT_CYAN 19
-#define CT_MAGENTA 20
-#define CT_YELLOW 21
-#define CT_KEY 22
-
-#define PB_PICKER 23
-
-#define CT_LEFT_SLIDER 24
-#define CT_RIGHT_SLIDER 25
-
-#define CT_SLIDERIMG 26
-
-#endif
-
-// eof
+#ifndef _CUI_COLORPICKER_HRC_
+#define _CUI_COLORPICKER_HRC_
+
+#include <cuires.hrc>
+
+#define FT_BOTTOMLINE 1
+#define BTN_OK 2
+#define BTN_CANCEL 3
+#define BTN_HELP 4
+
+#define CT_COLORFIELD 5
+#define CT_COLORSLIDER 6
+#define CT_PREVIEW 7
+#define CT_PREVIOUS 8
+
+#define FL_RGB 9
+#define CT_RED 10
+#define CT_GREEN 11
+#define CT_BLUE 12
+#define CT_HEX 13
+
+#define FL_HSB 14
+#define CT_HUE 15
+#define CT_SATURATION 16
+#define CT_BRIGHTNESS 17
+
+#define FL_CMYK 18
+#define CT_CYAN 19
+#define CT_MAGENTA 20
+#define CT_YELLOW 21
+#define CT_KEY 22
+
+#define PB_PICKER 23
+
+#define CT_LEFT_SLIDER 24
+#define CT_RIGHT_SLIDER 25
+
+#define CT_SLIDERIMG 26
+
+#endif
+
+// eof
Modified: openoffice/branches/l10n40/main/cui/source/dialogs/colorpicker.src
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/cui/source/dialogs/colorpicker.src?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/cui/source/dialogs/colorpicker.src (original)
+++ openoffice/branches/l10n40/main/cui/source/dialogs/colorpicker.src Sat Oct 26 14:59:22 2013
@@ -19,464 +19,464 @@
*
*************************************************************/
-#include "colorpicker.hrc"
-
-#define DLG_WIDTH 295
-#define DLG_HEIGHT 216
-
-#define BUTTON_WIDTH 50
-#define BUTTON_HEIGHT 14
-
-#define METRIC_WIDTH 30
-#define METRIC_HEIGHT 12
-
-#define RADIO_WIDTH 8
-#define RADIO_HEIGHT 8
-
-#define LABEL_WIDTH 50
-#define LABEL_HEIGHT 10
-
-#define SLIDER_WIDTH 22
-#define PREVIEW_HEIGHT 16
-
-#define LINE_WIDTH (3 + RADIO_WIDTH + 2 + LABEL_WIDTH + 3 + METRIC_WIDTH + 3)
-#define LINE_HEIGHT 8
-
-#define CONTROL_AREA_X (DLG_WIDTH - LINE_WIDTH - 6)
-#define CONTROL_AREA_X_RADIO (CONTROL_AREA_X + 3)
-#define CONTROL_AREA_X_LABEL (CONTROL_AREA_X + 3 + RADIO_WIDTH + 2)
-#define CONTROL_AREA_X_METRIC (CONTROL_AREA_X + 3 + RADIO_WIDTH + 2 + LABEL_WIDTH + 3)
-
-#define CHOOSER_SIZE (CONTROL_AREA_X - 6 - SLIDER_WIDTH - 2 - 2 )
-
-#define BOTTOMLINE_Y (DLG_HEIGHT - 3 - 3 - 8 - 14)
-#define BUTTON_LINE_Y (BOTTOMLINE_Y + 8 + 3)
-
-#define RGB_Y1 (6 + LINE_HEIGHT + 1)
-#define RGB_Y2 (RGB_Y1 + METRIC_HEIGHT + 2)
-#define RGB_Y3 (RGB_Y2 + METRIC_HEIGHT + 2)
-#define RGB_Y4 (RGB_Y3 + METRIC_HEIGHT + 4)
-#define HSB_Y0 (RGB_Y4 + METRIC_HEIGHT + 1)
-#define HSB_Y1 (HSB_Y0 + LINE_HEIGHT + 2)
-#define HSB_Y2 (HSB_Y1 + METRIC_HEIGHT + 2)
-#define HSB_Y3 (HSB_Y2 + METRIC_HEIGHT + 2)
-#define CMYK_Y0 (HSB_Y3 + METRIC_HEIGHT + 1)
-#define CMYK_Y1 (CMYK_Y0 + LINE_HEIGHT + 1)
-#define CMYK_Y2 (CMYK_Y1 + METRIC_HEIGHT + 2)
-#define CMYK_Y3 (CMYK_Y2 + METRIC_HEIGHT + 2)
-#define CMYK_Y4 (CMYK_Y3 + METRIC_HEIGHT + 2)
-
-
-
-ModalDialog RID_CUI_DIALOG_COLORPICKER
-{
- HelpID = "cui:ModalDialog:ColorPicker";
-
- OutputSize = TRUE ;
- SvLook = TRUE ;
- Moveable = TRUE ;
- Size = MAP_APPFONT ( DLG_WIDTH , DLG_HEIGHT ) ;
-
- Text [ en-US ] = "Color Picker" ;
-
- Control CT_COLORFIELD
- {
- HelpID = "cui:Control:ColorPicker:ColorField";
- Pos = MAP_APPFONT ( 6 , 6 ) ;
- Size = MAP_APPFONT ( CHOOSER_SIZE , CHOOSER_SIZE ) ;
- Border = TRUE;
- TabStop = TRUE ;
- };
-
- Control CT_COLORSLIDER
- {
- HelpID = "cui:Control:ColorPicker:ColorSlider";
- Pos = MAP_APPFONT ( CONTROL_AREA_X - 2 - SLIDER_WIDTH + 4 , 6 ) ;
- Size = MAP_APPFONT ( SLIDER_WIDTH - 8 , CHOOSER_SIZE ) ;
- Border = TRUE;
- TabStop = TRUE ;
- };
-
- Control CT_PREVIEW
- {
- HelpID = "cui:Control:ColorPicker:ColorPreview";
- Pos = MAP_APPFONT ( 6 , 6 + CHOOSER_SIZE + 3 ) ;
- Size = MAP_APPFONT ( CHOOSER_SIZE , PREVIEW_HEIGHT ) ;
- Border = FALSE;
- };
-
- Control CT_PREVIOUS
- {
- HelpID = "cui:Control:ColorPicker:ColorPrevious";
- Pos = MAP_APPFONT ( 6 + (CHOOSER_SIZE/2), 6 + CHOOSER_SIZE + 3 ) ;
- Size = MAP_APPFONT ( CHOOSER_SIZE/2 , PREVIEW_HEIGHT ) ;
- Border = FALSE;
- Hide = TRUE;
- };
-
- FixedImage CT_LEFT_SLIDER
- {
- };
-
- FixedImage CT_RIGHT_SLIDER
- {
- };
-
- Image CT_SLIDERIMG
- {
- ImageBitmap = Bitmap { File = "colorslider.png" ; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; };
- };
-
-#if 0
- ImageButton PB_PICKER
- {
- HelpID = "cui:ImageButton:ColorPicker:Picker";
- Pos = MAP_APPFONT ( CONTROL_AREA_X - 2 - SLIDER_WIDTH + 4, 6 + CHOOSER_SIZE + 3 ) ;
- Size = MAP_APPFONT( SLIDER_WIDTH - 8, PREVIEW_HEIGHT );
- TabStop = TRUE ;
- QuickHelpText [ en-US ] = "Pick a color from the document" ;
- ButtonImage = Image
- {
- ImageBitmap = Bitmap { File = "pipette.png" ; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; } ;
- };
- };
-#endif
-
- FixedLine FL_RGB
- {
- Pos = MAP_APPFONT ( CONTROL_AREA_X , 6 ) ;
- Size = MAP_APPFONT ( LINE_WIDTH , LINE_HEIGHT ) ;
- Text [ en-US ] = "RGB" ;
- };
-
- RadioButton CT_RED
- {
- HelpID = "cui:RadioButton:ColorPicker:Red";
- Pos = MAP_APPFONT ( CONTROL_AREA_X_RADIO , RGB_Y1+2 ) ;
- Size = MAP_APPFONT ( RADIO_WIDTH , RADIO_HEIGHT ) ;
- Group = TRUE;
- };
-
- RadioButton CT_GREEN
- {
- HelpID = "cui:RadioButton:ColorPicker:Green";
- Pos = MAP_APPFONT ( CONTROL_AREA_X_RADIO , RGB_Y2+2 ) ;
- Size = MAP_APPFONT ( RADIO_WIDTH , RADIO_HEIGHT ) ;
- };
-
- RadioButton CT_BLUE
- {
- HelpID = "cui:RadioButton:ColorPicker:Blue";
- Pos = MAP_APPFONT ( CONTROL_AREA_X_RADIO , RGB_Y3+2 ) ;
- Size = MAP_APPFONT ( RADIO_WIDTH , RADIO_HEIGHT ) ;
- };
-
- RadioButton CT_HUE
- {
- HelpID = "cui:RadioButton:ColorPicker:Hue";
- Pos = MAP_APPFONT ( CONTROL_AREA_X_RADIO , HSB_Y1+2 ) ;
- Size = MAP_APPFONT ( RADIO_WIDTH , RADIO_HEIGHT ) ;
- Check = TRUE ;
- };
-
- RadioButton CT_SATURATION
- {
- HelpID = "cui:RadioButton:ColorPicker:Saturation";
- Pos = MAP_APPFONT ( CONTROL_AREA_X_RADIO , HSB_Y2+2 ) ;
- Size = MAP_APPFONT ( RADIO_WIDTH , RADIO_HEIGHT ) ;
- };
-
- RadioButton CT_BRIGHTNESS
- {
- HelpID = "cui:RadioButton:ColorPicker:Brightness";
- Pos = MAP_APPFONT ( CONTROL_AREA_X_RADIO , HSB_Y3+2 ) ;
- Size = MAP_APPFONT ( RADIO_WIDTH , RADIO_HEIGHT ) ;
- };
-
- FixedText CT_RED
- {
- Pos = MAP_APPFONT ( CONTROL_AREA_X_LABEL , RGB_Y1+1 ) ;
- Size = MAP_APPFONT ( LABEL_WIDTH , LABEL_HEIGHT ) ;
- Text [ en-US ] = "~Red" ;
- };
-
- MetricField CT_RED
- {
- HelpID = "cui:MetricField:ColorPicker:Red";
- Border = TRUE ;
- Pos = MAP_APPFONT ( CONTROL_AREA_X_METRIC , RGB_Y1 ) ;
- Size = MAP_APPFONT ( METRIC_WIDTH , METRIC_HEIGHT ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Maximum = 255 ;
- Last = 255 ;
- };
-
- FixedText CT_GREEN
- {
- Pos = MAP_APPFONT ( CONTROL_AREA_X_LABEL , RGB_Y2+1 ) ;
- Size = MAP_APPFONT ( LABEL_WIDTH , LABEL_HEIGHT ) ;
- Text [ en-US ] = "~Green" ;
- };
-
- MetricField CT_GREEN
- {
- HelpID = "cui:MetricField:ColorPicker:Green";
- Border = TRUE ;
- Pos = MAP_APPFONT ( CONTROL_AREA_X_METRIC , RGB_Y2 ) ;
- Size = MAP_APPFONT ( METRIC_WIDTH , METRIC_HEIGHT ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Maximum = 255 ;
- Last = 255 ;
- };
-
- FixedText CT_BLUE
- {
- Pos = MAP_APPFONT ( CONTROL_AREA_X_LABEL , RGB_Y3+1 ) ;
- Size = MAP_APPFONT ( LABEL_WIDTH , LABEL_HEIGHT ) ;
- Text [ en-US ] = "~Blue" ;
- };
-
- MetricField CT_BLUE
- {
- HelpID = "cui:MetricField:ColorPicker:Blue";
- Border = TRUE ;
- Pos = MAP_APPFONT ( CONTROL_AREA_X_METRIC , RGB_Y3 ) ;
- Size = MAP_APPFONT ( METRIC_WIDTH , METRIC_HEIGHT ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Maximum = 255 ;
- Last = 255 ;
- };
-
- FixedText CT_HEX
- {
- Pos = MAP_APPFONT ( CONTROL_AREA_X_LABEL , RGB_Y4+1 ) ;
- Size = MAP_APPFONT ( LABEL_WIDTH , LABEL_HEIGHT ) ;
- Text [ en-US ] = "Hex ~#" ;
- };
-
- Edit CT_HEX
- {
- HelpID = "cui:MetricField:ColorPicker:Hex";
- Border = TRUE ;
- Left = TRUE ;
- Pos = MAP_APPFONT ( CONTROL_AREA_X_METRIC , RGB_Y4 ) ;
- Size = MAP_APPFONT ( METRIC_WIDTH , METRIC_HEIGHT ) ;
- TabStop = TRUE ;
- };
-
-// -------------------------------------------------------------------------
-// HSB
-// -------------------------------------------------------------------------
-
- FixedLine FL_HSB
- {
- Pos = MAP_APPFONT ( CONTROL_AREA_X , HSB_Y0 ) ;
- Size = MAP_APPFONT ( LINE_WIDTH , LINE_HEIGHT ) ;
- Text [ en-US ] = "HSB" ;
- };
-
- FixedText CT_HUE
- {
- Pos = MAP_APPFONT ( CONTROL_AREA_X_LABEL , HSB_Y1+1 ) ;
- Size = MAP_APPFONT ( LABEL_WIDTH , LABEL_HEIGHT ) ;
- Text [ en-US ] = "H~ue" ;
- };
-
- MetricField CT_HUE
- {
- HelpID = "cui:MetricField:ColorPicker:Hue";
- Border = TRUE ;
- Pos = MAP_APPFONT ( CONTROL_AREA_X_METRIC , HSB_Y1 ) ;
- Size = MAP_APPFONT ( METRIC_WIDTH , METRIC_HEIGHT ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Maximum = 360 ;
- Last = 360 ;
- Unit = FUNIT_CUSTOM ;
- };
-
- FixedText CT_SATURATION
- {
- Pos = MAP_APPFONT ( CONTROL_AREA_X_LABEL , HSB_Y2+1 ) ;
- Size = MAP_APPFONT ( LABEL_WIDTH , LABEL_HEIGHT ) ;
- Text [ en-US ] = "~Saturation" ;
- };
-
- MetricField CT_SATURATION
- {
- HelpID = "cui:MetricField:ColorPicker:Saturation";
- Border = TRUE ;
- Pos = MAP_APPFONT ( CONTROL_AREA_X_METRIC , HSB_Y2 ) ;
- Size = MAP_APPFONT ( METRIC_WIDTH , METRIC_HEIGHT ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Maximum = 100 ;
- Last = 100 ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = " %" ;
- };
-
- FixedText CT_BRIGHTNESS
- {
- Pos = MAP_APPFONT ( CONTROL_AREA_X_LABEL , HSB_Y3+1 ) ;
- Size = MAP_APPFONT ( LABEL_WIDTH , LABEL_HEIGHT ) ;
- Text [ en-US ] = "Bright~ness" ;
- };
-
- MetricField CT_BRIGHTNESS
- {
- HelpID = "cui:MetricField:ColorPicker:Brightness";
- Border = TRUE ;
- Pos = MAP_APPFONT ( CONTROL_AREA_X_METRIC , HSB_Y3 ) ;
- Size = MAP_APPFONT ( METRIC_WIDTH , METRIC_HEIGHT ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Maximum = 100 ;
- Last = 100 ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = " %" ;
- };
-
-// -------------------------------------------------------------------------
-// CMYK
-// -------------------------------------------------------------------------
-
- FixedLine FL_CMYK
- {
- Pos = MAP_APPFONT ( CONTROL_AREA_X , CMYK_Y0 ) ;
- Size = MAP_APPFONT ( LINE_WIDTH , LINE_HEIGHT ) ;
- Text [ en-US ] = "CMYK" ;
- };
-
- FixedText CT_CYAN
- {
- Pos = MAP_APPFONT ( CONTROL_AREA_X_LABEL , CMYK_Y1+1 ) ;
- Size = MAP_APPFONT ( LABEL_WIDTH , LABEL_HEIGHT ) ;
- Text [ en-US ] = "~Cyan" ;
- };
-
- MetricField CT_CYAN
- {
- HelpID = "cui:MetricField:ColorPicker:Cyan";
- Border = TRUE ;
- Pos = MAP_APPFONT ( CONTROL_AREA_X_METRIC , CMYK_Y1 ) ;
- Size = MAP_APPFONT ( METRIC_WIDTH , METRIC_HEIGHT ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Maximum = 100 ;
- Last = 100 ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = " %" ;
- };
-
- FixedText CT_MAGENTA
- {
- Pos = MAP_APPFONT ( CONTROL_AREA_X_LABEL , CMYK_Y2+1 ) ;
- Size = MAP_APPFONT ( LABEL_WIDTH , LABEL_HEIGHT ) ;
- Text [ en-US ] = "~Magenta" ;
- };
-
- MetricField CT_MAGENTA
- {
- HelpID = "cui:MetricField:ColorPicker:Magenta";
- Border = TRUE ;
- Pos = MAP_APPFONT ( CONTROL_AREA_X_METRIC , CMYK_Y2 ) ;
- Size = MAP_APPFONT ( METRIC_WIDTH , METRIC_HEIGHT ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Maximum = 100 ;
- Last = 100 ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = " %" ;
- };
-
- FixedText CT_YELLOW
- {
- Pos = MAP_APPFONT ( CONTROL_AREA_X_LABEL , CMYK_Y3+1 ) ;
- Size = MAP_APPFONT ( LABEL_WIDTH , LABEL_HEIGHT ) ;
- Text [ en-US ] = "~Yellow" ;
- };
-
- MetricField CT_YELLOW
- {
- HelpID = "cui:MetricField:ColorPicker:Yellow";
- Border = TRUE ;
- Pos = MAP_APPFONT ( CONTROL_AREA_X_METRIC , CMYK_Y3 ) ;
- Size = MAP_APPFONT ( METRIC_WIDTH , METRIC_HEIGHT ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Maximum = 100 ;
- Last = 100 ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = " %" ;
- };
-
- FixedText CT_KEY
- {
- Pos = MAP_APPFONT ( CONTROL_AREA_X_LABEL , CMYK_Y4+1 ) ;
- Size = MAP_APPFONT ( LABEL_WIDTH , LABEL_HEIGHT ) ;
- Text [ en-US ] = "~Key" ;
- };
-
- MetricField CT_KEY
- {
- HelpID = "cui:MetricField:ColorPicker:Key";
- Border = TRUE ;
- Pos = MAP_APPFONT ( CONTROL_AREA_X_METRIC , CMYK_Y4 ) ;
- Size = MAP_APPFONT ( METRIC_WIDTH , METRIC_HEIGHT ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Maximum = 100 ;
- Last = 100 ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = " %" ;
- };
-
- // ------------------------------------------------------
- // bottom buttons
- // ------------------------------------------------------
-
- FixedLine FT_BOTTOMLINE
- {
- Pos = MAP_APPFONT ( 0 , BOTTOMLINE_Y ) ;
- Size = MAP_APPFONT ( DLG_WIDTH , 8 ) ;
- };
-
- HelpButton BTN_HELP
- {
- Pos = MAP_APPFONT ( 3 , BUTTON_LINE_Y ) ;
- Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
- TabStop = TRUE ;
- };
-
- OKButton BTN_OK
- {
- Pos = MAP_APPFONT ( DLG_WIDTH - 3 - BUTTON_WIDTH - 3 - BUTTON_WIDTH, BUTTON_LINE_Y ) ;
- Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
- TabStop = TRUE ;
- DefButton = TRUE ;
- };
- CancelButton BTN_CANCEL
- {
- Pos = MAP_APPFONT ( DLG_WIDTH - 3 - BUTTON_WIDTH, BUTTON_LINE_Y ) ;
- Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
- TabStop = TRUE ;
- };
-};
-
-// eof
+#include "colorpicker.hrc"
+
+#define DLG_WIDTH 295
+#define DLG_HEIGHT 216
+
+#define BUTTON_WIDTH 50
+#define BUTTON_HEIGHT 14
+
+#define METRIC_WIDTH 30
+#define METRIC_HEIGHT 12
+
+#define RADIO_WIDTH 8
+#define RADIO_HEIGHT 8
+
+#define LABEL_WIDTH 50
+#define LABEL_HEIGHT 10
+
+#define SLIDER_WIDTH 22
+#define PREVIEW_HEIGHT 16
+
+#define LINE_WIDTH (3 + RADIO_WIDTH + 2 + LABEL_WIDTH + 3 + METRIC_WIDTH + 3)
+#define LINE_HEIGHT 8
+
+#define CONTROL_AREA_X (DLG_WIDTH - LINE_WIDTH - 6)
+#define CONTROL_AREA_X_RADIO (CONTROL_AREA_X + 3)
+#define CONTROL_AREA_X_LABEL (CONTROL_AREA_X + 3 + RADIO_WIDTH + 2)
+#define CONTROL_AREA_X_METRIC (CONTROL_AREA_X + 3 + RADIO_WIDTH + 2 + LABEL_WIDTH + 3)
+
+#define CHOOSER_SIZE (CONTROL_AREA_X - 6 - SLIDER_WIDTH - 2 - 2 )
+
+#define BOTTOMLINE_Y (DLG_HEIGHT - 3 - 3 - 8 - 14)
+#define BUTTON_LINE_Y (BOTTOMLINE_Y + 8 + 3)
+
+#define RGB_Y1 (6 + LINE_HEIGHT + 1)
+#define RGB_Y2 (RGB_Y1 + METRIC_HEIGHT + 2)
+#define RGB_Y3 (RGB_Y2 + METRIC_HEIGHT + 2)
+#define RGB_Y4 (RGB_Y3 + METRIC_HEIGHT + 4)
+#define HSB_Y0 (RGB_Y4 + METRIC_HEIGHT + 1)
+#define HSB_Y1 (HSB_Y0 + LINE_HEIGHT + 2)
+#define HSB_Y2 (HSB_Y1 + METRIC_HEIGHT + 2)
+#define HSB_Y3 (HSB_Y2 + METRIC_HEIGHT + 2)
+#define CMYK_Y0 (HSB_Y3 + METRIC_HEIGHT + 1)
+#define CMYK_Y1 (CMYK_Y0 + LINE_HEIGHT + 1)
+#define CMYK_Y2 (CMYK_Y1 + METRIC_HEIGHT + 2)
+#define CMYK_Y3 (CMYK_Y2 + METRIC_HEIGHT + 2)
+#define CMYK_Y4 (CMYK_Y3 + METRIC_HEIGHT + 2)
+
+
+
+ModalDialog RID_CUI_DIALOG_COLORPICKER
+{
+ HelpID = "cui:ModalDialog:ColorPicker";
+
+ OutputSize = TRUE ;
+ SvLook = TRUE ;
+ Moveable = TRUE ;
+ Size = MAP_APPFONT ( DLG_WIDTH , DLG_HEIGHT ) ;
+
+ Text [ en-US ] = "Color Picker" ;
+
+ Control CT_COLORFIELD
+ {
+ HelpID = "cui:Control:ColorPicker:ColorField";
+ Pos = MAP_APPFONT ( 6 , 6 ) ;
+ Size = MAP_APPFONT ( CHOOSER_SIZE , CHOOSER_SIZE ) ;
+ Border = TRUE;
+ TabStop = TRUE ;
+ };
+
+ Control CT_COLORSLIDER
+ {
+ HelpID = "cui:Control:ColorPicker:ColorSlider";
+ Pos = MAP_APPFONT ( CONTROL_AREA_X - 2 - SLIDER_WIDTH + 4 , 6 ) ;
+ Size = MAP_APPFONT ( SLIDER_WIDTH - 8 , CHOOSER_SIZE ) ;
+ Border = TRUE;
+ TabStop = TRUE ;
+ };
+
+ Control CT_PREVIEW
+ {
+ HelpID = "cui:Control:ColorPicker:ColorPreview";
+ Pos = MAP_APPFONT ( 6 , 6 + CHOOSER_SIZE + 3 ) ;
+ Size = MAP_APPFONT ( CHOOSER_SIZE , PREVIEW_HEIGHT ) ;
+ Border = FALSE;
+ };
+
+ Control CT_PREVIOUS
+ {
+ HelpID = "cui:Control:ColorPicker:ColorPrevious";
+ Pos = MAP_APPFONT ( 6 + (CHOOSER_SIZE/2), 6 + CHOOSER_SIZE + 3 ) ;
+ Size = MAP_APPFONT ( CHOOSER_SIZE/2 , PREVIEW_HEIGHT ) ;
+ Border = FALSE;
+ Hide = TRUE;
+ };
+
+ FixedImage CT_LEFT_SLIDER
+ {
+ };
+
+ FixedImage CT_RIGHT_SLIDER
+ {
+ };
+
+ Image CT_SLIDERIMG
+ {
+ ImageBitmap = Bitmap { File = "colorslider.png" ; };
+ MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; };
+ };
+
+#if 0
+ ImageButton PB_PICKER
+ {
+ HelpID = "cui:ImageButton:ColorPicker:Picker";
+ Pos = MAP_APPFONT ( CONTROL_AREA_X - 2 - SLIDER_WIDTH + 4, 6 + CHOOSER_SIZE + 3 ) ;
+ Size = MAP_APPFONT( SLIDER_WIDTH - 8, PREVIEW_HEIGHT );
+ TabStop = TRUE ;
+ QuickHelpText [ en-US ] = "Pick a color from the document" ;
+ ButtonImage = Image
+ {
+ ImageBitmap = Bitmap { File = "pipette.png" ; };
+ MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; } ;
+ };
+ };
+#endif
+
+ FixedLine FL_RGB
+ {
+ Pos = MAP_APPFONT ( CONTROL_AREA_X , 6 ) ;
+ Size = MAP_APPFONT ( LINE_WIDTH , LINE_HEIGHT ) ;
+ Text [ en-US ] = "RGB" ;
+ };
+
+ RadioButton CT_RED
+ {
+ HelpID = "cui:RadioButton:ColorPicker:Red";
+ Pos = MAP_APPFONT ( CONTROL_AREA_X_RADIO , RGB_Y1+2 ) ;
+ Size = MAP_APPFONT ( RADIO_WIDTH , RADIO_HEIGHT ) ;
+ Group = TRUE;
+ };
+
+ RadioButton CT_GREEN
+ {
+ HelpID = "cui:RadioButton:ColorPicker:Green";
+ Pos = MAP_APPFONT ( CONTROL_AREA_X_RADIO , RGB_Y2+2 ) ;
+ Size = MAP_APPFONT ( RADIO_WIDTH , RADIO_HEIGHT ) ;
+ };
+
+ RadioButton CT_BLUE
+ {
+ HelpID = "cui:RadioButton:ColorPicker:Blue";
+ Pos = MAP_APPFONT ( CONTROL_AREA_X_RADIO , RGB_Y3+2 ) ;
+ Size = MAP_APPFONT ( RADIO_WIDTH , RADIO_HEIGHT ) ;
+ };
+
+ RadioButton CT_HUE
+ {
+ HelpID = "cui:RadioButton:ColorPicker:Hue";
+ Pos = MAP_APPFONT ( CONTROL_AREA_X_RADIO , HSB_Y1+2 ) ;
+ Size = MAP_APPFONT ( RADIO_WIDTH , RADIO_HEIGHT ) ;
+ Check = TRUE ;
+ };
+
+ RadioButton CT_SATURATION
+ {
+ HelpID = "cui:RadioButton:ColorPicker:Saturation";
+ Pos = MAP_APPFONT ( CONTROL_AREA_X_RADIO , HSB_Y2+2 ) ;
+ Size = MAP_APPFONT ( RADIO_WIDTH , RADIO_HEIGHT ) ;
+ };
+
+ RadioButton CT_BRIGHTNESS
+ {
+ HelpID = "cui:RadioButton:ColorPicker:Brightness";
+ Pos = MAP_APPFONT ( CONTROL_AREA_X_RADIO , HSB_Y3+2 ) ;
+ Size = MAP_APPFONT ( RADIO_WIDTH , RADIO_HEIGHT ) ;
+ };
+
+ FixedText CT_RED
+ {
+ Pos = MAP_APPFONT ( CONTROL_AREA_X_LABEL , RGB_Y1+1 ) ;
+ Size = MAP_APPFONT ( LABEL_WIDTH , LABEL_HEIGHT ) ;
+ Text [ en-US ] = "~Red" ;
+ };
+
+ MetricField CT_RED
+ {
+ HelpID = "cui:MetricField:ColorPicker:Red";
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( CONTROL_AREA_X_METRIC , RGB_Y1 ) ;
+ Size = MAP_APPFONT ( METRIC_WIDTH , METRIC_HEIGHT ) ;
+ TabStop = TRUE ;
+ Repeat = TRUE ;
+ Spin = TRUE ;
+ Maximum = 255 ;
+ Last = 255 ;
+ };
+
+ FixedText CT_GREEN
+ {
+ Pos = MAP_APPFONT ( CONTROL_AREA_X_LABEL , RGB_Y2+1 ) ;
+ Size = MAP_APPFONT ( LABEL_WIDTH , LABEL_HEIGHT ) ;
+ Text [ en-US ] = "~Green" ;
+ };
+
+ MetricField CT_GREEN
+ {
+ HelpID = "cui:MetricField:ColorPicker:Green";
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( CONTROL_AREA_X_METRIC , RGB_Y2 ) ;
+ Size = MAP_APPFONT ( METRIC_WIDTH , METRIC_HEIGHT ) ;
+ TabStop = TRUE ;
+ Repeat = TRUE ;
+ Spin = TRUE ;
+ Maximum = 255 ;
+ Last = 255 ;
+ };
+
+ FixedText CT_BLUE
+ {
+ Pos = MAP_APPFONT ( CONTROL_AREA_X_LABEL , RGB_Y3+1 ) ;
+ Size = MAP_APPFONT ( LABEL_WIDTH , LABEL_HEIGHT ) ;
+ Text [ en-US ] = "~Blue" ;
+ };
+
+ MetricField CT_BLUE
+ {
+ HelpID = "cui:MetricField:ColorPicker:Blue";
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( CONTROL_AREA_X_METRIC , RGB_Y3 ) ;
+ Size = MAP_APPFONT ( METRIC_WIDTH , METRIC_HEIGHT ) ;
+ TabStop = TRUE ;
+ Repeat = TRUE ;
+ Spin = TRUE ;
+ Maximum = 255 ;
+ Last = 255 ;
+ };
+
+ FixedText CT_HEX
+ {
+ Pos = MAP_APPFONT ( CONTROL_AREA_X_LABEL , RGB_Y4+1 ) ;
+ Size = MAP_APPFONT ( LABEL_WIDTH , LABEL_HEIGHT ) ;
+ Text [ en-US ] = "Hex ~#" ;
+ };
+
+ Edit CT_HEX
+ {
+ HelpID = "cui:MetricField:ColorPicker:Hex";
+ Border = TRUE ;
+ Left = TRUE ;
+ Pos = MAP_APPFONT ( CONTROL_AREA_X_METRIC , RGB_Y4 ) ;
+ Size = MAP_APPFONT ( METRIC_WIDTH , METRIC_HEIGHT ) ;
+ TabStop = TRUE ;
+ };
+
+// -------------------------------------------------------------------------
+// HSB
+// -------------------------------------------------------------------------
+
+ FixedLine FL_HSB
+ {
+ Pos = MAP_APPFONT ( CONTROL_AREA_X , HSB_Y0 ) ;
+ Size = MAP_APPFONT ( LINE_WIDTH , LINE_HEIGHT ) ;
+ Text [ en-US ] = "HSB" ;
+ };
+
+ FixedText CT_HUE
+ {
+ Pos = MAP_APPFONT ( CONTROL_AREA_X_LABEL , HSB_Y1+1 ) ;
+ Size = MAP_APPFONT ( LABEL_WIDTH , LABEL_HEIGHT ) ;
+ Text [ en-US ] = "H~ue" ;
+ };
+
+ MetricField CT_HUE
+ {
+ HelpID = "cui:MetricField:ColorPicker:Hue";
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( CONTROL_AREA_X_METRIC , HSB_Y1 ) ;
+ Size = MAP_APPFONT ( METRIC_WIDTH , METRIC_HEIGHT ) ;
+ TabStop = TRUE ;
+ Repeat = TRUE ;
+ Spin = TRUE ;
+ Maximum = 360 ;
+ Last = 360 ;
+ Unit = FUNIT_CUSTOM ;
+ };
+
+ FixedText CT_SATURATION
+ {
+ Pos = MAP_APPFONT ( CONTROL_AREA_X_LABEL , HSB_Y2+1 ) ;
+ Size = MAP_APPFONT ( LABEL_WIDTH , LABEL_HEIGHT ) ;
+ Text [ en-US ] = "~Saturation" ;
+ };
+
+ MetricField CT_SATURATION
+ {
+ HelpID = "cui:MetricField:ColorPicker:Saturation";
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( CONTROL_AREA_X_METRIC , HSB_Y2 ) ;
+ Size = MAP_APPFONT ( METRIC_WIDTH , METRIC_HEIGHT ) ;
+ TabStop = TRUE ;
+ Repeat = TRUE ;
+ Spin = TRUE ;
+ Maximum = 100 ;
+ Last = 100 ;
+ Unit = FUNIT_CUSTOM ;
+ CustomUnitText = " %" ;
+ };
+
+ FixedText CT_BRIGHTNESS
+ {
+ Pos = MAP_APPFONT ( CONTROL_AREA_X_LABEL , HSB_Y3+1 ) ;
+ Size = MAP_APPFONT ( LABEL_WIDTH , LABEL_HEIGHT ) ;
+ Text [ en-US ] = "Bright~ness" ;
+ };
+
+ MetricField CT_BRIGHTNESS
+ {
+ HelpID = "cui:MetricField:ColorPicker:Brightness";
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( CONTROL_AREA_X_METRIC , HSB_Y3 ) ;
+ Size = MAP_APPFONT ( METRIC_WIDTH , METRIC_HEIGHT ) ;
+ TabStop = TRUE ;
+ Repeat = TRUE ;
+ Spin = TRUE ;
+ Maximum = 100 ;
+ Last = 100 ;
+ Unit = FUNIT_CUSTOM ;
+ CustomUnitText = " %" ;
+ };
+
+// -------------------------------------------------------------------------
+// CMYK
+// -------------------------------------------------------------------------
+
+ FixedLine FL_CMYK
+ {
+ Pos = MAP_APPFONT ( CONTROL_AREA_X , CMYK_Y0 ) ;
+ Size = MAP_APPFONT ( LINE_WIDTH , LINE_HEIGHT ) ;
+ Text [ en-US ] = "CMYK" ;
+ };
+
+ FixedText CT_CYAN
+ {
+ Pos = MAP_APPFONT ( CONTROL_AREA_X_LABEL , CMYK_Y1+1 ) ;
+ Size = MAP_APPFONT ( LABEL_WIDTH , LABEL_HEIGHT ) ;
+ Text [ en-US ] = "~Cyan" ;
+ };
+
+ MetricField CT_CYAN
+ {
+ HelpID = "cui:MetricField:ColorPicker:Cyan";
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( CONTROL_AREA_X_METRIC , CMYK_Y1 ) ;
+ Size = MAP_APPFONT ( METRIC_WIDTH , METRIC_HEIGHT ) ;
+ TabStop = TRUE ;
+ Repeat = TRUE ;
+ Spin = TRUE ;
+ Maximum = 100 ;
+ Last = 100 ;
+ Unit = FUNIT_CUSTOM ;
+ CustomUnitText = " %" ;
+ };
+
+ FixedText CT_MAGENTA
+ {
+ Pos = MAP_APPFONT ( CONTROL_AREA_X_LABEL , CMYK_Y2+1 ) ;
+ Size = MAP_APPFONT ( LABEL_WIDTH , LABEL_HEIGHT ) ;
+ Text [ en-US ] = "~Magenta" ;
+ };
+
+ MetricField CT_MAGENTA
+ {
+ HelpID = "cui:MetricField:ColorPicker:Magenta";
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( CONTROL_AREA_X_METRIC , CMYK_Y2 ) ;
+ Size = MAP_APPFONT ( METRIC_WIDTH , METRIC_HEIGHT ) ;
+ TabStop = TRUE ;
+ Repeat = TRUE ;
+ Spin = TRUE ;
+ Maximum = 100 ;
+ Last = 100 ;
+ Unit = FUNIT_CUSTOM ;
+ CustomUnitText = " %" ;
+ };
+
+ FixedText CT_YELLOW
+ {
+ Pos = MAP_APPFONT ( CONTROL_AREA_X_LABEL , CMYK_Y3+1 ) ;
+ Size = MAP_APPFONT ( LABEL_WIDTH , LABEL_HEIGHT ) ;
+ Text [ en-US ] = "~Yellow" ;
+ };
+
+ MetricField CT_YELLOW
+ {
+ HelpID = "cui:MetricField:ColorPicker:Yellow";
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( CONTROL_AREA_X_METRIC , CMYK_Y3 ) ;
+ Size = MAP_APPFONT ( METRIC_WIDTH , METRIC_HEIGHT ) ;
+ TabStop = TRUE ;
+ Repeat = TRUE ;
+ Spin = TRUE ;
+ Maximum = 100 ;
+ Last = 100 ;
+ Unit = FUNIT_CUSTOM ;
+ CustomUnitText = " %" ;
+ };
+
+ FixedText CT_KEY
+ {
+ Pos = MAP_APPFONT ( CONTROL_AREA_X_LABEL , CMYK_Y4+1 ) ;
+ Size = MAP_APPFONT ( LABEL_WIDTH , LABEL_HEIGHT ) ;
+ Text [ en-US ] = "~Key" ;
+ };
+
+ MetricField CT_KEY
+ {
+ HelpID = "cui:MetricField:ColorPicker:Key";
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( CONTROL_AREA_X_METRIC , CMYK_Y4 ) ;
+ Size = MAP_APPFONT ( METRIC_WIDTH , METRIC_HEIGHT ) ;
+ TabStop = TRUE ;
+ Repeat = TRUE ;
+ Spin = TRUE ;
+ Maximum = 100 ;
+ Last = 100 ;
+ Unit = FUNIT_CUSTOM ;
+ CustomUnitText = " %" ;
+ };
+
+ // ------------------------------------------------------
+ // bottom buttons
+ // ------------------------------------------------------
+
+ FixedLine FT_BOTTOMLINE
+ {
+ Pos = MAP_APPFONT ( 0 , BOTTOMLINE_Y ) ;
+ Size = MAP_APPFONT ( DLG_WIDTH , 8 ) ;
+ };
+
+ HelpButton BTN_HELP
+ {
+ Pos = MAP_APPFONT ( 3 , BUTTON_LINE_Y ) ;
+ Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
+ TabStop = TRUE ;
+ };
+
+ OKButton BTN_OK
+ {
+ Pos = MAP_APPFONT ( DLG_WIDTH - 3 - BUTTON_WIDTH - 3 - BUTTON_WIDTH, BUTTON_LINE_Y ) ;
+ Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
+ TabStop = TRUE ;
+ DefButton = TRUE ;
+ };
+ CancelButton BTN_CANCEL
+ {
+ Pos = MAP_APPFONT ( DLG_WIDTH - 3 - BUTTON_WIDTH, BUTTON_LINE_Y ) ;
+ Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
+ TabStop = TRUE ;
+ };
+};
+
+// eof
Modified: openoffice/branches/l10n40/main/cui/source/options/optsave.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/cui/source/options/optsave.cxx?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/cui/source/options/optsave.cxx (original)
+++ openoffice/branches/l10n40/main/cui/source/options/optsave.cxx Sat Oct 26 14:59:22 2013
@@ -655,32 +655,29 @@ IMPL_LINK( SfxSaveTabPage, AutoClickHdl_
/* -----------------------------05.04.01 13:10--------------------------------
---------------------------------------------------------------------------*/
-OUString lcl_ExtracUIName(const Sequence<PropertyValue> rProperties)
+OUString lcl_ExtracUIName(const Sequence<PropertyValue> &rProperties)
{
- OUString sRet;
- sal_Int32 nFlags;
- const PropertyValue* pProperties = rProperties.getConstArray();
- for(int nProp = 0; nProp < rProperties.getLength(); nProp++)
+ OUString sName;
+ const PropertyValue* pPropVal = rProperties.getConstArray();
+ const PropertyValue* const pEnd = pPropVal + rProperties.getLength();
+ for( ; pPropVal != pEnd; pPropVal++ )
{
- if(!pProperties[nProp].Name.compareToAscii("UIName"))
+ const OUString &rName = pPropVal->Name;
+ if( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UIName" ) ) )
{
- if ( pProperties[nProp].Value >>= sRet )
- break;
+ OUString sUIName;
+ if ( ( pPropVal->Value >>= sUIName ) && sUIName.getLength() )
+ return sUIName;
}
- else if(!pProperties[nProp].Name.compareToAscii("Flags"))
+ else if( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Name" ) ) )
{
- if ( pProperties[nProp].Value >>= nFlags )
- {
- nFlags &= 0x100;
- }
- }
- else if(!pProperties[nProp].Name.compareToAscii("Name"))
- {
- if ( !sRet.getLength() )
- pProperties[nProp].Value >>= sRet;
+ pPropVal->Value >>= sName;
}
}
- return sRet;
+
+ OSL_ENSURE( false, "Filter without UIName!" );
+
+ return sName;
}
/* -----------------------------05.04.01 13:37--------------------------------
Modified: openoffice/branches/l10n40/main/cui/source/tabpages/tpbitmap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/cui/source/tabpages/tpbitmap.cxx?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/cui/source/tabpages/tpbitmap.cxx (original)
+++ openoffice/branches/l10n40/main/cui/source/tabpages/tpbitmap.cxx Sat Oct 26 14:59:22 2013
@@ -756,9 +756,12 @@ IMPL_LINK( SvxBitmapTabPage, ClickModify
bLoop = sal_False;
const BitmapEx aBitmapEx(aBitmapCtl.GetBitmapEx());
- const XBitmapEntry aEntry(Graphic(aBitmapEx), aName);
- aLbBitmaps.Modify( rStyleSettings.GetListBoxPreviewDefaultPixelSize(), aEntry, nPos );
+ // #123497# Need to replace the existing entry with a new one (old returned needs to be deleted)
+ XBitmapEntry* pEntry = new XBitmapEntry(Graphic(aBitmapEx), aName);
+ delete maBitmapList->Replace(pEntry, nPos);
+
+ aLbBitmaps.Modify( rStyleSettings.GetListBoxPreviewDefaultPixelSize(), *pEntry, nPos );
aLbBitmaps.SelectEntryPos( nPos );
// Flag fuer modifiziert setzen
Modified: openoffice/branches/l10n40/main/cui/source/tabpages/tpcolor.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/cui/source/tabpages/tpcolor.cxx?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/cui/source/tabpages/tpcolor.cxx (original)
+++ openoffice/branches/l10n40/main/cui/source/tabpages/tpcolor.cxx Sat Oct 26 14:59:22 2013
@@ -631,13 +631,15 @@ IMPL_LINK( SvxColorTabPage, ClickModifyH
if (eCM != CM_RGB)
ConvertColorValues (aTmpColor, CM_RGB);
- const XColorEntry aEntry(aTmpColor, aName);
+ // #123497# Need to replace the existing entry with a new one (old returned needs to be deleted)
+ XColorEntry* pEntry = new XColorEntry(aTmpColor, aName);
+ delete maColorTab->Replace(pEntry, nPos);
- aLbColor.Modify( aEntry, nPos );
+ aLbColor.Modify( *pEntry, nPos );
aLbColor.SelectEntryPos( nPos );
- aValSetColorTable.SetItemColor( nPos + 1, aEntry.GetColor() );
- aValSetColorTable.SetItemText( nPos + 1, aEntry.GetName() );
+ aValSetColorTable.SetItemColor( nPos + 1, pEntry->GetColor() );
+ aValSetColorTable.SetItemText( nPos + 1, pEntry->GetName() );
aEdtName.SetText( aName );
aCtlPreviewOld.Invalidate();
Modified: openoffice/branches/l10n40/main/cui/source/tabpages/tplneend.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/cui/source/tabpages/tplneend.cxx?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/cui/source/tabpages/tplneend.cxx (original)
+++ openoffice/branches/l10n40/main/cui/source/tabpages/tplneend.cxx Sat Oct 26 14:59:22 2013
@@ -402,19 +402,28 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickMo
// Wenn nicht vorhanden, wird Eintrag aufgenommen
if( bDifferent )
{
- const XLineEndEntry* pEntry = maLineEndList->GetLineEnd( nPos );
+ const XLineEndEntry* pOldEntry = maLineEndList->GetLineEnd( nPos );
- aEdtName.SetText( aName );
-
- const XLineEndEntry aEntry(pEntry->GetLineEnd(), aName);
-
- aLbLineEnds.Modify( aEntry, nPos, maLineEndList->GetUiBitmap( nPos ) );
- aLbLineEnds.SelectEntryPos( nPos );
-
- // Flag fuer modifiziert setzen
- *pnLineEndListState |= CT_MODIFIED;
-
- *pPageType = 3;
+ if(pOldEntry)
+ {
+ // #123497# Need to replace the existing entry with a new one (old returned needs to be deleted)
+ XLineEndEntry* pEntry = new XLineEndEntry(pOldEntry->GetLineEnd(), aName);
+ delete maLineEndList->Replace(pEntry, nPos);
+
+ aEdtName.SetText( aName );
+
+ aLbLineEnds.Modify( *pEntry, nPos, maLineEndList->GetUiBitmap( nPos ) );
+ aLbLineEnds.SelectEntryPos( nPos );
+
+ // Flag fuer modifiziert setzen
+ *pnLineEndListState |= CT_MODIFIED;
+
+ *pPageType = 3;
+ }
+ else
+ {
+ OSL_ENSURE(false, "LineEnd to be modified not existing (!)");
+ }
}
}
return( 0L );
Modified: openoffice/branches/l10n40/main/dbaccess/source/ui/browser/unodatbr.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/dbaccess/source/ui/browser/unodatbr.cxx?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/dbaccess/source/ui/browser/unodatbr.cxx (original)
+++ openoffice/branches/l10n40/main/dbaccess/source/ui/browser/unodatbr.cxx Sat Oct 26 14:59:22 2013
@@ -1408,23 +1408,26 @@ void SAL_CALL SbaTableQueryBrowser::disp
{
for ( ExternalFeaturesMap::iterator aLoop = m_aExternalFeatures.begin();
aLoop != m_aExternalFeatures.end();
- ++aLoop
)
{
- if ( aLoop->second.xDispatcher.get() == xSource.get() )
- {
- ExternalFeaturesMap::iterator aPrevious = aLoop;
- --aPrevious;
+ if ( aLoop->second.xDispatcher.get() != xSource.get() ) {
+ ++aLoop;
+ continue;
+ }
- // remove it
- m_aExternalFeatures.erase( aLoop );
+ // prepare to erase the aLoop iterator
+ const sal_uInt16 nSlotId = aLoop->first;
+ ExternalFeaturesMap::iterator aNext = aLoop;
+ ++aNext;
- // maybe update the UI
- implCheckExternalSlot(aLoop->first);
+ // remove it
+ m_aExternalFeatures.erase( aLoop );
- // continue, the same XDispatch may be resposible for more than one URL
- aLoop = aPrevious;
- }
+ // maybe update the UI
+ implCheckExternalSlot( nSlotId );
+
+ // continue, the same XDispatch may be resposible for more than one URL
+ aLoop = aNext;
}
}
else
Modified: openoffice/branches/l10n40/main/default_images/introabout/about.png
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/default_images/introabout/about.png?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/l10n40/main/desktop/win32/source/setup/setup.ulf
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/desktop/win32/source/setup/setup.ulf?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/desktop/win32/source/setup/setup.ulf (original)
+++ openoffice/branches/l10n40/main/desktop/win32/source/setup/setup.ulf Sat Oct 26 14:59:22 2013
@@ -67,7 +67,7 @@ en-US = "There is already a setup proces
[%UNKNOWN_ERROR%]
-en-US = "An Unknown Error occured!"
+en-US = "An Unknown Error occurred!"
[%INVALID_PROFILE%]
Modified: openoffice/branches/l10n40/main/dtrans/source/win32/dtobj/DOTransferable.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/dtrans/source/win32/dtobj/DOTransferable.cxx?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/dtrans/source/win32/dtobj/DOTransferable.cxx (original)
+++ openoffice/branches/l10n40/main/dtrans/source/win32/dtobj/DOTransferable.cxx Sat Oct 26 14:59:22 2013
@@ -136,6 +136,21 @@ Any SAL_CALL CDOTransferable::getTransfe
Any aAny = makeAny( aUnicodeText );
return aAny;
}
+ else if(CF_DIBV5 == fetc.getClipformat())
+ {
+ // #123407# CF_DIBV5 has priority; if the try to fetch this failed,
+ // check CF_DIB availability as an alternative
+ fetc.setClipformat(CF_DIB);
+
+ try
+ {
+ clipDataStream = getClipboardData( fetc );
+ }
+ catch( UnsupportedFlavorException& )
+ {
+ throw; // pass through, tried all possibilities
+ }
+ }
else
throw; // pass through exception
}
Modified: openoffice/branches/l10n40/main/extras/source/misc_config/wizard/web/layouts/layout.xsl
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/extras/source/misc_config/wizard/web/layouts/layout.xsl?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/extras/source/misc_config/wizard/web/layouts/layout.xsl (original)
+++ openoffice/branches/l10n40/main/extras/source/misc_config/wizard/web/layouts/layout.xsl Sat Oct 26 14:59:22 2013
@@ -126,7 +126,7 @@ places...
<xsl:template match="document/@update-date">
- <span class="doclastchangedate">
+ <span class="doclastchangeddate">
<xsl:value-of select="."/>
</span>
<br/>
Modified: openoffice/branches/l10n40/main/extras/source/misc_config/wizard/web/layouts/layoutX.xsl
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/extras/source/misc_config/wizard/web/layouts/layoutX.xsl?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/extras/source/misc_config/wizard/web/layouts/layoutX.xsl (original)
+++ openoffice/branches/l10n40/main/extras/source/misc_config/wizard/web/layouts/layoutX.xsl Sat Oct 26 14:59:22 2013
@@ -213,7 +213,7 @@
<xsl:template match="document/@update-date">
- <span class="doclastchangedate">
+ <span class="doclastchangeddate">
<xsl:value-of select="."/>
</span>
<br/>
Modified: openoffice/branches/l10n40/main/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx (original)
+++ openoffice/branches/l10n40/main/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx Sat Oct 26 14:59:22 2013
@@ -915,15 +915,18 @@ void VistaFilePickerImpl::impl_sta_ShowD
::rtl::OUString aExt;
UINT nFileType;
hResult = iDialog->GetFileTypeIndex(&nFileType);
- if ( SUCCEEDED(hResult) )
+ if ( SUCCEEDED(hResult) && nFileType > 0 )
{
::sal_Int32 nRealIndex = (nFileType-1); // COM dialog base on 1 ... filter container on 0 .-)
::std::vector< COMDLG_FILTERSPEC > lFilters = lcl_buildFilterList(m_lFilters);
- LPCWSTR lpFilterExt = lFilters[nRealIndex].pszSpec;
+ if ( nRealIndex < lFilters.size() )
+ {
+ LPCWSTR lpFilterExt = lFilters[nRealIndex].pszSpec;
- lpFilterExt = wcsrchr( lpFilterExt, '.' );
- if ( lpFilterExt )
- aFileURL += reinterpret_cast<const sal_Unicode*>(lpFilterExt);
+ lpFilterExt = wcsrchr( lpFilterExt, '.' );
+ if ( lpFilterExt )
+ aFileURL += reinterpret_cast<const sal_Unicode*>(lpFilterExt);
+ }
}
}
Modified: openoffice/branches/l10n40/main/io/source/TextOutputStream/TextOutputStream.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/io/source/TextOutputStream/TextOutputStream.cxx?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/io/source/TextOutputStream/TextOutputStream.cxx (original)
+++ openoffice/branches/l10n40/main/io/source/TextOutputStream/TextOutputStream.cxx Sat Oct 26 14:59:22 2013
@@ -74,7 +74,8 @@ class OTextOutputStream : public TextOut
rtl_UnicodeToTextContext mContextUnicode2Text;
Sequence<sal_Int8> implConvert( const OUString& rSource );
-
+ void checkOutputStream() throw(IOException);
+
public:
OTextOutputStream();
~OTextOutputStream();
@@ -174,6 +175,7 @@ Sequence<sal_Int8> OTextOutputStream::im
void OTextOutputStream::writeString( const OUString& aString )
throw(IOException, RuntimeException)
{
+ checkOutputStream();
if( !mbEncodingInitialized )
{
OUString aUtf8Str( RTL_CONSTASCII_USTRINGPARAM("utf8") );
@@ -205,22 +207,35 @@ void OTextOutputStream::setEncoding( con
void OTextOutputStream::writeBytes( const Sequence< sal_Int8 >& aData )
throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
{
+ checkOutputStream();
mxStream->writeBytes( aData );
}
void OTextOutputStream::flush( )
throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
{
+ checkOutputStream();
mxStream->flush();
}
void OTextOutputStream::closeOutput( )
throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
{
+ checkOutputStream();
mxStream->closeOutput();
}
+void OTextOutputStream::checkOutputStream()
+ throw(IOException)
+{
+ if (! mxStream.is() )
+ throw IOException(
+ OUString(RTL_CONSTASCII_USTRINGPARAM("output stream is not initialized, you have to use setOutputStream first")),
+ Reference<XInterface>());
+}
+
+
//===========================================================================
// XActiveDataSource
Modified: openoffice/branches/l10n40/main/languages/source/templates/connectivity.pot
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/languages/source/templates/connectivity.pot?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/languages/source/templates/connectivity.pot (original)
+++ openoffice/branches/l10n40/main/languages/source/templates/connectivity.pot Sat Oct 26 14:59:22 2013
@@ -100,7 +100,7 @@ msgid "This statement type not supporte
msgstr ""
#: resource/conn_shared_res.src#STR_UNSPECIFIED_ERROR.STRING.TEXT
-msgid "An unknown error occured."
+msgid "An unknown error occurred."
msgstr ""
#: resource/conn_shared_res.src#STR_COULD_NOT_CREATE_ADDRESSBOOK.STRING.TEXT
@@ -112,11 +112,11 @@ msgid "The library '$libname$' could no
msgstr ""
#: resource/conn_shared_res.src#STR_ERROR_REFRESH_ROW.STRING.TEXT
-msgid "An error occured while refreshing the current row."
+msgid "An error occurred while refreshing the current row."
msgstr ""
#: resource/conn_shared_res.src#STR_ERROR_GET_ROW.STRING.TEXT
-msgid "An error occured while getting the current row."
+msgid "An error occurred while getting the current row."
msgstr ""
#: resource/conn_shared_res.src#STR_CAN_NOT_CANCEL_ROW_UPDATE.STRING.TEXT
@@ -132,7 +132,7 @@ msgid "The query can not be executed. T
msgstr ""
#: resource/conn_shared_res.src#STR_ILLEGAL_MOVEMENT.STRING.TEXT
-msgid "Illegal cursor movement occured."
+msgid "Illegal cursor movement occurred."
msgstr ""
#: resource/conn_shared_res.src#STR_COMMIT_ROW.STRING.TEXT
@@ -316,7 +316,7 @@ msgid "The connection could not be crea
msgstr ""
#: resource/conn_shared_res.src#STR_COULD_NOT_DELETE_INDEX.STRING.TEXT
-msgid "The index could not be deleted. An unknown error while accessing the file system occured."
+msgid "The index could not be deleted. An unknown error while accessing the file system occurred."
msgstr ""
#: resource/conn_shared_res.src#STR_ONL_ONE_COLUMN_PER_INDEX.STRING.TEXT
@@ -532,11 +532,11 @@ msgid "The given URL contains no valid
msgstr ""
#: resource/conn_shared_res.src#STR_NO_TABLE_CONTAINER.STRING.TEXT
-msgid "An error occured while obtaining the connection's table container."
+msgid "An error occurred while obtaining the connection's table container."
msgstr ""
#: resource/conn_shared_res.src#STR_NO_TABLE_EDITOR_DIALOG.STRING.TEXT
-msgid "An error occured while creating the table editor dialog."
+msgid "An error occurred while creating the table editor dialog."
msgstr ""
#: resource/conn_shared_res.src#STR_NO_TABLENAME.STRING.TEXT
Modified: openoffice/branches/l10n40/main/languages/source/templates/desktop.pot
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/languages/source/templates/desktop.pot?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/languages/source/templates/desktop.pot (original)
+++ openoffice/branches/l10n40/main/languages/source/templates/desktop.pot Sat Oct 26 14:59:22 2013
@@ -936,7 +936,7 @@ msgid "There is already a setup process
msgstr ""
#: ../win32/source/setup/setup.ulf#_UNKNOWN_ERROR_
-msgid "An Unknown Error occured!"
+msgid "An Unknown Error occurred!"
msgstr ""
#: ../win32/source/setup/setup.ulf#_INVALID_PROFILE_
Modified: openoffice/branches/l10n40/main/languages/source/templates/readlicense_oo.pot
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/languages/source/templates/readlicense_oo.pot?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/languages/source/templates/readlicense_oo.pot (original)
+++ openoffice/branches/l10n40/main/languages/source/templates/readlicense_oo.pot Sat Oct 26 14:59:22 2013
@@ -407,6 +407,10 @@ msgstr ""
msgid "The Apache OpenOffice Community"
msgstr ""
-#: readme.xrm#SDFFD23R3CEFWEFEW
+#: readme.xrm#MODIFIEDSOURCECODEHEADING
msgid "Used / Modified Source Code"
msgstr ""
+
+#: readme.xrm#MODIFIEDSOURCECODEPARA
+msgid "For detailed information about used and/or modified source code, see the NOTICE file which is part of the installation."
+msgstr ""
Modified: openoffice/branches/l10n40/main/officecfg/registry/data/org/openoffice/VCL.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/officecfg/registry/data/org/openoffice/VCL.xcu?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/officecfg/registry/data/org/openoffice/VCL.xcu (original)
+++ openoffice/branches/l10n40/main/officecfg/registry/data/org/openoffice/VCL.xcu Sat Oct 26 14:59:22 2013
@@ -1830,7 +1830,7 @@
<node oor:name="calibri" oor:op="replace">
<prop oor:name="SubstFonts">
- <value>hiraginomarugothicpronw3;hiraginomarugothicprow3</value>
+ <value>carlito;hiraginomarugothicpronw3;hiraginomarugothicprow3</value>
</prop>
<prop oor:name="FontType"><value>Normal,SansSerif</value></prop>
</node>
@@ -1840,7 +1840,7 @@
<node oor:name="cambria" oor:op="replace">
<prop oor:name="SubstFonts">
- <value>applelisung</value>
+ <value>caladea;applelisung</value>
</prop>
<prop oor:name="FontType"><value>Normal,Serif</value></prop>
</node>
Modified: openoffice/branches/l10n40/main/readlicense_oo/docs/readme/readme.xrm
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/readlicense_oo/docs/readme/readme.xrm?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/readlicense_oo/docs/readme/readme.xrm (original)
+++ openoffice/branches/l10n40/main/readlicense_oo/docs/readme/readme.xrm Sat Oct 26 14:59:22 2013
@@ -301,8 +301,8 @@
</div>
<div id="ModifiedSourceCode">
- <h2 id="sdffd23r3cefwefew" xml:lang="en-US">Used / Modified Source Code</h2>
- <p id="sdffd23red32efew">For detailed information about used and/or modified source code, see the NOTICE file which is part of the installation.</p>
+ <h2 id="ModifiedSourceCodeHeading" xml:lang="en-US">Used / Modified Source Code</h2>
+ <p id="ModifiedSourceCodePara" xml:lang="en-US">For detailed information about used and/or modified source code, see the NOTICE file which is part of the installation.</p>
</div>
</body>
</html>
Propchange: openoffice/branches/l10n40/main/sal/
------------------------------------------------------------------------------
Merged /openoffice/trunk/main/sal:r1528174-1535843
Modified: openoffice/branches/l10n40/main/sc/source/ui/app/transobj.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sc/source/ui/app/transobj.cxx?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sc/source/ui/app/transobj.cxx (original)
+++ openoffice/branches/l10n40/main/sc/source/ui/app/transobj.cxx Sat Oct 26 14:59:22 2013
@@ -346,11 +346,15 @@ sal_Bool ScTransferObj::GetData( const d
}
else if ( nFormat == SOT_FORMAT_GDIMETAFILE )
{
- InitDocShell();
+ // #123405# Do not limit visual size calculation for metafile creation.
+ // It seems unlikely that removing the limitation causes problems since
+ // metafile creation means that no real pixel device in the needed size is
+ // created.
+ InitDocShell(false);
+
SfxObjectShell* pEmbObj = aDocShellRef;
// like SvEmbeddedTransfer::GetData:
-
GDIMetaFile aMtf;
VirtualDevice aVDev;
MapMode aMapMode( pEmbObj->GetMapUnit() );
@@ -372,7 +376,8 @@ sal_Bool ScTransferObj::GetData( const d
else if ( nFormat == SOT_FORMATSTR_ID_EMBED_SOURCE )
{
//TODO/LATER: differentiate between formats?!
- InitDocShell(); // set aDocShellRef
+ // #123405# Do limit visual size calculation to PageSize
+ InitDocShell(true); // set aDocShellRef
SfxObjectShell* pEmbObj = aDocShellRef;
bOK = SetObject( pEmbObj, SCTRANS_TYPE_EMBOBJ, rFlavor );
@@ -574,8 +579,10 @@ ScMarkData ScTransferObj::GetSourceMarkD
//
// initialize aDocShellRef with a live document from the ClipDoc
//
+// #123405# added parameter to allow size calculation without limitation
+// to PageSize, e.g. used for Metafile creation for clipboard.
-void ScTransferObj::InitDocShell()
+void ScTransferObj::InitDocShell(bool bLimitToPageSize)
{
if ( !aDocShellRef.Is() )
{
@@ -697,14 +704,14 @@ void ScTransferObj::InitDocShell()
for (nCol=nStartX; nCol<=nEndX; nCol++)
{
long nAdd = pDestDoc->GetColWidth( nCol, 0 );
- if ( nSizeX+nAdd > aPaperSize.Width() && nSizeX ) // above limit?
+ if ( bLimitToPageSize && nSizeX+nAdd > aPaperSize.Width() && nSizeX ) // above limit?
break;
nSizeX += nAdd;
}
for (SCROW nRow=nStartY; nRow<=nEndY; nRow++)
{
long nAdd = pDestDoc->GetRowHeight( nRow, 0 );
- if ( nSizeY+nAdd > aPaperSize.Height() && nSizeY ) // above limit?
+ if ( bLimitToPageSize && nSizeY+nAdd > aPaperSize.Height() && nSizeY ) // above limit?
break;
nSizeY += nAdd;
}
Modified: openoffice/branches/l10n40/main/sc/source/ui/inc/transobj.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sc/source/ui/inc/transobj.hxx?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sc/source/ui/inc/transobj.hxx (original)
+++ openoffice/branches/l10n40/main/sc/source/ui/inc/transobj.hxx Sat Oct 26 14:59:22 2013
@@ -62,7 +62,9 @@ private:
bool bHasFiltered; // if has filtered rows
bool bUseInApi; // to recognize clipboard content copied from API
- void InitDocShell();
+ // #123405# added parameter to allow size calculation without limitation
+ // to PageSize, e.g. used for Metafile creation for clipboard.
+ void InitDocShell(bool bLimitToPageSize);
static void StripRefs( ScDocument* pDoc, SCCOL nStartX, SCROW nStartY,
SCCOL nEndX, SCROW nEndY,
ScDocument* pDestDoc=0,
Modified: openoffice/branches/l10n40/main/sd/source/core/sdpage.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/core/sdpage.cxx?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/core/sdpage.cxx (original)
+++ openoffice/branches/l10n40/main/sd/source/core/sdpage.cxx Sat Oct 26 14:59:22 2013
@@ -2800,20 +2800,67 @@ const HeaderFooterSettings& SdPage::getH
void SdPage::setHeaderFooterSettings( const sd::HeaderFooterSettings& rNewSettings )
{
- if( mePageKind == PK_HANDOUT && !mbMaster )
- {
- (((SdPage&)TRG_GetMasterPage()).maHeaderFooterSettings) = rNewSettings;
- }
- else
- {
- maHeaderFooterSettings = rNewSettings;
- }
+ if( mePageKind == PK_HANDOUT && !mbMaster )
+ {
+ (((SdPage&)TRG_GetMasterPage()).maHeaderFooterSettings) = rNewSettings;
+ }
+ else
+ {
+ maHeaderFooterSettings = rNewSettings;
+ }
+
+ SetChanged();
+
+ if(TRG_HasMasterPage())
+ {
+ TRG_GetMasterPageDescriptorViewContact().ActionChanged();
+
+ // #119056# For HeaderFooterSettings SdrObjects are used, but the properties
+ // used are not part of their model data, but kept in SD. This data is applied
+ // using a 'backdoor' on primitive creation. Thus, the normal mechanism to detect
+ // object changes does not work here. It is neccessary to trigger updates here
+ // directly. BroadcastObjectChange used for PagePreview invalidations,
+ // flushViewObjectContacts used to invalidate and flush all visualizations in
+ // edit views.
+ SdPage* pMasterPage = dynamic_cast< SdPage* >(&TRG_GetMasterPage());
- SetChanged();
- if(TRG_HasMasterPage())
- {
- TRG_GetMasterPageDescriptorViewContact().ActionChanged();
- }
+ if(pMasterPage)
+ {
+ SdrObject* pCandidate = 0;
+
+ pCandidate = pMasterPage->GetPresObj( PRESOBJ_HEADER );
+
+ if(pCandidate)
+ {
+ pCandidate->BroadcastObjectChange();
+ pCandidate->GetViewContact().flushViewObjectContacts();
+ }
+
+ pCandidate = pMasterPage->GetPresObj( PRESOBJ_DATETIME );
+
+ if(pCandidate)
+ {
+ pCandidate->BroadcastObjectChange();
+ pCandidate->GetViewContact().flushViewObjectContacts();
+ }
+
+ pCandidate = pMasterPage->GetPresObj( PRESOBJ_FOOTER );
+
+ if(pCandidate)
+ {
+ pCandidate->BroadcastObjectChange();
+ pCandidate->GetViewContact().flushViewObjectContacts();
+ }
+
+ pCandidate = pMasterPage->GetPresObj( PRESOBJ_SLIDENUMBER );
+
+ if(pCandidate)
+ {
+ pCandidate->BroadcastObjectChange();
+ pCandidate->GetViewContact().flushViewObjectContacts();
+ }
+ }
+ }
}
bool SdPage::checkVisibility(
Modified: openoffice/branches/l10n40/main/sd/source/ui/table/tablefunction.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/table/tablefunction.cxx?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/table/tablefunction.cxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/table/tablefunction.cxx Sat Oct 26 14:59:22 2013
@@ -171,6 +171,15 @@ void DrawViewShell::FuTable(SfxRequest&
apply_table_style( pObj, GetDoc(), sTableStyle );
SdrPageView* pPV = mpView->GetSdrPageView();
+ // #123359# if an object is to be replaced/manipulated it may be that it is in text edit mode,
+ // so to be on the safe side call SdrEndTextEdit here
+ SdrTextObj* pCheckForTextEdit = dynamic_cast< SdrTextObj* >(pPickObj);
+
+ if(pCheckForTextEdit && pCheckForTextEdit->IsInEditMode())
+ {
+ mpView->SdrEndTextEdit();
+ }
+
// if we have a pick obj we need to make this new ole a pres obj replacing the current pick obj
if( pPickObj )
{
Modified: openoffice/branches/l10n40/main/sd/source/ui/view/drviews1.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sd/source/ui/view/drviews1.cxx?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sd/source/ui/view/drviews1.cxx (original)
+++ openoffice/branches/l10n40/main/sd/source/ui/view/drviews1.cxx Sat Oct 26 14:59:22 2013
@@ -53,7 +53,6 @@
#include <svx/fmglob.hxx>
#include <editeng/outliner.hxx>
-
#include "misc.hxx"
#ifdef STARIMAGE_AVAILABLE
@@ -148,7 +147,13 @@ void DrawViewShell::UIDeactivated( SfxIn
void DrawViewShell::Deactivate(sal_Bool bIsMDIActivate)
{
- // Do not forward to ViewShell::Deactivate() to prevent a context change.
+ // Temporarily disable context broadcasting while the Deactivate()
+ // call is forwarded to our base class.
+ const bool bIsContextBroadcasterEnabled (SfxShell::SetContextBroadcasterEnabled(false));
+
+ ViewShell::Deactivate(bIsMDIActivate);
+
+ SfxShell::SetContextBroadcasterEnabled(bIsContextBroadcasterEnabled);
}
namespace
Modified: openoffice/branches/l10n40/main/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx (original)
+++ openoffice/branches/l10n40/main/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx Sat Oct 26 14:59:22 2013
@@ -263,7 +263,7 @@ static BOOL RemoveCompleteDirectory( std
}
else
{
- mystr = "An error occured during removing content of " + sCompleteFileName;
+ mystr = "An error occurred during removing content of " + sCompleteFileName;
// MessageBox(NULL, mystr.c_str(), "Error removing directory", MB_OK);
}
}
@@ -277,7 +277,7 @@ static BOOL RemoveCompleteDirectory( std
}
else
{
- mystr = "An error occured during removal of file " + sCompleteFileName;
+ mystr = "An error occurred during removal of file " + sCompleteFileName;
// MessageBox(NULL, mystr.c_str(), "Error removing file", MB_OK);
}
}
@@ -302,7 +302,7 @@ static BOOL RemoveCompleteDirectory( std
}
else
{
- mystr = "An error occured during removal of empty directory " + sPath;
+ mystr = "An error occurred during removal of empty directory " + sPath;
// MessageBox(NULL, mystr.c_str(), "Error removing directory", MB_OK);
bDirectoryRemoved = false;
}
@@ -339,13 +339,13 @@ extern "C" UINT __stdcall RegisterExtens
// }
// else
// {
-// mystr = "An error occured during execution!";
+// mystr = "An error occurred during execution!";
// MessageBox(NULL, mystr.c_str(), "Command", MB_OK);
// }
if ( ! fSuccess )
{
- mystr = "ERROR: An error occured during registration of extensions!";
+ mystr = "ERROR: An error occurred during registration of extensions!";
MessageBox(NULL, mystr.c_str(), "ERROR", MB_OK);
registrationError = true;
}
@@ -418,7 +418,7 @@ extern "C" UINT __stdcall RemoveExtensio
// }
// else
// {
-// mystr = "An error occured during execution!";
+// mystr = "An error occurred during execution!";
// MessageBox(NULL, mystr.c_str(), "Main methode", MB_OK);
// }
Modified: openoffice/branches/l10n40/main/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx (original)
+++ openoffice/branches/l10n40/main/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx Sat Oct 26 14:59:22 2013
@@ -127,7 +127,7 @@ static BOOL RemoveCompleteDirectory( std
}
else
{
- mystr = "An error occured during removing content of " + sCompleteFileName;
+ mystr = "An error occurred during removing content of " + sCompleteFileName;
// MessageBox(NULL, mystr.c_str(), "Error removing directory", MB_OK);
}
}
@@ -141,7 +141,7 @@ static BOOL RemoveCompleteDirectory( std
}
else
{
- mystr = "An error occured during removal of file " + sCompleteFileName;
+ mystr = "An error occurred during removal of file " + sCompleteFileName;
// MessageBox(NULL, mystr.c_str(), "Error removing file", MB_OK);
}
}
@@ -166,7 +166,7 @@ static BOOL RemoveCompleteDirectory( std
}
else
{
- mystr = "An error occured during removal of empty directory " + sPath;
+ mystr = "An error occurred during removal of empty directory " + sPath;
// MessageBox(NULL, mystr.c_str(), "Error removing directory", MB_OK);
bDirectoryRemoved = false;
}
Modified: openoffice/branches/l10n40/main/sfx2/inc/sfx2/dinfdlg.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sfx2/inc/sfx2/dinfdlg.hxx?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sfx2/inc/sfx2/dinfdlg.hxx (original)
+++ openoffice/branches/l10n40/main/sfx2/inc/sfx2/dinfdlg.hxx Sat Oct 26 14:59:22 2013
@@ -440,14 +440,10 @@ struct CustomPropertyLine
CustomPropertiesTimeField m_aTimeField;
const String m_sDurationFormat;
CustomPropertiesDurationField m_aDurationField;
- CustomPropertiesEditButton m_aEditButton;
+ CustomPropertiesEditButton m_aEditButton;
CustomPropertiesYesNoButton m_aYesNoButton;
CustomPropertiesRemoveButton m_aRemoveButton;
- Point m_aDatePos;
- Point m_aTimePos;
- Size m_aDateTimeSize;
-
bool m_bIsRemoved;
bool m_bTypeLostFocus;
@@ -471,6 +467,9 @@ private:
CustomPropertiesYesNoButton m_aYesNoButton;
ImageButton m_aRemoveButton;
+ long m_nDatePosX;
+ long m_nTimePosX;
+
sal_Int32 m_nLineHeight;
sal_Int32 m_nScrollPos;
SvtSysLocale m_aSysLocale;
Modified: openoffice/branches/l10n40/main/sfx2/inc/sfx2/shell.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sfx2/inc/sfx2/shell.hxx?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sfx2/inc/sfx2/shell.hxx (original)
+++ openoffice/branches/l10n40/main/sfx2/inc/sfx2/shell.hxx Sat Oct 26 14:59:22 2013
@@ -268,7 +268,11 @@ public:
When <FALSE/> then broadcast the 'default' context.
*/
void BroadcastContextForActivation (const bool bIsActivated);
-
+
+ /** Enabled or disable the context broadcaster. Returns the old state.
+ */
+ bool SetContextBroadcasterEnabled (const bool bIsEnabled);
+
#ifndef _SFXSH_HXX
SAL_DLLPRIVATE bool CanExecuteSlot_Impl( const SfxSlot &rSlot );
SAL_DLLPRIVATE void DoActivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI);
Modified: openoffice/branches/l10n40/main/sfx2/inc/sfx2/sidebar/ContextChangeBroadcaster.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sfx2/inc/sfx2/sidebar/ContextChangeBroadcaster.hxx?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sfx2/inc/sfx2/sidebar/ContextChangeBroadcaster.hxx (original)
+++ openoffice/branches/l10n40/main/sfx2/inc/sfx2/sidebar/ContextChangeBroadcaster.hxx Sat Oct 26 14:59:22 2013
@@ -44,9 +44,18 @@ public:
void Activate (const cssu::Reference<css::frame::XFrame>& rxFrame);
void Deactivate (const cssu::Reference<css::frame::XFrame>& rxFrame);
+ /** Enable or disable the broadcaster.
+ @param bIsEnabled
+ The new value of the "enabled" state.
+ @return
+ The old value of the "enabled" state is returned.
+ */
+ bool SetBroadcasterEnabled (const bool bIsEnabled);
+
private:
rtl::OUString msContextName;
bool mbIsContextActive;
+ bool mbIsBroadcasterEnabled;
void BroadcastContextChange (
const cssu::Reference<css::frame::XFrame>& rxFrame,
Modified: openoffice/branches/l10n40/main/sfx2/source/control/shell.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sfx2/source/control/shell.cxx?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sfx2/source/control/shell.cxx (original)
+++ openoffice/branches/l10n40/main/sfx2/source/control/shell.cxx Sat Oct 26 14:59:22 2013
@@ -1289,6 +1289,7 @@ void SfxShell::SetViewShell_Impl( SfxVie
+
void SfxShell::BroadcastContextForActivation (const bool bIsActivated)
{
SfxViewFrame* pViewFrame = GetFrame();
@@ -1298,3 +1299,11 @@ void SfxShell::BroadcastContextForActiva
else
pImp->maContextChangeBroadcaster.Deactivate(pViewFrame->GetFrame().GetFrameInterface());
}
+
+
+
+
+bool SfxShell::SetContextBroadcasterEnabled (const bool bIsEnabled)
+{
+ return pImp->maContextChangeBroadcaster.SetBroadcasterEnabled(bIsEnabled);
+}
Modified: openoffice/branches/l10n40/main/sfx2/source/dialog/dinfdlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sfx2/source/dialog/dinfdlg.cxx?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sfx2/source/dialog/dinfdlg.cxx (original)
+++ openoffice/branches/l10n40/main/sfx2/source/dialog/dinfdlg.cxx Sat Oct 26 14:59:22 2013
@@ -1847,8 +1847,9 @@ IMPL_LINK( CustomPropertiesWindow, TypeH
}
else if( nType == CUSTOM_TYPE_DATETIME)
{
- pLine->m_aDateField.SetPosSizePixel( pLine->m_aDatePos, pLine->m_aDateTimeSize );
- pLine->m_aTimeField.SetPosSizePixel(pLine->m_aTimePos, pLine->m_aDateTimeSize );
+ const long nPosY( pLine->m_aDateField.GetPosPixel().Y() );
+ pLine->m_aDateField.SetPosPixel( ::Point( m_nDatePosX, nPosY ) );
+ pLine->m_aTimeField.SetPosPixel( ::Point( m_nTimePosX, nPosY ) );
}
return 0;
@@ -1871,10 +1872,15 @@ IMPL_LINK( CustomPropertiesWindow, Remov
if ( pLine->m_bIsRemoved )
continue;
- Window* pWindows[] = { &pLine->m_aNameBox, &pLine->m_aTypeBox, &pLine->m_aValueEdit,
- &pLine->m_aDateField, &pLine->m_aTimeField,
- &pLine->m_aDurationField, &pLine->m_aEditButton,
- &pLine->m_aYesNoButton, &pLine->m_aRemoveButton, NULL };
+ Window* pWindows[] = { &pLine->m_aNameBox,
+ &pLine->m_aTypeBox,
+ &pLine->m_aValueEdit,
+ &pLine->m_aDateField,
+ &pLine->m_aTimeField,
+ &pLine->m_aDurationField,
+ &pLine->m_aEditButton,
+ &pLine->m_aYesNoButton,
+ &pLine->m_aRemoveButton, NULL };
Window** pCurrent = pWindows;
while ( *pCurrent )
{
@@ -2042,6 +2048,9 @@ void CustomPropertiesWindow::InitControl
m_nLineHeight =
( m_aRemoveButton.GetPosPixel().Y() * 2 ) + m_aRemoveButton.GetSizePixel().Height();
+
+ m_nDatePosX = m_aDateField.GetPosPixel().X();
+ m_nTimePosX = m_aTimeField.GetPosPixel().X();
}
sal_uInt16 CustomPropertiesWindow::GetVisibleLineCount() const
@@ -2096,10 +2105,6 @@ void CustomPropertiesWindow::AddLine( co
pCurrent++;
pNewCurrent++;
}
- //
- pNewLine->m_aDatePos = pNewLine->m_aDateField.GetPosPixel();
- pNewLine->m_aTimePos = pNewLine->m_aTimeField.GetPosPixel();
- pNewLine->m_aDateTimeSize = pNewLine->m_aDateField.GetSizePixel();
double nTmpValue = 0;
bool bTmpValue = false;
@@ -2208,8 +2213,15 @@ void CustomPropertiesWindow::DoScroll( s
if ( pLine->m_bIsRemoved )
continue;
- Window* pWindows[] = { &pLine->m_aNameBox, &pLine->m_aTypeBox, &pLine->m_aValueEdit, &pLine->m_aDurationField,
- &pLine->m_aYesNoButton, &pLine->m_aRemoveButton, NULL };
+ Window* pWindows[] = { &pLine->m_aNameBox,
+ &pLine->m_aTypeBox,
+ &pLine->m_aValueEdit,
+ &pLine->m_aDurationField,
+ &pLine->m_aEditButton,
+ &pLine->m_aDateField,
+ &pLine->m_aTimeField,
+ &pLine->m_aYesNoButton,
+ &pLine->m_aRemoveButton, NULL };
Window** pCurrent = pWindows;
while ( *pCurrent )
{
Modified: openoffice/branches/l10n40/main/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sfx2/source/sidebar/ContextChangeBroadcaster.cxx?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sfx2/source/sidebar/ContextChangeBroadcaster.cxx (original)
+++ openoffice/branches/l10n40/main/sfx2/source/sidebar/ContextChangeBroadcaster.cxx Sat Oct 26 14:59:22 2013
@@ -39,7 +39,8 @@ namespace sfx2 { namespace sidebar {
ContextChangeBroadcaster::ContextChangeBroadcaster (void)
: msContextName(),
- mbIsContextActive(false)
+ mbIsContextActive(false),
+ mbIsBroadcasterEnabled(true)
{
}
@@ -85,11 +86,24 @@ void ContextChangeBroadcaster::Deactivat
+bool ContextChangeBroadcaster::SetBroadcasterEnabled (const bool bIsEnabled)
+{
+ const bool bWasEnabled (mbIsBroadcasterEnabled);
+ mbIsBroadcasterEnabled = bIsEnabled;
+ return bWasEnabled;
+}
+
+
+
+
void ContextChangeBroadcaster::BroadcastContextChange (
const cssu::Reference<css::frame::XFrame>& rxFrame,
const ::rtl::OUString& rsModuleName,
const ::rtl::OUString& rsContextName)
{
+ if ( ! mbIsBroadcasterEnabled)
+ return;
+
if (rsContextName.getLength() == 0)
return;
Modified: openoffice/branches/l10n40/main/sot/source/sdstor/stgstrms.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sot/source/sdstor/stgstrms.cxx?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sot/source/sdstor/stgstrms.cxx (original)
+++ openoffice/branches/l10n40/main/sot/source/sdstor/stgstrms.cxx Sat Oct 26 14:59:22 2013
@@ -29,6 +29,7 @@
#include <osl/file.hxx>
#include <tools/tempfile.hxx>
#include <tools/debug.hxx>
+#include <set>
#include "sot/stg.hxx"
#include "stgelem.hxx"
@@ -768,14 +769,26 @@ void StgDataStrm::Init( sal_Int32 nBgn,
// determine the actual size of the stream by scanning
// the FAT chain and counting the # of pages allocated
nSize = 0;
- sal_Int32 nOldBgn = -1;
- while( nBgn >= 0 && nBgn != nOldBgn )
+
+ // there may be files with double page numbers or loops of page
+ // references. This is not allowed. To be able to track this and
+ // to exit with an error, track already scanned PageNumbers here
+ // and use them to see if an already counted page is re-visited
+ std::set< sal_Int32 > nUsedPageNumbers;
+
+ while(nBgn >= 0)
{
- nOldBgn = nBgn;
- nBgn = pFat->GetNextPage( nBgn );
- if( nBgn == nOldBgn )
- rIo.SetError( ERRCODE_IO_WRONGFORMAT );
- nSize += nPageSize;
+ if(nUsedPageNumbers.find(nBgn) == nUsedPageNumbers.end())
+ {
+ nUsedPageNumbers.insert(nBgn);
+ nSize += nPageSize;
+ nBgn = pFat->GetNextPage(nBgn);
+ }
+ else
+ {
+ rIo.SetError(ERRCODE_IO_WRONGFORMAT);
+ nBgn = -1;
+ }
}
}
}
Modified: openoffice/branches/l10n40/main/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/svgio/inc/svgio/svgreader/svgstyleattributes.hxx?rev=1536001&r1=1536000&r2=1536001&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/svgio/inc/svgio/svgreader/svgstyleattributes.hxx (original)
+++ openoffice/branches/l10n40/main/svgio/inc/svgio/svgreader/svgstyleattributes.hxx Sat Oct 26 14:59:22 2013
@@ -251,14 +251,6 @@ namespace svgio
basegfx::B2DHomMatrix& rMarkerTransform,
basegfx::B2DRange& rClipRange,
const SvgMarkerNode& rMarker) const;
- void add_singleMarker(
- drawinglayer::primitive2d::Primitive2DSequence& rTarget,
- const drawinglayer::primitive2d::Primitive2DSequence& rMarkerPrimitives,
- const basegfx::B2DHomMatrix& rMarkerTransform,
- const basegfx::B2DRange& rClipRange,
- const SvgMarkerNode& rMarker,
- const basegfx::B2DPolygon& rCandidate,
- const sal_uInt32 nIndex) const;
void add_markers(
const basegfx::B2DPolyPolygon& rPath,
drawinglayer::primitive2d::Primitive2DSequence& rTarget) const;