controltextrendering: merge changes from DEV300_m61

13 files changed, 80 insertions, 34 deletions

diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx
index ce2b481bdcdf..a33a1b5cbd81 100644
--- a/svx/inc/galobj.hxx
+++ b/svx/inc/galobj.hxx
@@ -85,7 +85,7 @@ enum GalSoundType
 // - SgaObject -
 // -------------
 
-class SgaObject
+class SVX_DLLPUBLIC SgaObject
 {
     friend class GalleryTheme;
 
@@ -122,8 +122,8 @@ public:
     BOOL                    IsValid() const { return bIsValid; }
     BOOL                    IsThumbBitmap() const { return bIsThumbBmp; }
 
-    SVX_DLLPUBLIC const String          GetTitle() const;
-    SVX_DLLPUBLIC void                  SetTitle( const String& rTitle );
+    const String            GetTitle() const;
+    void                    SetTitle( const String& rTitle );
 
     friend SvStream&        operator<<( SvStream& rOut, const SgaObject& rObj );
     friend SvStream&        operator>>( SvStream& rIn, SgaObject& rObj );
diff --git a/svx/inc/optgenrl.hrc b/svx/inc/optgenrl.hrc
index b6f191aaea07..4c519d5ebb70 100644
--- a/svx/inc/optgenrl.hrc
+++ b/svx/inc/optgenrl.hrc
@@ -63,6 +63,7 @@
 #define ED_EMAIL        38
 #define GB_ADDRESS      39
 #define CB_USEDATA      40
+#define FT_NAME_EASTERN     41
 
 #define STR_US_STATE    10
 #define STR_QUERY_REG   11
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index 1d78c5e6396e..6e6162ef61f2 100644
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -600,6 +600,7 @@
 #define RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIFY  (RID_SVX_START + 223)
 #define RID_SVXSTR_XMLSEC_SIG_NOT_OK        (RID_SVX_START + 224)
 #define RID_SVXSTR_XMLSEC_NO_SIG            (RID_SVX_START + 225)
+#define RID_SVXSTR_XMLSEC_SIG_CERT_OK_PARTIAL_SIG (RID_SVX_START + 226)
 
 // Strings von der Hatch-Tabpage
 #define RID_SVXSTR_WRITE_DATA_ERROR         (RID_SVX_START + 229)
@@ -1238,7 +1239,7 @@
 #define RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION (RID_SVX_START + 1050)
 #define RID_SVXSTR_EVENT_STARTAPP               (RID_SVX_START + 1051)
 #define RID_SVXSTR_EVENT_CLOSEAPP               (RID_SVX_START + 1052)
-#define RID_SVXSTR_EVENT_CREATEDOC              (RID_SVX_START + 1053)
+#define RID_SVXSTR_EVENT_NEWDOC                 (RID_SVX_START + 1053)
 #define RID_SVXSTR_EVENT_CLOSEDOC               (RID_SVX_START + 1054)
 #define RID_SVXSTR_EVENT_PREPARECLOSEDOC        (RID_SVX_START + 1055)
 #define RID_SVXSTR_EVENT_OPENDOC                (RID_SVX_START + 1056)
@@ -1369,9 +1370,28 @@
 #define STR_LINKEDDOC_NO_SYSTEM_FILE                        (RID_SVX_START + 1169)
 #define RID_SVXSTR_EVENT_SUBCOMPONENT_OPENED                (RID_SVX_START + 1170)
 #define RID_SVXSTR_EVENT_SUBCOMPONENT_CLOSED                (RID_SVX_START + 1171)
+
+#define RID_SVXSTR_EVENT_CREATEDOC                          (RID_SVX_START + 1172)
+#define RID_SVXSTR_EVENT_LOADDOCFINISHED                    (RID_SVX_START + 1173)
+#define RID_SVXSTR_EVENT_SAVEDOCFAILED                      (RID_SVX_START + 1174)
+#define RID_SVXSTR_EVENT_SAVEASDOCFAILED                    (RID_SVX_START + 1175)
+#define RID_SVXSTR_EVENT_COPYTODOC                          (RID_SVX_START + 1176)
+#define RID_SVXSTR_EVENT_COPYTODOCDONE                      (RID_SVX_START + 1177)
+#define RID_SVXSTR_EVENT_COPYTODOCFAILED                    (RID_SVX_START + 1178)
+#define RID_SVXSTR_EVENT_VIEWCREATED                        (RID_SVX_START + 1179)
+#define RID_SVXSTR_EVENT_PREPARECLOSEVIEW                   (RID_SVX_START + 1180)
+#define RID_SVXSTR_EVENT_CLOSEVIEW                          (RID_SVX_START + 1181)
+#define RID_SVXSTR_EVENT_TITLECHANGED                       (RID_SVX_START + 1182)
+#define RID_SVXSTR_EVENT_MODECHANGED                        (RID_SVX_START + 1183)
+#define RID_SVXSTR_EVENT_VISAREACHANGED                     (RID_SVX_START + 1184)
+#define RID_SVXSTR_EVENT_STORAGECHANGED                     (RID_SVX_START + 1185)
+#define RID_SVXSTR_EVENT_MAILMERGE_END                      (RID_SVX_START + 1186)
+#define RID_SVXSTR_EVENT_FIELDMERGE                         (RID_SVX_START + 1187)
+#define RID_SVXSTR_EVENT_FIELDMERGE_FINISHED                (RID_SVX_START + 1188)
+#define RID_SVXSTR_EVENT_LAYOUT_FINISHED                    (RID_SVX_START + 1189)
     // if you add here, remember to adjust RID_SVXSTR_NEXTFREE
 
-#define RID_SVXSTR_NEXTFREE                                 (RID_SVX_START + 1172)
+#define RID_SVXSTR_NEXTFREE                                 (RID_SVX_START + 1190)
 
 // ----------------------------------------------------------------------------
 // if we have _a_lot_ time, we should group the resource ids by type, instead
diff --git a/svx/inc/svx/langbox.hxx b/svx/inc/svx/langbox.hxx
index 8aebc88e380e..476d78c53d03 100644
--- a/svx/inc/svx/langbox.hxx
+++ b/svx/inc/svx/langbox.hxx
@@ -78,6 +78,7 @@ private:
 
     SVX_DLLPRIVATE void                    Init();
     SVX_DLLPRIVATE USHORT                  ImplInsertImgEntry( const String& rEntry, USHORT nPos, bool bChecked );
+    SVX_DLLPRIVATE USHORT                  ImplInsertLanguage(LanguageType, USHORT, sal_Int16 );
 
 public:
     SvxLanguageBox( Window* pParent, WinBits nWinStyle, BOOL bCheck = FALSE);
@@ -89,6 +90,7 @@ public:
                             BOOL bCheckSpellAvail = FALSE );
 
     USHORT          InsertLanguage( const LanguageType eLangType, USHORT nPos = LISTBOX_APPEND );
