[Libreoffice-commits] .: 2 commits - sw/inc sw/source

[Lubos Lunak]

 sw/inc/docufld.hxx                           |    1 +
 sw/source/filter/ww8/docxattributeoutput.cxx |    8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit c981b302dcd818eb212d666490156c628c7771c0
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Mon Aug 8 14:34:30 2011 +0200

    add SwPostItField::GetDateTime()
    
    it's rather weird to have only access to either date or time, but
    not the whole object

diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index e920fc4..e9bd890 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -532,6 +532,7 @@ public:
     virtual String          Expand() const;
     virtual SwField*        Copy() const;
 
+    inline const DateTime   GetDateTime() const             { return aDateTime; }
     inline const Date       GetDate() const                 { return aDateTime.GetDate(); }
     inline const Time       GetTime() const                 { return aDateTime.GetTime(); }
 
commit f71f962af74ceceb51c6ada5ea616c7cff576c2b
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Mon Aug 8 14:35:25 2011 +0200

    fix crash and fix rtl logic

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 7c08c39..89cbd7c 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3619,12 +3619,12 @@ void DocxAttributeOutput::ParaAdjust( const SvxAdjustItem& rAdjust )
     const SfxItemSet* pItems = GetExport().GetCurItemSet();
     const SvxFrameDirectionItem* rFrameDir = static_cast< const SvxFrameDirectionItem* >( pItems->GetItem( RES_FRAMEDIR ) );
 
-    bool bRtl = false;
-    short nDir = rFrameDir->GetValue();
-    bRtl = ( nDir == FRMDIR_HORI_RIGHT_TOP );
-
+    short nDir = FRMDIR_ENVIRONMENT;
+    if( rFrameDir != NULL )
+        nDir = rFrameDir->GetValue();
     if ( nDir == FRMDIR_ENVIRONMENT )
         nDir = GetExport( ).GetDefaultFrameDirection( );
+    bool bRtl = ( nDir == FRMDIR_HORI_RIGHT_TOP );
 
     switch ( rAdjust.GetAdjust() )
     {