[Libreoffice-commits] core.git: Branch 'feature/gltf_improvements' - 2 commits - download.lst sw/inc sw/source

[Zolnai Tamás]

 download.lst                       |    4 ++--
 sw/inc/editsh.hxx                  |    2 +-
 sw/source/core/edit/editsh.cxx     |    6 +++---
 sw/source/ui/frmdlg/wrap.cxx       |    2 +-
 sw/source/uibase/shells/basesh.cxx |    4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit e5f5059128b6c254f78eb693e23433a009f993e0
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Sat Oct 25 22:52:41 2014 +0200

    Update libgltf tarball (commit: f3940c73cc0cc43981)
    
    Change-Id: I05d69b9952bcb962955a39558e7623bfeb1ac6b5

diff --git a/download.lst b/download.lst
index 6a0ec30..92807b2 100644
--- a/download.lst
+++ b/download.lst
@@ -89,8 +89,8 @@ export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip
 export LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548
 export LIBEOT_TARBALL := libeot-0.01.tar.bz2
 export LIBEXTTEXTCAT_TARBALL := 10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2
-export LIBGLTF_MD5SUM := 1c775bf3790c5a2911711445ad160972
-export LIBGLTF_TARBALL := libgltf-master-0e457b128781f96f649e56e7e46d2496436f07e8.tar.bz2
+export LIBGLTF_MD5SUM := 500befbfa0d26c90564e2126e563b51f
+export LIBGLTF_TARBALL := libgltf-master-f3940c73cc0cc43981eb95ea75b23263671f15e6.tar.bz2
 export LIBLANGTAG_TARBALL := 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
 export LIBXMLSEC_TARBALL := 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 export LIBXML_TARBALL := 9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz
commit 7decc84c47caaec8c37b22b2d0fcf76015b528f4
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Fri Oct 10 16:49:47 2014 +0200

    sdsd
    
    Change-Id: I0066e7ffff216e02c75561844650127c3d866c10

diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index b869896..8117d4d 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -619,7 +619,7 @@ public:
 
     // #i73788#
     /// Remove default parameter, because method always called this default value.
-    Graphic GetIMapGraphic() const; ///< @return a graphic for all Flys!
+    Graphic GetIMapGraphic(bool bSwapIn = true) const; ///< @return a graphic for all Flys!
     const SwFlyFrmFmt* FindFlyByName( const OUString& rName, sal_uInt8 nNdTyp = 0 ) const;
 
     /** @return a ClientObject, if CurCrsr->Point() points to a SwOLENode
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index c59b59c..2b804ea 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -599,7 +599,7 @@ void *SwEditShell::GetIMapInventor() const
 }
 
 // #i73788#
-Graphic SwEditShell::GetIMapGraphic() const
+Graphic SwEditShell::GetIMapGraphic(bool bSwapIn) const
 {
     // returns always a graphic if the cursor is in a Fly
     SET_CURR_SHELL( (SwViewShell*)this );
@@ -612,8 +612,8 @@ Graphic SwEditShell::GetIMapGraphic() const
         {
             SwGrfNode & rGrfNode(static_cast<SwGrfNode&>(rNd));
             const Graphic& rGrf = rGrfNode.GetGrf();
-            if( rGrf.IsSwapOut() || ( rGrfNode.IsLinkedFile() &&
-                                    GRAPHIC_DEFAULT == rGrf.GetType() ) )
+            if( bSwapIn && (rGrf.IsSwapOut() || ( rGrfNode.IsLinkedFile() &&
+                                    GRAPHIC_DEFAULT == rGrf.GetType() ) ) )
             {
                 bool const bResult = rGrfNode.SwapIn(true);
                 OSL_ENSURE(bResult, "Graphic could not be loaded" );
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index 9d0b32a..ba6b6b1 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -159,7 +159,7 @@ void SwWrapTabPage::Reset(const SfxItemSet *rSet)
             int nSelType = pWrtSh->GetSelectionType();
             if( ( nSelType & nsSelectionType::SEL_GRF ) ||
                 ( nSelType & nsSelectionType::SEL_OLE && GRAPHIC_NONE !=
-                            pWrtSh->GetIMapGraphic().GetType() ))
+                            pWrtSh->GetIMapGraphic(false).GetType() ))
                 bShowCB = true;
         }
         if( bShowCB )
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 2206bf5..5ae0875 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -1509,7 +1509,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
                         if ( nSel & nsSelectionType::SEL_GRF )
                             bDisable = GRAPHIC_NONE == rSh.GetGraphicType();
                         else
-                            bDisable = GRAPHIC_NONE == rSh.GetIMapGraphic().GetType();
+                            bDisable = GRAPHIC_NONE == rSh.GetIMapGraphic(false).GetType();
                     }
 
                     if( bDisable )
@@ -1695,7 +1695,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
                                     // #i102253# applied patch from OD (see task)
                                     bDisable =
                                         nSel & nsSelectionType::SEL_FRM ||
-                                        GRAPHIC_NONE == rSh.GetIMapGraphic().GetType();
+                                        GRAPHIC_NONE == rSh.GetIMapGraphic(false).GetType();
                                 }
                             }
                             bSet = bDisable ? sal_False : rWrap.IsContour();