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

[Zolnai Tamás]

 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 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 8d4233300a39fc755541166071033f89c33165d0
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Sat Oct 25 22:59:17 2014 +0200

    Revert "sdsd", which was commited accidentally
    
    This reverts commit 7decc84c47caaec8c37b22b2d0fcf76015b528f4.

diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 8117d4d..b869896 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(bool bSwapIn = true) const; ///< @return a graphic for all Flys!
+    Graphic GetIMapGraphic() 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 2b804ea..c59b59c 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(bool bSwapIn) const
+Graphic SwEditShell::GetIMapGraphic() const
 {
     // returns always a graphic if the cursor is in a Fly
     SET_CURR_SHELL( (SwViewShell*)this );
@@ -612,8 +612,8 @@ Graphic SwEditShell::GetIMapGraphic(bool bSwapIn) const
         {
             SwGrfNode & rGrfNode(static_cast<SwGrfNode&>(rNd));
             const Graphic& rGrf = rGrfNode.GetGrf();
-            if( bSwapIn && (rGrf.IsSwapOut() || ( rGrfNode.IsLinkedFile() &&
-                                    GRAPHIC_DEFAULT == rGrf.GetType() ) ) )
+            if( 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 ba6b6b1..9d0b32a 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(false).GetType() ))
+                            pWrtSh->GetIMapGraphic().GetType() ))
                 bShowCB = true;
         }
         if( bShowCB )
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 5ae0875..2206bf5 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(false).GetType();
+                            bDisable = GRAPHIC_NONE == rSh.GetIMapGraphic().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(false).GetType();
+                                        GRAPHIC_NONE == rSh.GetIMapGraphic().GetType();
                                 }
                             }
                             bSet = bDisable ? sal_False : rWrap.IsContour();