[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 2 commits - patches/dev300

[Tor Lillqvist]

 patches/dev300/fix-ppt-linespacing-import-export.diff |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 53e8b1811c8d8130dab6d7cf7d1079c8d7ac212b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Apr 14 14:49:26 2011 +0300

    Use sal_False/True instead of FALSE/TRUE

diff --git a/patches/dev300/fix-ppt-linespacing-import-export.diff b/patches/dev300/fix-ppt-linespacing-import-export.diff
index 762d06c..0601a8a 100644
--- a/patches/dev300/fix-ppt-linespacing-import-export.diff
+++ b/patches/dev300/fix-ppt-linespacing-import-export.diff
@@ -64,14 +64,14 @@
          {
 +            case ::com::sun::star::style::LineSpacingMode::FIX :
 +                mnLineSpacing = (sal_Int16)(-( aLineSpacing.Height ) );
-+                mbFixedLineSpacing = TRUE;
++                mbFixedLineSpacing = sal_True;
 +                break;
              case ::com::sun::star::style::LineSpacingMode::MINIMUM :
              case ::com::sun::star::style::LineSpacingMode::LEADING :
 -            case ::com::sun::star::style::LineSpacingMode::FIX :
                  mnLineSpacing = (sal_Int16)(-( aLineSpacing.Height ) );
 -            break;
-+                mbFixedLineSpacing = FALSE;
++                mbFixedLineSpacing = sal_False;
 +           break;
  
              case ::com::sun::star::style::LineSpacingMode::PROP :
commit fdc72f27696f9d023068841718a77d408dda80fe
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Apr 14 14:47:52 2011 +0300

    Change USHORT to sal_uInt16

diff --git a/patches/dev300/fix-ppt-linespacing-import-export.diff b/patches/dev300/fix-ppt-linespacing-import-export.diff
index 1d3d6ee..762d06c 100644
--- a/patches/dev300/fix-ppt-linespacing-import-export.diff
+++ b/patches/dev300/fix-ppt-linespacing-import-export.diff
@@ -83,7 +83,7 @@
         AddTabPage( RID_SVXPAGE_TABULATOR );
  }
 +
-+void SdParagraphDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
++void SdParagraphDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
 +{
 +    SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
 +    switch( nId )
@@ -104,7 +104,7 @@
  private:
      const SfxItemSet&	rOutAttrs;
  
-+    virtual void	PageCreated( USHORT nId, SfxTabPage &rPage );
++    virtual void	PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
 +
  public:
                      SdParagraphDlg( Window* pParent, const SfxItemSet* pAttr );