+    USHORT          InsertDefaultLanguage( sal_Int16 nType, USHORT nPos = LISTBOX_APPEND );
     USHORT          InsertLanguage( const LanguageType eLangType,
                             BOOL bCheckEntry, USHORT nPos = LISTBOX_APPEND );
     void            RemoveLanguage( const LanguageType eLangType );
diff --git a/svx/inc/svx/numfmtsh.hxx b/svx/inc/svx/numfmtsh.hxx
index 8e2eb238d3bd..5e6fe3737f94 100644
--- a/svx/inc/svx/numfmtsh.hxx
+++ b/svx/inc/svx/numfmtsh.hxx
@@ -212,8 +212,8 @@ public:
     short               GetListPos4Entry(sal_uInt32 nIdx);
     short               GetListPos4Entry( const String& rFmtString );
 
-    void                GetCurrencySymbols(SvStringsDtor& rList,const XubString& rStrEurope,USHORT* pPos);
-    void                GetCurrencySymbols(SvStringsDtor& rList,const XubString& rStrEurope, BOOL bFlag);
+    void                GetCurrencySymbols( SvStringsDtor& rList, USHORT* pPos );
+    void                GetCurrencySymbols( SvStringsDtor& rList, BOOL bFlag );
 
     USHORT              FindCurrencyTableEntry( const String& rFmtString, BOOL &bTestBanking );
     BOOL                IsInTable(USHORT nPos,BOOL bTmpBanking,const String &rFmtString);
