[ooo-build-commit] .: sw/source

Jan Holesovsky kendy at kemper.freedesktop.org
Thu Aug 26 07:25:41 PDT 2010


 sw/source/ui/uiview/view2.cxx |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit e0b0ca314f460e0bf278d93f2c166866e0bdee47
Author: Thorsten Behrens <thb at openoffice.org>
Date:   Wed Aug 25 22:54:38 2010 +0200

    linkwarn-dlg-in-apps.diff: Wire up link warning dlg in applications.
    
    n#348149

diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 224ab55..dbabf2b 100755
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -48,6 +48,7 @@
 #include <caption.hxx>
 #include <svl/PasswordHelper.hxx>
 #include <svl/urihelper.hxx>
+#include <svtools/miscopt.hxx>
 #include <sfx2/passwd.hxx>
 #include <sfx2/sfxdlg.hxx>
 #include <sfx2/filedlghelper.hxx>
@@ -56,6 +57,7 @@
 #include <svx/viewlayoutitem.hxx>
 #include <svx/zoomslideritem.hxx>
 #include <svtools/xwindowitem.hxx>
+#include <svx/linkwarn.hxx>
 #include <svx/htmlmode.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
@@ -400,6 +402,14 @@ BOOL SwView::InsertGraphicDlg( SfxRequest& rReq )
                 rReq.AppendItem( SfxStringItem( FN_PARAM_2, sGraphicFormat ) );
                 rReq.AppendItem( SfxBoolItem( FN_PARAM_1, bAsLink ) );
             }
+
+            // really store as link only?
+            if( bAsLink && SvtMiscOptions().ShowLinkWarningDialog() )
+            {
+                SvxLinkWarningDialog aWarnDlg(GetWindow(),pFileDlg->GetPath());
+                if( aWarnDlg.Execute() != RET_OK )
+                    bAsLink=sal_False; // don't store as link
+            }
         }
 
         SwWrtShell& rSh = GetWrtShell();


More information about the ooo-build-commit mailing list