You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by st...@apache.org on 2013/11/04 06:32:06 UTC
svn commit: r1538508 [5/15] - in /openoffice/branches/ia2: ./
extras/l10n/source/bg/ main/ main/basegfx/inc/basegfx/polygon/
main/basegfx/source/inc/ main/basegfx/source/polygon/
main/basegfx/source/tools/ main/basegfx/test/ main/canvas/source/tools/ m...
Modified: openoffice/branches/ia2/main/cui/source/dialogs/colorpicker.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/cui/source/dialogs/colorpicker.hrc?rev=1538508&r1=1538507&r2=1538508&view=diff
==============================================================================
--- openoffice/branches/ia2/main/cui/source/dialogs/colorpicker.hrc (original)
+++ openoffice/branches/ia2/main/cui/source/dialogs/colorpicker.hrc Mon Nov 4 05:32:01 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/ia2/main/cui/source/dialogs/colorpicker.src
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/cui/source/dialogs/colorpicker.src?rev=1538508&r1=1538507&r2=1538508&view=diff
==============================================================================
--- openoffice/branches/ia2/main/cui/source/dialogs/colorpicker.src (original)
+++ openoffice/branches/ia2/main/cui/source/dialogs/colorpicker.src Mon Nov 4 05:32:01 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/ia2/main/cui/source/options/optsave.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/cui/source/options/optsave.cxx?rev=1538508&r1=1538507&r2=1538508&view=diff
==============================================================================
--- openoffice/branches/ia2/main/cui/source/options/optsave.cxx (original)
+++ openoffice/branches/ia2/main/cui/source/options/optsave.cxx Mon Nov 4 05:32:01 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/ia2/main/cui/source/tabpages/tpbitmap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/cui/source/tabpages/tpbitmap.cxx?rev=1538508&r1=1538507&r2=1538508&view=diff
==============================================================================
--- openoffice/branches/ia2/main/cui/source/tabpages/tpbitmap.cxx (original)
+++ openoffice/branches/ia2/main/cui/source/tabpages/tpbitmap.cxx Mon Nov 4 05:32:01 2013
@@ -397,30 +397,41 @@ IMPL_LINK( SvxBitmapTabPage, ChangeBitma
Color aPixelColor = aFront;
Color aBackColor = aBack;
- aBitmapCtl.SetPixelColor( aPixelColor );
- aBitmapCtl.SetBackgroundColor( aBackColor );
-
- // Wenn der Eintrag nicht in der Listbox ist, wird die Farbe
- // temporaer hinzugenommen
- if( 0 == aLbBitmaps.GetSelectEntryPos() )
- {
- aLbColor.SelectEntry( Color( COL_BLACK ) );
- ChangePixelColorHdl_Impl( this );
- }
- else
- aLbColor.SelectEntry( aPixelColor );
- if( aLbColor.GetSelectEntryCount() == 0 )
- {
- aLbColor.InsertEntry( aPixelColor, String() );
- aLbColor.SelectEntry( aPixelColor );
- }
- aLbBackgroundColor.SelectEntry( aBackColor );
- if( aLbBackgroundColor.GetSelectEntryCount() == 0 )
- {
- aLbBackgroundColor.InsertEntry( aBackColor, String() );
- aLbBackgroundColor.SelectEntry( aBackColor );
- }
- }
+ // #123564# This causes the wrong color to be selected
+ // as foreground color when the 1st bitmap in the bitmap
+ // list is selected. I see no reason why this is done,
+ // thus I will take it out
+ //
+ //if( 0 == aLbBitmaps.GetSelectEntryPos() )
+ //{
+ // aLbColor.SelectEntry( Color( COL_BLACK ) );
+ // ChangePixelColorHdl_Impl( this );
+ //}
+ //else
+
+ aLbColor.SelectEntry( aPixelColor );
+
+ if( aLbColor.GetSelectEntryCount() == 0 )
+ {
+ aLbColor.InsertEntry( aPixelColor, String() );
+ aLbColor.SelectEntry( aPixelColor );
+ }
+
+ aLbBackgroundColor.SelectEntry( aBackColor );
+
+ if( aLbBackgroundColor.GetSelectEntryCount() == 0 )
+ {
+ aLbBackgroundColor.InsertEntry( aBackColor, String() );
+ aLbBackgroundColor.SelectEntry( aBackColor );
+ }
+
+ // update aBitmapCtl, rXFSet and aCtlPreview
+ aBitmapCtl.SetPixelColor( aPixelColor );
+ aBitmapCtl.SetBackgroundColor( aBackColor );
+ rXFSet.Put(XFillBitmapItem(String(), Graphic(aBitmapCtl.GetBitmapEx())));
+ aCtlPreview.SetAttributes( aXFillAttr.GetItemSet() );
+ aCtlPreview.Invalidate();
+ }
else
{
aCtlPixel.Reset();
@@ -756,9 +767,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/ia2/main/cui/source/tabpages/tpcolor.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/cui/source/tabpages/tpcolor.cxx?rev=1538508&r1=1538507&r2=1538508&view=diff
==============================================================================
--- openoffice/branches/ia2/main/cui/source/tabpages/tpcolor.cxx (original)
+++ openoffice/branches/ia2/main/cui/source/tabpages/tpcolor.cxx Mon Nov 4 05:32:01 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/ia2/main/cui/source/tabpages/tplneend.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/cui/source/tabpages/tplneend.cxx?rev=1538508&r1=1538507&r2=1538508&view=diff
==============================================================================
--- openoffice/branches/ia2/main/cui/source/tabpages/tplneend.cxx (original)
+++ openoffice/branches/ia2/main/cui/source/tabpages/tplneend.cxx Mon Nov 4 05:32:01 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/ia2/main/dbaccess/source/ui/browser/unodatbr.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/dbaccess/source/ui/browser/unodatbr.cxx?rev=1538508&r1=1538507&r2=1538508&view=diff
==============================================================================
--- openoffice/branches/ia2/main/dbaccess/source/ui/browser/unodatbr.cxx (original)
+++ openoffice/branches/ia2/main/dbaccess/source/ui/browser/unodatbr.cxx Mon Nov 4 05:32:01 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/ia2/main/default_images/introabout/about.png
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/default_images/introabout/about.png?rev=1538508&r1=1538507&r2=1538508&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/ia2/main/desktop/os2/source/applauncher/launcher.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/desktop/os2/source/applauncher/launcher.cxx?rev=1538508&r1=1538507&r2=1538508&view=diff
==============================================================================
--- openoffice/branches/ia2/main/desktop/os2/source/applauncher/launcher.cxx (original)
+++ openoffice/branches/ia2/main/desktop/os2/source/applauncher/launcher.cxx Mon Nov 4 05:32:01 2013
@@ -42,12 +42,7 @@ int main( int argc, char* argv[])
erridErrorCode = WinGetLastError(hab);
// Calculate application name
- CHAR szLibpath[_MAX_PATH*2];
CHAR szApplicationName[_MAX_PATH];
- CHAR szDrive[_MAX_PATH];
- CHAR szDir[_MAX_PATH];
- CHAR szFileName[_MAX_PATH];
- CHAR szExt[_MAX_PATH];
// get executable fullpath
DosGetInfoBlocks(NULL, &pib);
@@ -55,15 +50,13 @@ int main( int argc, char* argv[])
// adjust libpath
#if OSL_DEBUG_LEVEL > 0
+ CHAR szLibpath[_MAX_PATH*2];
rc = DosQueryExtLIBPATH( (PSZ)szLibpath, BEGIN_LIBPATH);
fprintf( stderr, "1 BeginLibPath: %s\n", szLibpath);
#endif
- _splitpath( szApplicationName, szDrive, szDir, szFileName, szExt );
- char* basedir = strstr( szDir, "\\PROGRAM\\");
+ char* basedir = strrchr( szApplicationName, '\\');
if (basedir) *basedir = 0;
- sprintf( szLibpath, "\"%s%s\\URE\\BIN\";\"%s%s\\BASIS\\PROGRAM\";%%BeginLIBPATH%%;",
- szDrive, szDir, szDrive, szDir);
- DosSetExtLIBPATH( (PCSZ)szLibpath, BEGIN_LIBPATH);
+ DosSetExtLIBPATH( (PCSZ)szApplicationName, BEGIN_LIBPATH);
// make sure we load DLL from our path only, so multiple instances/versions
// can be loaded.
@@ -75,8 +68,7 @@ int main( int argc, char* argv[])
#endif
// adjust exe name
- _splitpath( szApplicationName, szDrive, szDir, szFileName, szExt );
- _makepath( szApplicationName, szDrive, szDir, OFFICE_IMAGE_NAME, (".bin") );
+ strcat( szApplicationName, "\\" OFFICE_IMAGE_NAME ".bin");
// copy command line parameters
int i, len;
Modified: openoffice/branches/ia2/main/desktop/win32/source/setup/setup.ulf
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/desktop/win32/source/setup/setup.ulf?rev=1538508&r1=1538507&r2=1538508&view=diff
==============================================================================
--- openoffice/branches/ia2/main/desktop/win32/source/setup/setup.ulf (original)
+++ openoffice/branches/ia2/main/desktop/win32/source/setup/setup.ulf Mon Nov 4 05:32:01 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/ia2/main/drawinglayer/source/processor2d/vclprocessor2d.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/drawinglayer/source/processor2d/vclprocessor2d.cxx?rev=1538508&r1=1538507&r2=1538508&view=diff
==============================================================================
--- openoffice/branches/ia2/main/drawinglayer/source/processor2d/vclprocessor2d.cxx (original)
+++ openoffice/branches/ia2/main/drawinglayer/source/processor2d/vclprocessor2d.cxx Mon Nov 4 05:32:01 2013
@@ -470,8 +470,9 @@ namespace drawinglayer
aGraphicRange.transform(mpOutputDevice->GetViewTransformation() * aLocalTransform);
// extract discrete size of graphic
- const sal_Int32 nBWidth(basegfx::fround(aGraphicRange.getWidth()));
- const sal_Int32 nBHeight(basegfx::fround(aGraphicRange.getHeight()));
+ // caution: when getting to zero, nothing would be painted; thus, do not allow this
+ const sal_Int32 nBWidth(std::max(sal_Int32(1), basegfx::fround(aGraphicRange.getWidth())));
+ const sal_Int32 nBHeight(std::max(sal_Int32(1), basegfx::fround(aGraphicRange.getHeight())));
// only do something when bitmap fill has a size in discrete units
if(nBWidth > 0 && nBHeight > 0)
@@ -483,9 +484,17 @@ namespace drawinglayer
static bool bEnablePreScaling(true);
const bool bPreScaled(bEnablePreScaling && nBWidth * nBHeight < (250 * 250));
+ // ... but only up to a maximum size, else it gets too expensive
if(bPreScaled)
{
- // ... but only up to a maximum size, else it gets too expensive
+ // if color depth is below 24bit, expand before scaling for better quality.
+ // This is even needed for low colors, else the scale will produce
+ // a bitmap in gray or Black/White (!)
+ if(aBitmapEx.GetBitCount() < 24)
+ {
+ aBitmapEx.Convert(BMP_CONVERSION_24BIT);
+ }
+
aBitmapEx.Scale(aNeededBitmapSizePixel, BMP_SCALE_INTERPOLATE);
}
Modified: openoffice/branches/ia2/main/dtrans/source/win32/dtobj/DOTransferable.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/dtrans/source/win32/dtobj/DOTransferable.cxx?rev=1538508&r1=1538507&r2=1538508&view=diff
==============================================================================
--- openoffice/branches/ia2/main/dtrans/source/win32/dtobj/DOTransferable.cxx (original)
+++ openoffice/branches/ia2/main/dtrans/source/win32/dtobj/DOTransferable.cxx Mon Nov 4 05:32:01 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/ia2/main/extras/source/misc_config/wizard/web/layouts/layout.xsl
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/misc_config/wizard/web/layouts/layout.xsl?rev=1538508&r1=1538507&r2=1538508&view=diff
==============================================================================
--- openoffice/branches/ia2/main/extras/source/misc_config/wizard/web/layouts/layout.xsl (original)
+++ openoffice/branches/ia2/main/extras/source/misc_config/wizard/web/layouts/layout.xsl Mon Nov 4 05:32:01 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/ia2/main/extras/source/misc_config/wizard/web/layouts/layoutX.xsl
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/extras/source/misc_config/wizard/web/layouts/layoutX.xsl?rev=1538508&r1=1538507&r2=1538508&view=diff
==============================================================================
--- openoffice/branches/ia2/main/extras/source/misc_config/wizard/web/layouts/layoutX.xsl (original)
+++ openoffice/branches/ia2/main/extras/source/misc_config/wizard/web/layouts/layoutX.xsl Mon Nov 4 05:32:01 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/ia2/main/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx?rev=1538508&r1=1538507&r2=1538508&view=diff
==============================================================================
--- openoffice/branches/ia2/main/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx (original)
+++ openoffice/branches/ia2/main/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx Mon Nov 4 05:32:01 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/ia2/main/instsetoo_native/util/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/instsetoo_native/util/makefile.mk?rev=1538508&r1=1538507&r2=1538508&view=diff
==============================================================================
--- openoffice/branches/ia2/main/instsetoo_native/util/makefile.mk (original)
+++ openoffice/branches/ia2/main/instsetoo_native/util/makefile.mk Mon Nov 4 05:32:01 2013
@@ -28,8 +28,6 @@ TARGET=util
.INCLUDE: settings.mk
.INCLUDE: $(SOLARINCDIR)$/rtlbootstrap.mk
-# PERL:=@echo
-
# watch for the path delimiter
.IF "$(GUI)"=="WNT"
PYTHONPATH:=$(PWD)$/$(BIN);$(SOLARLIBDIR);$(SOLARLIBDIR)$/python;$(SOLARLIBDIR)$/python$/lib-dynload
@@ -63,6 +61,26 @@ INSTALLDIR=$(OUT)
.INCLUDE: target.mk
+# The help target belongs after the inclusion of target.mk to not become the default target.
+help .PHONY :
+ @echo "known targets:"
+ @echo " openoffice builds the default installation packages for the platform"
+ @echo " aoo_srcrelease packs the source release package"
+ @echo " updatepack"
+ @echo " openofficedev devloper snapshot"
+ @echo " openofficewithjre"
+ @echo " ooolanguagepack"
+ @echo " ooodevlanguagepack"
+ @echo " sdkoo"
+ @echo " sdkoodev"
+ @echo
+ @echo "Most targets (all except aoo_srcrelease and updatepack) accept suffixes"
+ @echo " add _<language> to build a target for one language only"
+ @echo " the default set of languages is alllangiso=$(alllangiso)"
+ @echo " add .<package_format> to build a target for one package format only"
+ @echo " the default set of package formats is archive and PKGFORMAT=$(PKGFORMAT)"
+
+
LOCALPYFILES= \
$(BIN)$/uno.py \
$(BIN)$/unohelper.py \
@@ -83,7 +101,6 @@ ALLTAR : $(LOCALPYFILES)
ALLTAR : openoffice
.ELSE
ALLTAR : openoffice sdkoo_en-US
-#ALLTAR : openoffice sdkoo_en-US ure_en-US
.ENDIF
.ELSE # "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
ALLTAR : updatepack
@@ -139,17 +156,10 @@ sdkoo: $(foreach,i,$(alllangiso) sdkoo_$
sdkoodev: $(foreach,i,$(alllangiso) sdkoodev_$i)
-#ure: $(foreach,i,$(alllangiso) ure_$i)
-
MSIOFFICETEMPLATESOURCE=$(PRJ)$/inc_openoffice$/windows$/msi_templates
MSILANGPACKTEMPLATESOURCE=$(PRJ)$/inc_ooolangpack$/windows$/msi_templates
MSISDKOOTEMPLATESOURCE=$(PRJ)$/inc_sdkoo$/windows$/msi_templates
-.IF "$(BUILD_SPECIAL)"!=""
-MSIOFFICETEMPLATEDIR=$(MSIOFFICETEMPLATESOURCE)
-MSILANGPACKTEMPLATEDIR=$(MSILANGPACKTEMPLATESOURCE)
-MSISDKOOTEMPLATEDIR=$(MSISDKOOTEMPLATESOURCE)
-.ELSE # "$(BUILD_SPECIAL)"!=""
NOLOGOSPLASH:=$(BIN)$/intro.zip
DEVNOLOGOSPLASH:=$(BIN)$/dev$/intro.zip
MSIOFFICETEMPLATEDIR=$(MISC)$/openoffice$/msi_templates
@@ -159,7 +169,7 @@ MSISDKOOTEMPLATEDIR=$(MISC)$/sdkoo$/msi_
ADDDEPS=$(NOLOGOSPLASH) $(DEVNOLOGOSPLASH)
.IF "$(OS)" == "WNT"
-ADDDEPS+=hack_msitemplates
+ADDDEPS+=msitemplates
.ENDIF
$(foreach,i,$(alllangiso) openoffice_$i) : $(ADDDEPS)
@@ -177,14 +187,10 @@ $(foreach,i,$(alllangiso) sdkoo_$i) : $(
$(foreach,i,$(alllangiso) sdkoodev_$i) : $(ADDDEPS)
-#$(foreach,i,$(alllangiso) ure_$i) : $(ADDDEPS)
-
.IF "$(MAKETARGETS)"!=""
$(MAKETARGETS) : $(ADDDEPS)
.ENDIF # "$(MAKETARGETS)"!=""
-.ENDIF # "$(BUILD_SPECIAL)"!=""
-
$(foreach,i,$(alllangiso) openoffice_$i) : $$@{$(PKGFORMAT:^".")}
.IF "$(MAKETARGETS)"!=""
.IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
@@ -192,45 +198,80 @@ $(MAKETARGETS) : $$@{$(PKGFORMAT:^".")}
$(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
.ENDIF # "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
.ENDIF # "$(MAKETARGETS)"!=""
-openoffice_%{$(PKGFORMAT:^".") .archive} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p Apache_OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
- $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product Apache_OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+
+
+# This macro makes calling the make_installer.pl script a bit easier.
+# Just add -p and -msitemplate switches.
+MAKE_INSTALLER_COMMAND= \
+ @$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl \
+ -f $(PRJ)$/util$/openoffice.lst \
+ -l $(subst,$(@:s/_/ /:1)_, $(@:b)) \
+ -u $(OUT) \
+ -buildid $(BUILD) \
+ -msilanguage $(MISC)$/win_ulffiles \
+ -format $(@:e:s/.//) \
+ $(VERBOSESWITCH)
+
+# This macro makes calling gen_update_info.pl a bit easier
+# Just add --product switches, and xml input file and redirect output.
+GEN_UPDATE_INFO_COMMAND= \
+ @$(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl \
+ --buildid $(BUILD) \
+ --arch "$(RTL_ARCH)" \
+ --os "$(RTL_OS)" \
+ --lstfile $(PRJ)$/util$/openoffice.lst \
+ --languages $(subst,$(@:s/_/ /:1)_, $(@:b))
+
+openoffice_%{$(PKGFORMAT:^".")} :
+ $(MAKE_INSTALLER_COMMAND) \
+ -p Apache_OpenOffice \
+ -msitemplate $(MSIOFFICETEMPLATEDIR)
+ $(GEN_UPDATE_INFO_COMMAND) \
+ --product Apache_OpenOffice \
+ $(PRJ)$/util$/update.xml \
+ > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+
+openoffice_%{.archive} :
+ $(MAKE_INSTALLER_COMMAND) \
+ -p Apache_OpenOffice \
+ -msitemplate $(MSIOFFICETEMPLATEDIR)
+ $(GEN_UPDATE_INFO_COMMAND) \
+ --product Apache_OpenOffice \
+ $(PRJ)$/util$/update.xml \
+ > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
$(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
openofficewithjre_%{$(PKGFORMAT:^".")} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p Aapche_OpenOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
+ $(MAKE_INSTALLER_COMMAND) -p Apache_OpenOffice_wJRE -msitemplate $(MSIOFFICETEMPLATEDIR)
$(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^".")}
openofficedev_%{$(PKGFORMAT:^".")} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p Apache_OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
- $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product Apache_OpenOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+ $(MAKE_INSTALLER_COMMAND) \
+ -p Apache_OpenOffice_Dev \
+ -msitemplate $(MSIOFFICETEMPLATEDIR)
+ $(GEN_UPDATE_INFO_COMMAND) \
+ --product Apache_OpenOffice_Dev \
+ $(PRJ)$/util$/update.xml \
+ > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
$(foreach,i,$(alllangiso) ooolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
ooolanguagepack_%{$(PKGFORMAT:^".")} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p Apache_OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
+ $(MAKE_INSTALLER_COMMAND) \
+ -p Apache_OpenOffice \
+ -msitemplate $(MSILANGPACKTEMPLATEDIR) \
+ -languagepack
$(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
ooodevlanguagepack_%{$(PKGFORMAT:^".")} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p Apache_OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
+ $(MAKE_INSTALLER_COMMAND) -p Apache_OpenOffice_Dev -msitemplate $(MSILANGPACKTEMPLATEDIR) -languagepack
$(foreach,i,$(alllangiso) sdkoo_$i) : $$@{$(PKGFORMAT:^".")}
sdkoo_%{$(PKGFORMAT:^".")} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p Apache_OpenOffice_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH)
+ $(MAKE_INSTALLER_COMMAND) -p Apache_OpenOffice_SDK -msitemplate $(MSISDKOOTEMPLATEDIR) -dontstrip
$(foreach,i,$(alllangiso) sdkoodev_$i) : $$@{$(PKGFORMAT:^".")}
sdkoodev_%{$(PKGFORMAT:^".")} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p Apache_OpenOffice_Dev_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH)
-
-#$(foreach,i,$(alllangiso) ure_$i) : $$@{$(PKGFORMAT:^".")}
-#ure_%{$(PKGFORMAT:^".")} :
-#.IF "$(OS)" == "MACOSX"
-# @echo 'for now, there is no standalone URE for Mac OS X'
-#.ELSE
-# $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.#lst \
-# -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p URE -u $(OUT) -buildid $(BUILD) -#format $(@:e:s/.//) $(VERBOSESWITCH) \
-# -msitemplate $(MSIURETEMPLATEDIR) \
-# -msilanguage $(MISC)$/win_ulffiles
-#.ENDIF
+ $(MAKE_INSTALLER_COMMAND) -p Apache_OpenOffice_Dev_SDK -msitemplate $(MSISDKOOTEMPLATEDIR) -dontstrip
.IF "$(MAKETARGETS)"!=""
.IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
@@ -261,18 +302,161 @@ $(BIN)$/dev$/intro.zip : $(SOLARCOMMONPC
@-$(MKDIR) $(@:d)
$(COPY) $< $@
-hack_msitemplates .PHONY:
- -$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)
- -$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)
- -$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)
- -$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)$/Binary
- -$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)$/Binary
- -$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)$/Binary
- $(GNUCOPY) $(MSIOFFICETEMPLATESOURCE)$/*.* $(MSIOFFICETEMPLATEDIR)
- $(GNUCOPY) $(MSILANGPACKTEMPLATESOURCE)$/*.* $(MSILANGPACKTEMPLATEDIR)
- $(GNUCOPY) $(MSISDKOOTEMPLATESOURCE)$/*.* $(MSISDKOOTEMPLATEDIR)
- $(GNUCOPY) $(MSIOFFICETEMPLATESOURCE)$/Binary$/*.* $(MSIOFFICETEMPLATEDIR)$/Binary
- $(GNUCOPY) $(MSILANGPACKTEMPLATESOURCE)$/Binary$/*.* $(MSILANGPACKTEMPLATEDIR)$/Binary
- $(GNUCOPY) $(MSISDKOOTEMPLATESOURCE)$/Binary$/*.* $(MSISDKOOTEMPLATEDIR)$/Binary
-
+msitemplates .PHONY: msi_template_files msi_langpack_template_files msi_sdk_template_files
+MSI_OFFICE_TEMPLATE_FILES= \
+ ActionTe.idt \
+ AdminExe.idt \
+ AdminUIS.idt \
+ AdvtExec.idt \
+ AppSearc.idt \
+ Binary.idt \
+ CheckBox.idt \
+ Control.idt \
+ ControlC.idt \
+ ControlE.idt \
+ CustomAc.idt \
+ Dialog.idt \
+ Error.idt \
+ EventMap.idt \
+ InstallE.idt \
+ InstallU.idt \
+ LaunchCo.idt \
+ ListBox.idt \
+ Property.idt \
+ RadioBut.idt \
+ RegLocat.idt \
+ Signatur.idt \
+ TextStyl.idt \
+ UIText.idt \
+ _Validat.idt \
+ codes.txt \
+ codes_broo.txt \
+ codes_broodev.txt \
+ codes_ooodev.txt \
+ components.txt \
+ upgradecode_remove_ooo.txt \
+ Binary/Banner.bmp \
+ Binary/Image.bmp \
+ Binary/caution.ico \
+ Binary/dontinstall.ico \
+ Binary/install.ico \
+ Binary/installfirstuse.ico \
+ Binary/installpartial.ico \
+ Binary/installstatemenu.ico \
+ Binary/networkinstall.ico \
+ Binary/newfolder.ico \
+ Binary/openfolder.ico \
+ Binary/setup.ico \
+ Binary/setupcomplete.ico \
+ Binary/setuppartial.ico \
+ Binary/setuprepair.ico \
+ Binary/trashcan.ico \
+ Binary/up.ico
+
+MSI_LANGPACK_TEMPLATE_FILES= \
+ ActionTe.idt \
+ AdminExe.idt \
+ AdminUIS.idt \
+ AdvtExec.idt \
+ Binary.idt \
+ CheckBox.idt \
+ Control.idt \
+ ControlC.idt \
+ ControlE.idt \
+ CustomAc.idt \
+ Dialog.idt \
+ Error.idt \
+ EventMap.idt \
+ InstallE.idt \
+ InstallU.idt \
+ LaunchCo.idt \
+ ListBox.idt \
+ Property.idt \
+ RadioBut.idt \
+ TextStyl.idt \
+ UIText.idt \
+ _Validat.idt \
+ bro_patchcodes.txt \
+ brodev_patchcodes.txt \
+ codes.txt \
+ codes_broo.txt \
+ codes_ooodev.txt \
+ components.txt \
+ ooo_patchcodes.txt \
+ ooodev_patchcodes.txt \
+ Binary/Banner.bmp
+
+MSI_SDK_TEMPLATE_FILES= \
+ ActionTe.idt \
+ AdminExe.idt \
+ AdminUIS.idt \
+ AdvtExec.idt \
+ AppSearc.idt \
+ Binary.idt \
+ CheckBox.idt \
+ Control.idt \
+ ControlC.idt \
+ ControlE.idt \
+ CustomAc.idt \
+ Dialog.idt \
+ Error.idt \
+ EventMap.idt \
+ InstallE.idt \
+ InstallU.idt \
+ LaunchCo.idt \
+ ListBox.idt \
+ Property.idt \
+ RadioBut.idt \
+ RegLocat.idt \
+ Signatur.idt \
+ TextStyl.idt \
+ UIText.idt \
+ _Validat.idt \
+ codes.txt \
+ components.txt \
+ Binary/Banner.bmp \
+ Binary/Image.bmp \
+ Binary/caution.ico \
+ Binary/dontinstall.ico \
+ Binary/install.ico \
+ Binary/installfirstuse.ico \
+ Binary/installpartial.ico \
+ Binary/installstatemenu.ico \
+ Binary/networkinstall.ico \
+ Binary/newfolder.ico \
+ Binary/openfolder.ico \
+ Binary/setup.ico \
+ Binary/setupcomplete.ico \
+ Binary/setuppartial.ico \
+ Binary/setuprepair.ico \
+ Binary/trashcan.ico \
+ Binary/up.ico
+
+msi_template_files .PHONY: \
+ $(MSIOFFICETEMPLATEDIR) \
+ $(MSIOFFICETEMPLATEDIR)$/Binary \
+ $(MSIOFFICETEMPLATEDIR)$/{$(MSI_OFFICE_TEMPLATE_FILES)}
+$(MSIOFFICETEMPLATEDIR) $(MSIOFFICETEMPLATEDIR)$/Binary :
+ -$(MKDIRHIER) $@
+$(MSIOFFICETEMPLATEDIR)$/% : $(MSIOFFICETEMPLATESOURCE)$/%
+ $(GNUCOPY) $< $@
+
+msi_langpack_template_files .PHONY : \
+ $(MSILANGPACKTEMPLATEDIR) \
+ $(MSILANGPACKTEMPLATEDIR)$/Binary \
+ $(MSILANGPACKTEMPLATEDIR)$/{$(MSI_LANGPACK_TEMPLATE_FILES)}
+$(MSILANGPACKTEMPLATEDIR) $(MSILANGPACKTEMPLATEDIR)$/Binary :
+ -$(MKDIRHIER) $@
+$(MSILANGPACKTEMPLATEDIR)$/% : $(MSILANGPACKTEMPLATESOURCE)$/%
+ $(GNUCOPY) $< $@
+
+
+msi_sdk_template_files .PHONY : \
+ $(MSISDKOOTEMPLATEDIR) \
+ $(MSISDKOOTEMPLATEDIR)$/Binary \
+ $(MSISDKOOTEMPLATEDIR)$/{$(MSI_SDK_TEMPLATE_FILES)}
+$(MSISDKOOTEMPLATEDIR) $(MSISDKOOTEMPLATEDIR)$/Binary :
+ -$(MKDIRHIER) $@
+$(MSISDKOOTEMPLATEDIR)/% : $(MSISDKOOTEMPLATESOURCE)$/%
+ $(GNUCOPY) $< $@
Modified: openoffice/branches/ia2/main/instsetoo_native/util/openoffice.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/instsetoo_native/util/openoffice.lst?rev=1538508&r1=1538507&r2=1538508&view=diff
==============================================================================
--- openoffice/branches/ia2/main/instsetoo_native/util/openoffice.lst (original)
+++ openoffice/branches/ia2/main/instsetoo_native/util/openoffice.lst Mon Nov 4 05:32:01 2013
@@ -5,9 +5,9 @@ Globals
variables
{
APACHEPROJECTNAME Apache OpenOffice
- OOOBASEVERSION 4.0
- OOOPACKAGEVERSION 4.0.0
- UREPACKAGEVERSION 4.0.0
+ OOOBASEVERSION 4.1
+ OOOPACKAGEVERSION 4.1.0
+ UREPACKAGEVERSION 4.1.0
URELAYERVERSION 1
BASISROOTNAME OpenOffice
UNIXBASISROOTNAME openoffice
@@ -41,9 +41,9 @@ Globals
OOOXMLFILEFORMATNAME OpenOffice.org XML
OOOXMLFILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- SERVICETAG_PRODUCTNAME Apache OpenOffice 4.0
- SERVICETAG_PRODUCTVERSION 4.0
- SERVICETAG_PARENTNAME Apache OpenOffice 4.0
+ SERVICETAG_PRODUCTNAME Apache OpenOffice 4.1
+ SERVICETAG_PRODUCTVERSION 4.1
+ SERVICETAG_PARENTNAME Apache OpenOffice 4.1
SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
SERVICETAG_URN urn:uuid:500061aa-5666-11e0-8e00-080020a9ed93
REGISTRATION_HOST https://registration.openoffice.org
@@ -61,7 +61,7 @@ Apache_OpenOffice
{
FULLPRODUCTNAME Apache OpenOffice
PRODUCTNAME OpenOffice
- PRODUCTVERSION 4.0.0
+ PRODUCTVERSION 4.1.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -69,15 +69,15 @@ Apache_OpenOffice
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4
USERDIRPRODUCTVERSION 4
- ABOUTBOXPRODUCTVERSION 4.0.0
- BASEPRODUCTVERSION 4.0
+ ABOUTBOXPRODUCTVERSION 4.1.0
+ BASEPRODUCTVERSION 4.1
PCPFILENAME openoffice.pcp
UPDATEURL https://ooo-updates.apache.org/aoo410/check.Update
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
EVAL
- PACKAGEVERSION 4.0.0
+ PACKAGEVERSION 4.1.0
PACKAGEREVISION {milestone}
LICENSENAME ALv2
GLOBALFILEGID gid_File_Lib_Vcl
@@ -121,7 +121,7 @@ Apache_OpenOffice_wJRE
{
FULLPRODUCTNAME Apache OpenOffice
PRODUCTNAME OpenOffice
- PRODUCTVERSION 4.0.0
+ PRODUCTVERSION 4.1.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -129,14 +129,14 @@ Apache_OpenOffice_wJRE
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4
USERDIRPRODUCTVERSION 4
- ABOUTBOXPRODUCTVERSION 4.0.0
- BASEPRODUCTVERSION 4.0
+ ABOUTBOXPRODUCTVERSION 4.1.0
+ BASEPRODUCTVERSION 4.1
UPDATEURL https://ooo-updates.apache.org/aoo410/check.Update
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
EVAL
- PACKAGEVERSION 4.0.0
+ PACKAGEVERSION 4.1.0
PACKAGEREVISION {milestone}
LICENSENAME ALv2
WITHJREPRODUCT 1
@@ -181,7 +181,7 @@ Apache_OpenOffice_Dev
{
FULLPRODUCTNAME AOO-Developer-Build
PRODUCTNAME AOO-Developer-Build
- PRODUCTVERSION 4.0.0
+ PRODUCTVERSION 4.1.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -191,8 +191,8 @@ Apache_OpenOffice_Dev
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4
USERDIRPRODUCTVERSION 4
- ABOUTBOXPRODUCTVERSION 4.0.0
- BASEPRODUCTVERSION 4.0
+ ABOUTBOXPRODUCTVERSION 4.1.0
+ BASEPRODUCTVERSION 4.1
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX aoodev
UREPACKAGEPREFIX aoodev
@@ -201,7 +201,7 @@ Apache_OpenOffice_Dev
UPDATEURL https://ooo-updates.apache.org/aoo410/check.Update
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
EVAL
- PACKAGEVERSION 4.0.0
+ PACKAGEVERSION 4.1.0
PACKAGEREVISION {milestone}
LICENSENAME ALv2
GLOBALFILEGID gid_File_Lib_Vcl
@@ -250,8 +250,8 @@ URE
{
FULLPRODUCTNAME URE
PRODUCTNAME URE
- PRODUCTVERSION 4.0.0
- PACKAGEVERSION 4.0
+ PRODUCTVERSION 4.1.0
+ PACKAGEVERSION 4.1
PACKAGEREVISION 1
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
@@ -293,14 +293,14 @@ Apache_OpenOffice_SDK
{
FULLPRODUCTNAME Apache OpenOffice
PRODUCTNAME OpenOffice
- PRODUCTVERSION 4.0.0
+ PRODUCTVERSION 4.1.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4
- PACKAGEVERSION 4.0.0
+ PACKAGEVERSION 4.1.0
PACKAGEREVISION {milestone}
PACK_INSTALLED 1
POOLPRODUCT 0
@@ -341,7 +341,7 @@ Apache_OpenOffice_Dev_SDK
{
FULLPRODUCTNAME AOO-Developer-Build
PRODUCTNAME AOO-Developer-Build
- PRODUCTVERSION 4.0.0
+ PRODUCTVERSION 4.1.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -350,7 +350,7 @@ Apache_OpenOffice_Dev_SDK
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4
- PACKAGEVERSION 4.0.0
+ PACKAGEVERSION 4.1.0
PACKAGEREVISION {milestone}
BASISPACKAGEPREFIX aoodev
UREPACKAGEPREFIX aoodev
Modified: openoffice/branches/ia2/main/io/source/TextOutputStream/TextOutputStream.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/io/source/TextOutputStream/TextOutputStream.cxx?rev=1538508&r1=1538507&r2=1538508&view=diff
==============================================================================
--- openoffice/branches/ia2/main/io/source/TextOutputStream/TextOutputStream.cxx (original)
+++ openoffice/branches/ia2/main/io/source/TextOutputStream/TextOutputStream.cxx Mon Nov 4 05:32:01 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/ia2/main/odk/util/makefile.pmk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/util/makefile.pmk?rev=1538508&r1=1538507&r2=1538508&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/util/makefile.pmk (original)
+++ openoffice/branches/ia2/main/odk/util/makefile.pmk Mon Nov 4 05:32:01 2013
@@ -22,7 +22,7 @@
# used for sdk common files
-PRODUCT_RELEASE=4.0
+PRODUCT_RELEASE=4.1
OFFICENAME=OpenOffice
.IF "$(GUI)"=="WNT"
SDKDIRNAME=OpenOffice_$(PRODUCT_RELEASE)_SDK
Modified: openoffice/branches/ia2/main/officecfg/registry/data/org/openoffice/VCL.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/officecfg/registry/data/org/openoffice/VCL.xcu?rev=1538508&r1=1538507&r2=1538508&view=diff
==============================================================================
--- openoffice/branches/ia2/main/officecfg/registry/data/org/openoffice/VCL.xcu (original)
+++ openoffice/branches/ia2/main/officecfg/registry/data/org/openoffice/VCL.xcu Mon Nov 4 05:32:01 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/ia2/main/oox/source/core/xmlfilterbase.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/oox/source/core/xmlfilterbase.cxx?rev=1538508&r1=1538507&r2=1538508&view=diff
==============================================================================
--- openoffice/branches/ia2/main/oox/source/core/xmlfilterbase.cxx (original)
+++ openoffice/branches/ia2/main/oox/source/core/xmlfilterbase.cxx Mon Nov 4 05:32:01 2013
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#include "oox/core/xmlfilterbase.hxx"
#include <cstdio>
@@ -120,6 +118,7 @@ XmlFilterBaseImpl::XmlFilterBaseImpl( co
maFastParser.registerNamespace( NMSP_ax );
maFastParser.registerNamespace( NMSP_xm );
+ maFastParser.registerNamespace( NMSP_markupCompat ); // i123528
}
// ============================================================================
Modified: openoffice/branches/ia2/main/oox/source/token/namespaces.txt
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/oox/source/token/namespaces.txt?rev=1538508&r1=1538507&r2=1538508&view=diff
==============================================================================
--- openoffice/branches/ia2/main/oox/source/token/namespaces.txt (original)
+++ openoffice/branches/ia2/main/oox/source/token/namespaces.txt Mon Nov 4 05:32:01 2013
@@ -70,3 +70,4 @@ dc http://purl.org/
dcTerms http://purl.org/dc/terms/
xm http://schemas.microsoft.com/office/excel/2006/main
sprm http://sprm
+markupCompat http://schemas.openxmlformats.org/markup-compatibility/2006
Modified: openoffice/branches/ia2/main/oox/source/token/tokens.txt
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/oox/source/token/tokens.txt?rev=1538508&r1=1538507&r2=1538508&view=diff
==============================================================================
--- openoffice/branches/ia2/main/oox/source/token/tokens.txt (original)
+++ openoffice/branches/ia2/main/oox/source/token/tokens.txt Mon Nov 4 05:32:01 2013
@@ -37,6 +37,7 @@ AbbreviatedCaseNumber
Accel
Accel2
AlbumTitle
+AlternateContent
Always
Anchor
AppVersion
@@ -79,6 +80,7 @@ Characters
CharactersWithSpaces
Checkbox
Checked
+Choice
City
ClientData
ColHidden
@@ -2107,6 +2109,7 @@ factor
fade
fadeDir
fallback
+Fallback
false
family
fans
Modified: openoffice/branches/ia2/main/readlicense_oo/docs/readme/readme.xrm
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/readlicense_oo/docs/readme/readme.xrm?rev=1538508&r1=1538507&r2=1538508&view=diff
==============================================================================
--- openoffice/branches/ia2/main/readlicense_oo/docs/readme/readme.xrm (original)
+++ openoffice/branches/ia2/main/readlicense_oo/docs/readme/readme.xrm Mon Nov 4 05:32:01 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>
Modified: openoffice/branches/ia2/main/sal/inc/sal/main.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sal/inc/sal/main.h?rev=1538508&r1=1538507&r2=1538508&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sal/inc/sal/main.h (original)
+++ openoffice/branches/ia2/main/sal/inc/sal/main.h Mon Nov 4 05:32:01 2013
@@ -33,6 +33,24 @@ extern "C" {
void SAL_CALL sal_detail_initialize(int argc, char ** argv);
void SAL_CALL sal_detail_deinitialize();
+#ifdef SAL_OS2
+#include <string.h>
+
+#define INCL_DOSPROCESS
+#define INCL_DOSEXCEPTIONS
+#define INCL_DOSMODULEMGR
+#include <os2.h>
+#define INCL_LOADEXCEPTQ
+#include <exceptq.h>
+
+#define sal_detail_initialize(a,b) \
+ EXCEPTIONREGISTRATIONRECORD exRegRec = {0}; \
+ LoadExceptq(&exRegRec, NULL, NULL); \
+ osl_setCommandArgs(argc, argv);
+#define sal_detail_deinitialize() \
+ UninstallExceptq(&exRegRec);
+#endif // SAL_OS2
+
#define SAL_MAIN_WITH_ARGS_IMPL \
int SAL_CALL main(int argc, char ** argv) \
{ \
Modified: openoffice/branches/ia2/main/sal/osl/os2/salinit.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sal/osl/os2/salinit.cxx?rev=1538508&r1=1538507&r2=1538508&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sal/osl/os2/salinit.cxx (original)
+++ openoffice/branches/ia2/main/sal/osl/os2/salinit.cxx Mon Nov 4 05:32:01 2013
@@ -19,99 +19,29 @@
*
*************************************************************/
+#include <stdio.h>
-
-#define INCL_DOS
-#include <os2.h>
-
-#include "precompiled_sal.hxx"
-#include "sal/config.h"
-
-#include "osl/process.h"
-#include "sal/main.h"
#include "sal/types.h"
-// for exception logging
-#include <stdio.h>
-#include <string.h>
-#include <setjmp.h>
-
+#ifdef __cplusplus
extern "C" {
+#endif
/*----------------------------------------------------------------------------*/
-static CHAR szOOoExe[CCHMAXPATH];
-
-static FILE* APIENTRY _oslExceptOpenLogFile(VOID)
-{
- FILE *file;
- DATETIME DT;
- PPIB pib;
- PSZ slash;
-
- // get executable fullpath
- DosGetInfoBlocks(NULL, &pib);
- DosQueryModuleName(pib->pib_hmte, sizeof(szOOoExe), szOOoExe);
- // truncate to exe name
- slash = (PSZ)strrchr( szOOoExe, '.');
- *slash = '\0';
- // make log path
- strcat( szOOoExe, ".log");
-
- file = fopen( szOOoExe, "a");
- if (!file) { // e.g. readonly drive
- // try again, usually C exist and is writable
- file = fopen( "c:\\OOo.log", "a");
- }
- if (file) {
- DosGetDateTime(&DT);
- fprintf(file, "\nTrap message -- Date: %04d-%02d-%02d, Time: %02d:%02d:%02d\n",
- DT.year, DT.month, DT.day,
- DT.hours, DT.minutes, DT.seconds);
- fprintf(file, "-------------------------------------------------------\n"
- "\nAn internal error occurred (Built " __DATE__ "-" __TIME__ ").\n");
-
- }
-
- // ok, return handle
- return (file);
-}
-
-/*----------------------------------------------------------------------------*/
-
-#if 0 // until exceptions restored OSL_DEBUG_LEVEL == 0
-static EXCEPTSTRUCT g_excptstruct = {0};
-#endif
-
+// replaced by macros in sal/main.h
void SAL_CALL sal_detail_initialize(int argc, char ** argv)
{
- APIRET rc = -1;
-
-#if 0 // until exceptions restored OSL_DEBUG_LEVEL == 0
- excRegisterHooks(_oslExceptOpenLogFile, NULL, NULL, FALSE);
-
- g_excptstruct.RegRec2.pfnHandler = (PFN)excHandlerLoud;
- g_excptstruct.arc = DosSetExceptionHandler(
- (PEXCEPTIONREGISTRATIONRECORD)&(g_excptstruct.RegRec2));
-
- if (g_excptstruct.arc)
- if (G_pfnExcHookError)
- G_pfnExcHookError(__FILE__, __LINE__, __FUNCTION__, g_excptstruct.arc);
- else
- DosBeep(1000, 1000);
- g_excptstruct.ulExcpt = setjmp(g_excptstruct.RegRec2.jmpThread);
-#endif
-
- osl_setCommandArgs(argc, argv);
+ printf("Dead code\n");
+ exit(1);
}
void SAL_CALL sal_detail_deinitialize()
{
- APIRET rc = -1;
-
-#if 0 // until exceptions restored OSL_DEBUG_LEVEL == 0
- rc = DosUnsetExceptionHandler((PEXCEPTIONREGISTRATIONRECORD)&(g_excptstruct.RegRec2));
-#endif
+ printf("Dead code\n");
+ exit(1);
}
-}
+#ifdef __cplusplus
+} // extern "C"
+#endif
Modified: openoffice/branches/ia2/main/sal/osl/os2/thread.c
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sal/osl/os2/thread.c?rev=1538508&r1=1538507&r2=1538508&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sal/osl/os2/thread.c (original)
+++ openoffice/branches/ia2/main/sal/osl/os2/thread.c Mon Nov 4 05:32:01 2013
@@ -30,6 +30,13 @@
#include <rtl/alloc.h>
#include <rtl/tencinfo.h>
+#define INCL_DOSPROCESS
+#define INCL_DOSEXCEPTIONS
+#define INCL_DOSMODULEMGR
+#include <os2.h>
+#define INCL_LOADEXCEPTQ
+#include <exceptq.h>
+
/*
Thread-data structure hidden behind oslThread:
*/
@@ -93,6 +100,8 @@ static void oslWorkerWrapperFunction(voi
{
BOOL rc;
osl_TThreadImpl* pThreadImpl= (osl_TThreadImpl*)pData;
+ EXCEPTIONREGISTRATIONRECORD exRegRec = {0};
+ LoadExceptq(&exRegRec, NULL, NULL);
#if OSL_DEBUG_LEVEL>0
printf("oslWorkerWrapperFunction pThreadImpl %x, pThreadImpl->m_ThreadId %d\n", pThreadImpl, pThreadImpl->m_ThreadId);
@@ -122,6 +131,9 @@ printf("pThreadImpl->m_ThreadId %d, abou
rc = WinTerminate( pThreadImpl->m_hab );
#if OSL_DEBUG_LEVEL>0
printf("pThreadImpl->m_ThreadId %d, WinTerminate rc=%d (should be 1)\n", pThreadImpl->m_ThreadId, rc);
+
+ UninstallExceptq(&exRegRec);
+
#endif
}
Modified: openoffice/branches/ia2/main/sc/source/ui/app/transobj.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/ui/app/transobj.cxx?rev=1538508&r1=1538507&r2=1538508&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/ui/app/transobj.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/ui/app/transobj.cxx Mon Nov 4 05:32:01 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/ia2/main/sc/source/ui/inc/transobj.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/ui/inc/transobj.hxx?rev=1538508&r1=1538507&r2=1538508&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/ui/inc/transobj.hxx (original)
+++ openoffice/branches/ia2/main/sc/source/ui/inc/transobj.hxx Mon Nov 4 05:32:01 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,