diff --git a/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx b/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx
index e0dcb51e9460..1759eb18d319 100644
--- a/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx
+++ b/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx
@@ -35,6 +35,7 @@
 #include <sal/types.h>
 #include <svx/xenum.hxx>
 #include <svx/outlobj.hxx>
+#include <svx/sdtaitm.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 // predefines
@@ -68,6 +69,10 @@ namespace drawinglayer
             // #i101556# use versioning from text attributes to detect changes
             sal_uInt32                              maPropertiesVersion;
 
+            // text alignments
+            SdrTextHorzAdjust                       maSdrTextHorzAdjust;
+            SdrTextVertAdjust                       maSdrTextVertAdjust;
+
             // bitfield
             unsigned                                mbContour : 1;
             unsigned                                mbFitToSize : 1;
@@ -75,6 +80,7 @@ namespace drawinglayer
             unsigned                                mbBlink : 1;
             unsigned                                mbScroll : 1;
             unsigned                                mbInEditMode : 1;
+            unsigned                                mbFixedCellHeight : 1;
 
         public:
             SdrTextAttribute(
@@ -85,12 +91,15 @@ namespace drawinglayer
                 sal_Int32 aTextUpperDistance,
                 sal_Int32 aTextRightDistance,
                 sal_Int32 aTextLowerDistance,
+                SdrTextHorzAdjust aSdrTextHorzAdjust,
+                SdrTextVertAdjust aSdrTextVertAdjust,
                 bool bContour,
                 bool bFitToSize,
                 bool bHideContour,
                 bool bBlink,
                 bool bScroll,
-                bool bInEditMode);
+                bool bInEditMode,
+                bool bFixedCellHeight);
             ~SdrTextAttribute();
 
             // copy constructor and assigment operator
@@ -109,12 +118,15 @@ namespace drawinglayer
             bool isBlink() const { return mbBlink; }
             bool isScroll() const { return mbScroll; }
             bool isInEditMode() const { return mbInEditMode; }
+            bool isFixedCellHeight() const { return mbFixedCellHeight; }
             const SdrFormTextAttribute* getSdrFormTextAttribute() const { return mpSdrFormTextAttribute; }
             sal_Int32 getTextLeftDistance() const { return maTextLeftDistance; }
             sal_Int32 getTextUpperDistance() const { return maTextUpperDistance; }
             sal_Int32 getTextRightDistance() const { return maTextRightDistance; }
             sal_Int32 getTextLowerDistance() const { return maTextLowerDistance; }
             sal_uInt32 getPropertiesVersion() const { return maPropertiesVersion; }
+            SdrTextHorzAdjust getSdrTextHorzAdjust() const { return maSdrTextHorzAdjust; }
+            SdrTextVertAdjust getSdrTextVertAdjust() const { return maSdrTextVertAdjust; }
 
             // animation timing generation
             void getBlinkTextTiming(drawinglayer::animation::AnimationEntryList& rAnimList) const;
