misc/openoffice3/patches/patch-toolkit_inc_toolkit_helper_servicenames.hxx

   1 $NetBSD$
   2
   3 --- toolkit/inc/toolkit/helper/servicenames.hxx.orig    2013-03-30 22:15:11.000000000 +0000
   4 +++ toolkit/inc/toolkit/helper/servicenames.hxx
   5 @@ -34,73 +34,73 @@
   6  #include <sal/types.h>
   7  #include <tools/solar.h>
   8
   9 -extern const sal_Char __FAR_DATA szServiceName_Toolkit[], szServiceName2_Toolkit[];
  10 -extern const sal_Char __FAR_DATA szServiceName_MVCIntrospection[], szServiceName2_MVCIntrospection[];
  11 -extern const sal_Char __FAR_DATA szServiceName_PopupMenu[], szServiceName2_PopupMenu[];
  12 -extern const sal_Char __FAR_DATA szServiceName_MenuBar[], szServiceName2_MenuBar[];
  13 -extern const sal_Char __FAR_DATA szServiceName_Pointer[], szServiceName2_Pointer[];
  14 -extern const sal_Char __FAR_DATA szServiceName_UnoControlContainer[], szServiceName2_UnoControlContainer[];
  15 -extern const sal_Char __FAR_DATA szServiceName_UnoControlContainerModel[], szServiceName2_UnoControlContainerModel[];
  16 -extern const sal_Char __FAR_DATA szServiceName_TabController[], szServiceName2_TabController[];
  17 -extern const sal_Char __FAR_DATA szServiceName_TabControllerModel[], szServiceName2_TabControllerModel[];
  18 -extern const sal_Char __FAR_DATA szServiceName_UnoControlDialog[], szServiceName2_UnoControlDialog[];
  19 -extern const sal_Char __FAR_DATA szServiceName_UnoControlDialogModel[], szServiceName2_UnoControlDialogModel[];
  20 -extern const sal_Char __FAR_DATA szServiceName_UnoControlEdit[], szServiceName2_UnoControlEdit[];
  21 -extern const sal_Char __FAR_DATA szServiceName_UnoControlEditModel[], szServiceName2_UnoControlEditModel[];
  22 -extern const sal_Char __FAR_DATA szServiceName_UnoControlFileControl[], szServiceName2_UnoControlFileControl[];
  23 -extern const sal_Char __FAR_DATA szServiceName_UnoControlFileControlModel[], szServiceName2_UnoControlFileControlModel[];
  24 -extern const sal_Char __FAR_DATA szServiceName_UnoControlButton[], szServiceName2_UnoControlButton[];
  25 -extern const sal_Char __FAR_DATA szServiceName_UnoControlButtonModel[], szServiceName2_UnoControlButtonModel[];
  26 -extern const sal_Char __FAR_DATA szServiceName_UnoControlImageButton[], szServiceName2_UnoControlImageButton[];
  27 -extern const sal_Char __FAR_DATA szServiceName_UnoControlImageButtonModel[], szServiceName2_UnoControlImageButtonModel[];
  28 -extern const sal_Char __FAR_DATA szServiceName_UnoControlImageControl[], szServiceName2_UnoControlImageControl[];
  29 -extern const sal_Char __FAR_DATA szServiceName_UnoControlImageControlModel[], szServiceName2_UnoControlImageControlModel[];
  30 -extern const sal_Char __FAR_DATA szServiceName_UnoControlRadioButton[], szServiceName2_UnoControlRadioButton[];
  31 -extern const sal_Char __FAR_DATA szServiceName_UnoControlRadioButtonModel[], szServiceName2_UnoControlRadioButtonModel[];
  32 -extern const sal_Char __FAR_DATA szServiceName_UnoControlCheckBox[], szServiceName2_UnoControlCheckBox[];
  33 -extern const sal_Char __FAR_DATA szServiceName_UnoControlCheckBoxModel[], szServiceName2_UnoControlCheckBoxModel[];
  34 -extern const sal_Char __FAR_DATA szServiceName_UnoControlListBox[], szServiceName2_UnoControlListBox[];
  35 -extern const sal_Char __FAR_DATA szServiceName_UnoControlListBoxModel[], szServiceName2_UnoControlListBoxModel[];
  36 -extern const sal_Char __FAR_DATA szServiceName_UnoControlComboBox[], szServiceName2_UnoControlComboBox[];
  37 -extern const sal_Char __FAR_DATA szServiceName_UnoControlComboBoxModel[], szServiceName2_UnoControlComboBoxModel[];
  38 -extern const sal_Char __FAR_DATA szServiceName_UnoControlFixedText[], szServiceName2_UnoControlFixedText[];
  39 -extern const sal_Char __FAR_DATA szServiceName_UnoControlFixedTextModel[], szServiceName2_UnoControlFixedTextModel[];
  40 -extern const sal_Char __FAR_DATA szServiceName_UnoControlGroupBox[], szServiceName2_UnoControlGroupBox[];
  41 -extern const sal_Char __FAR_DATA szServiceName_UnoControlGroupBoxModel[], szServiceName2_UnoControlGroupBoxModel[];
  42 -extern const sal_Char __FAR_DATA szServiceName_UnoControlDateField[], szServiceName2_UnoControlDateField[];
  43 -extern const sal_Char __FAR_DATA szServiceName_UnoControlDateFieldModel[], szServiceName2_UnoControlDateFieldModel[];
  44 -extern const sal_Char __FAR_DATA szServiceName_UnoControlTimeField[], szServiceName2_UnoControlTimeField[];
  45 -extern const sal_Char __FAR_DATA szServiceName_UnoControlTimeFieldModel[], szServiceName2_UnoControlTimeFieldModel[];
  46 -extern const sal_Char __FAR_DATA szServiceName_UnoControlNumericField[], szServiceName2_UnoControlNumericField[];
  47 -extern const sal_Char __FAR_DATA szServiceName_UnoControlNumericFieldModel[], szServiceName2_UnoControlNumericFieldModel[];
  48 -extern const sal_Char __FAR_DATA szServiceName_UnoControlCurrencyField[], szServiceName2_UnoControlCurrencyField[];
  49 -extern const sal_Char __FAR_DATA szServiceName_UnoControlCurrencyFieldModel[], szServiceName2_UnoControlCurrencyFieldModel[];
  50 -extern const sal_Char __FAR_DATA szServiceName_UnoControlPatternField[], szServiceName2_UnoControlPatternField[];
  51 -extern const sal_Char __FAR_DATA szServiceName_UnoControlPatternFieldModel[], szServiceName2_UnoControlPatternFieldModel[];
  52 -extern const sal_Char __FAR_DATA szServiceName_UnoControlFormattedField[], szServiceName2_UnoControlFormattedField[];
  53 -extern const sal_Char __FAR_DATA szServiceName_UnoControlFormattedFieldModel[], szServiceName2_UnoControlFormattedFieldModel[];
  54 -extern const sal_Char __FAR_DATA szServiceName_UnoControlProgressBar[], szServiceName2_UnoControlProgressBar[];
  55 -extern const sal_Char __FAR_DATA szServiceName_UnoControlProgressBarModel[], szServiceName2_UnoControlProgressBarModel[];
  56 -extern const sal_Char __FAR_DATA szServiceName_UnoControlScrollBar[], szServiceName2_UnoControlScrollBar[];
  57 -extern const sal_Char __FAR_DATA szServiceName_UnoControlScrollBarModel[], szServiceName2_UnoControlScrollBarModel[];
  58 -extern const sal_Char __FAR_DATA szServiceName_UnoControlFixedLine[], szServiceName2_UnoControlFixedLine[];
  59 -extern const sal_Char __FAR_DATA szServiceName_UnoControlFixedLineModel[], szServiceName2_UnoControlFixedLineModel[];
  60 -extern const sal_Char __FAR_DATA szServiceName_PrinterServer[], szServiceName2_PrinterServer[];
  61 -extern const sal_Char __FAR_DATA szServiceName_UnoControlRoadmap[], szServiceName2_UnoControlRoadmap[];
  62 -extern const sal_Char __FAR_DATA szServiceName_UnoControlRoadmapModel[], szServiceName2_UnoControlRoadmapModel[];
  63 -
  64 -extern const sal_Char __FAR_DATA szServiceName_UnoSpinButtonControl[], szServiceName_UnoSpinButtonModel[];
  65 -
  66 -extern const sal_Char __FAR_DATA szServiceName_TreeControl[];
  67 -extern const sal_Char __FAR_DATA szServiceName_TreeControlModel[];
  68 -extern const sal_Char __FAR_DATA szServiceName_MutableTreeDataModel[];
  69 -
  70 -extern const sal_Char __FAR_DATA szServiceName_UnoSimpleAnimationControl[], szServiceName_UnoSimpleAnimationControlModel[];
  71 -extern const sal_Char __FAR_DATA szServiceName_UnoThrobberControl[], szServiceName_UnoThrobberControlModel[];
  72 -extern const sal_Char __FAR_DATA szServiceName_UnoControlFixedHyperlink[], szServiceName_UnoControlFixedHyperlinkModel[];
  73 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_Toolkit[], szServiceName2_Toolkit[];
  74 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_MVCIntrospection[], szServiceName2_MVCIntrospection[];
  75 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_PopupMenu[], szServiceName2_PopupMenu[];
  76 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_MenuBar[], szServiceName2_MenuBar[];
  77 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_Pointer[], szServiceName2_Pointer[];
  78 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlContainer[], szServiceName2_UnoControlContainer[];
  79 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlContainerModel[], szServiceName2_UnoControlContainerModel[];
  80 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_TabController[], szServiceName2_TabController[];
  81 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_TabControllerModel[], szServiceName2_TabControllerModel[];
  82 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlDialog[], szServiceName2_UnoControlDialog[];
  83 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlDialogModel[], szServiceName2_UnoControlDialogModel[];
  84 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlEdit[], szServiceName2_UnoControlEdit[];
  85 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlEditModel[], szServiceName2_UnoControlEditModel[];
  86 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlFileControl[], szServiceName2_UnoControlFileControl[];
  87 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlFileControlModel[], szServiceName2_UnoControlFileControlModel[];
  88 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlButton[], szServiceName2_UnoControlButton[];
  89 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlButtonModel[], szServiceName2_UnoControlButtonModel[];
  90 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlImageButton[], szServiceName2_UnoControlImageButton[];
  91 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlImageButtonModel[], szServiceName2_UnoControlImageButtonModel[];
  92 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlImageControl[], szServiceName2_UnoControlImageControl[];
  93 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlImageControlModel[], szServiceName2_UnoControlImageControlModel[];
  94 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlRadioButton[], szServiceName2_UnoControlRadioButton[];
  95 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlRadioButtonModel[], szServiceName2_UnoControlRadioButtonModel[];
  96 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlCheckBox[], szServiceName2_UnoControlCheckBox[];
  97 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlCheckBoxModel[], szServiceName2_UnoControlCheckBoxModel[];
  98 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlListBox[], szServiceName2_UnoControlListBox[];
  99 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlListBoxModel[], szServiceName2_UnoControlListBoxModel[];
 100 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlComboBox[], szServiceName2_UnoControlComboBox[];
 101 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlComboBoxModel[], szServiceName2_UnoControlComboBoxModel[];
 102 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlFixedText[], szServiceName2_UnoControlFixedText[];
 103 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlFixedTextModel[], szServiceName2_UnoControlFixedTextModel[];
 104 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlGroupBox[], szServiceName2_UnoControlGroupBox[];
 105 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlGroupBoxModel[], szServiceName2_UnoControlGroupBoxModel[];
 106 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlDateField[], szServiceName2_UnoControlDateField[];
 107 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlDateFieldModel[], szServiceName2_UnoControlDateFieldModel[];
 108 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlTimeField[], szServiceName2_UnoControlTimeField[];
 109 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlTimeFieldModel[], szServiceName2_UnoControlTimeFieldModel[];
 110 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlNumericField[], szServiceName2_UnoControlNumericField[];
 111 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlNumericFieldModel[], szServiceName2_UnoControlNumericFieldModel[];
 112 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlCurrencyField[], szServiceName2_UnoControlCurrencyField[];
 113 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlCurrencyFieldModel[], szServiceName2_UnoControlCurrencyFieldModel[];
 114 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlPatternField[], szServiceName2_UnoControlPatternField[];
 115 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlPatternFieldModel[], szServiceName2_UnoControlPatternFieldModel[];
 116 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlFormattedField[], szServiceName2_UnoControlFormattedField[];
 117 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlFormattedFieldModel[], szServiceName2_UnoControlFormattedFieldModel[];
 118 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlProgressBar[], szServiceName2_UnoControlProgressBar[];
 119 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlProgressBarModel[], szServiceName2_UnoControlProgressBarModel[];
 120 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlScrollBar[], szServiceName2_UnoControlScrollBar[];
 121 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlScrollBarModel[], szServiceName2_UnoControlScrollBarModel[];
 122 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlFixedLine[], szServiceName2_UnoControlFixedLine[];
 123 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlFixedLineModel[], szServiceName2_UnoControlFixedLineModel[];
 124 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_PrinterServer[], szServiceName2_PrinterServer[];
 125 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlRoadmap[], szServiceName2_UnoControlRoadmap[];
 126 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlRoadmapModel[], szServiceName2_UnoControlRoadmapModel[];
 127 +
 128 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoSpinButtonControl[], szServiceName_UnoSpinButtonModel[];
 129 +
 130 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_TreeControl[];
 131 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_TreeControlModel[];
 132 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_MutableTreeDataModel[];
 133 +
 134 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoSimpleAnimationControl[], szServiceName_UnoSimpleAnimationControlModel[];
 135 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoThrobberControl[], szServiceName_UnoThrobberControlModel[];
 136 +extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlFixedHyperlink[], szServiceName_UnoControlFixedHyperlinkModel[];
 137
 138  // ExtUnoWrapper:
 139 -extern const char __FAR_DATA szServiceName_ImageProducer[], szServiceName2_ImageProducer[];
 140 +extern SAL_DLLPUBLIC_EXPORT const char __FAR_DATA szServiceName_ImageProducer[], szServiceName2_ImageProducer[];
 141
 142
 143