diff --git a/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx b/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx
index 9acc34c8dcc8..23a720467710 100644
--- a/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx
@@ -40,7 +40,7 @@ namespace sdr
 {
     namespace overlay
     {
-        class OverlayAnimatedBitmapEx : public OverlayObjectWithBasePosition
+        class SVX_DLLPUBLIC OverlayAnimatedBitmapEx : public OverlayObjectWithBasePosition
         {
         protected:
             // the Bitmaps
diff --git a/svx/inc/svx/sdr/overlay/overlayselection.hxx b/svx/inc/svx/sdr/overlay/overlayselection.hxx
index fe725a577eec..17f32ee419e9 100644
--- a/svx/inc/svx/sdr/overlay/overlayselection.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayselection.hxx
@@ -78,7 +78,7 @@ namespace sdr
             virtual ~OverlaySelection();
 
             // data read access
-            const OverlayType getOverlayType() const { return meOverlayType; }
+            OverlayType getOverlayType() const { return meOverlayType; }
             const std::vector< basegfx::B2DRange >& getRanges() const { return maRanges; }
             bool getBorder() const { return mbBorder; }
 
diff --git a/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
index 6dd60b45d2d5..132a3ecc2538 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
@@ -40,6 +40,7 @@
 #include <tools/color.hxx>

 #include <svx/sdr/attribute/sdrformtextattribute.hxx>
 #include <tools/weakbase.hxx>
+#include <svx/sdtaitm.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 // predefines
@@ -82,11 +83,6 @@ namespace drawinglayer
             Color                                   maLastTextBackgroundColor;
 
             // bitfield
-            // remember if last decomposition was with or without spell checker. In this special
-            // case the get2DDecomposition implementation has to take care of this aspect. This is
-            // needed since different views do different text decompositons regarding spell checking.
-            unsigned                                mbLastSpellCheck : 1;
-
             // is there a PageNumber, Header, Footer or DateTimeField used? Evaluated at construction
             unsigned                                mbContainsPageField : 1;
             unsigned                                mbContainsPageCountField : 1;
@@ -96,9 +92,6 @@ namespace drawinglayer
             // support for XTEXT_PAINTSHAPE_BEGIN/XTEXT_PAINTSHAPE_END Metafile comments
             Primitive2DSequence encapsulateWithTextHierarchyBlockPrimitive2D(const Primitive2DSequence& rCandidate) const;
 
-            bool getLastSpellCheck() const { return (bool)mbLastSpellCheck; }
-            void setLastSpellCheck(bool bNew) { mbLastSpellCheck = bNew; }
-
         public:
             SdrTextPrimitive2D(
                 const SdrText* pSdrText,
@@ -217,7 +210,12 @@ namespace drawinglayer
             // text range transformation from unit range ([0.0 .. 1.0]) to text range
             basegfx::B2DHomMatrix                   maTextRangeTransform;
 
+            // text alignments
+            SdrTextHorzAdjust                       maSdrTextHorzAdjust;
+            SdrTextVertAdjust                       maSdrTextVertAdjust;
+
             // bitfield
+            unsigned                                mbFixedCellHeight : 1;
             unsigned                                mbUnlimitedPage : 1;    // force layout with no text break
             unsigned                                mbCellText : 1;         // this is a cell text as block text
             unsigned                                mbWordWrap : 1;         // for CustomShapes text layout
@@ -231,12 +229,18 @@ namespace drawinglayer
                 const SdrText* pSdrText,
                 const OutlinerParaObject& rOutlinerParaObjectPtr,
                 const basegfx::B2DHomMatrix& rTextRangeTransform,
+                SdrTextHorzAdjust aSdrTextHorzAdjust,
+                SdrTextVertAdjust aSdrTextVertAdjust,
+                bool bFixedCellHeight,
                 bool bUnlimitedPage,
                 bool bCellText,
                 bool bWordWrap);
 
             // get data
             const basegfx::B2DHomMatrix& getTextRangeTransform() const { return maTextRangeTransform; }
+            SdrTextHorzAdjust getSdrTextHorzAdjust() const { return maSdrTextHorzAdjust; }
+            SdrTextVertAdjust getSdrTextVertAdjust() const { return maSdrTextVertAdjust; }
+            bool isFixedCellHeight() const { return mbFixedCellHeight; }
             bool getUnlimitedPage() const { return mbUnlimitedPage; }
             bool getCellText() const { return mbCellText; }
             bool getWordWrap() const { return mbWordWrap; }
@@ -265,6 +269,9 @@ namespace drawinglayer
             // text range transformation from unit range ([0.0 .. 1.0]) to text range
             basegfx::B2DHomMatrix                   maTextRangeTransform;
 
+            // bitfield
+            unsigned                                mbFixedCellHeight : 1;
+
         protected:
             // local decomposition.
             virtual Primitive2DSequence createLocalDecomposition(const geometry::ViewInformation2D& aViewInformation) const;
@@ -273,10 +280,12 @@ namespace drawinglayer
             SdrStretchTextPrimitive2D(
                 const SdrText* pSdrText,
                 const OutlinerParaObject& rOutlinerParaObjectPtr,
-                const basegfx::B2DHomMatrix& rTextRangeTransform);
+                const basegfx::B2DHomMatrix& rTextRangeTransform,
+                bool bFixedCellHeight);
 
             // get data
             const basegfx::B2DHomMatrix& getTextRangeTransform() const { return maTextRangeTransform; }
+            bool isFixedCellHeight() const { return mbFixedCellHeight; }
 
             // compare operator
             virtual bool operator==(const BasePrimitive2D& rPrimitive) const;
diff --git a/svx/inc/svx/svdfppt.hxx b/svx/inc/svx/svdfppt.hxx
index 5a73bea5052f..63f196876e93 100644
--- a/svx/inc/svx/svdfppt.hxx
+++ b/svx/inc/svx/svdfppt.hxx
@@ -1337,6 +1337,8 @@ class PPTConvertOCXControls : public SvxMSConvertOCXControls
 
 #define PPT_PST_NewlyAddedAtomByXP11008     11008
 #define PPT_PST_NewlyAddedAtomByXP11010     11010
+#define PPT_PST_Comment10                   12000
+#define PPT_PST_CommentAtom10               12001
 #define PPT_PST_NewlyAddedAtomByXP12004     12004
 #define PPT_PST_NewlyAddedAtomByXP12010     12010
 #define PPT_PST_NewlyAddedAtomByXP12011     12011
diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx
index 11d400b85b8a..4960323feeb7 100644
--- a/svx/inc/svx/svdhdl.hxx
+++ b/svx/inc/svx/svdhdl.hxx
@@ -58,7 +58,6 @@ class SdrHdlList;
 class SdrMarkView;
 class SdrObject;
 class SdrPageView;
-class SdrHdlBitmapSet;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -155,12 +154,6 @@ class SVX_DLLPUBLIC SdrHdl
     friend class                SdrMarkView; // fuer den Zugriff auf nObjHdlNum
     friend class                SdrHdlList;
 
-    static SdrHdlBitmapSet*     pSimpleSet;
-    static SdrHdlBitmapSet*     pModernSet;
-
-    // #101928#
-    static SdrHdlBitmapSet*     pHighContrastSet;
-
     // #101928#
     BitmapEx ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd, sal_Bool bFine, sal_Bool bIsHighContrast);
 
diff --git a/svx/inc/svx/svdotext.hxx b/svx/inc/svx/svdotext.hxx
index 5298fc2dd79b..6ffa4ab5bd22 100644
--- a/svx/inc/svx/svdotext.hxx
+++ b/svx/inc/svx/svdotext.hxx
@@ -575,20 +575,19 @@ public:
 public:
     //////////////////////////////////////////////////////////////////////////////
     // text primitive decomposition helpers
-    bool impCheckSpellCheckForDecomposeTextPrimitive() const;
-    bool impDecomposeContourTextPrimitive(
+    void impDecomposeContourTextPrimitive(
         drawinglayer::primitive2d::Primitive2DSequence& rTarget,
         const drawinglayer::primitive2d::SdrContourTextPrimitive2D& rSdrContourTextPrimitive,
         const drawinglayer::geometry::ViewInformation2D& aViewInformation) const;
-    bool impDecomposePathTextPrimitive(
+    void impDecomposePathTextPrimitive(
         drawinglayer::primitive2d::Primitive2DSequence& rTarget,
         const drawinglayer::primitive2d::SdrPathTextPrimitive2D& rSdrPathTextPrimitive,
         const drawinglayer::geometry::ViewInformation2D& aViewInformation) const;
-    bool impDecomposeBlockTextPrimitive(
+    void impDecomposeBlockTextPrimitive(
         drawinglayer::primitive2d::Primitive2DSequence& rTarget,
         const drawinglayer::primitive2d::SdrBlockTextPrimitive2D& rSdrBlockTextPrimitive,
         const drawinglayer::geometry::ViewInformation2D& aViewInformation) const;
-    bool impDecomposeStretchTextPrimitive(
+    void impDecomposeStretchTextPrimitive(
         drawinglayer::primitive2d::Primitive2DSequence& rTarget,
         const drawinglayer::primitive2d::SdrStretchTextPrimitive2D& rSdrStretchTextPrimitive,
         const drawinglayer::geometry::ViewInformation2D& aViewInformation) const;
diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc
index 6019c3590d55..4e3b1ebf4889 100644
--- a/svx/inc/svx/svxids.hrc
+++ b/svx/inc/svx/svxids.hrc
@@ -377,7 +377,6 @@
 #define SID_FRAME_UP            (SID_SC_START + 407)
 #define SID_FRAME_DOWN          (SID_SC_START + 408)
 #define SID_ENTER_STRING        (SID_SC_START + 476)
-#define SID_INSERT_POSTIT       (SID_SC_START + 276)
 #define SID_ATTR_SECIALCHAR     (SID_SC_START + 581)
 #define SID_ATTR_SPECIALCHAR    (SID_SC_START + 581)
 
@@ -1178,7 +1177,6 @@
 #define SID_ATTR_CHAR_WIDTH_FIT_TO_LINE                 ( SID_SVX_START + 919 )
 #define SID_ATTR_CHAR_RELIEF                            ( SID_SVX_START + 920 )
 #define SID_LANGUAGE_OPTIONS                            ( SID_SVX_START + 921 )
-#define SID_CLIPBOARD_FORMAT_ITEMS                      ( SID_SVX_START + 922 )
 #define SID_GETUNDOSTRINGS                              ( SID_SVX_START + 923 )
 #define SID_GETREDOSTRINGS                              ( SID_SVX_START + 924 )
 #define SID_PARA_VERTALIGN                              ( SID_SVX_START + 925 )
@@ -1351,9 +1349,19 @@
 #define SID_CHAR_DLG_PREVIEW_STRING                     (SID_SVX_START+1090)
 #define SID_RECHECK_DOCUMENT                            (SID_SVX_START+1091)
 #define SID_ATTR_PARA_OUTLINE_LEVEL                     (SID_SVX_START+1092)
+#define SID_OBJECT_MIRROR                               (SID_SVX_START+1093)
+
+#define SID_DELETE_POSTIT                               (SID_SVX_START+1094)
+#define SID_NEXT_POSTIT                                 (SID_SVX_START+1095)
+#define SID_PREVIOUS_POSTIT                             (SID_SVX_START+1096)
+#define SID_DELETEALL_POSTIT                            (SID_SVX_START+1097)
+#define SID_SHOW_POSTIT                                 (SID_SVX_START+1098)
+#define SID_REPLYTO_POSTIT                              (SID_SVX_START+1099)
+#define SID_DELETEALLBYAUTHOR_POSTIT                    (SID_SVX_START+1100)
+#define SID_INSERT_POSTIT                               (SID_SVX_START+1101)
 
 // IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
-#define SID_SVX_FIRSTFREE                               SID_ATTR_PARA_OUTLINE_LEVEL + 1
+#define SID_SVX_FIRSTFREE                               SID_INSERT_POSTIT + 1
 
 // --------------------------------------------------------------------------
 // Overflow check for slot IDs